diff --git a/locale/es/LC_MESSAGES/accounting.po b/locale/es/LC_MESSAGES/accounting.po
index 3bb73b833..f4996fd8d 100644
--- a/locale/es/LC_MESSAGES/accounting.po
+++ b/locale/es/LC_MESSAGES/accounting.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-27 11:08+0200\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Alejandro Kutulas <alk@odoo.com>, 2018\n"
+"Last-Translator: Cristóbal Martí Oliver <info@moblesmarti.com>, 2018\n"
 "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../accounting.rst:5 ../../accounting/localizations/mexico.rst:281
+#: ../../accounting.rst:5 ../../accounting/localizations/mexico.rst:283
 msgid "Accounting"
 msgstr "Contabilidad"
 
@@ -75,6 +75,7 @@ msgstr ""
 #: ../../accounting/bank/reconciliation/use_cases.rst:20
 #: ../../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
@@ -92,12 +93,10 @@ msgstr ""
 #: ../../accounting/payables/pay/sepa.rst:26
 #: ../../accounting/payables/supplier_bills/bills_or_receipts.rst:30
 #: ../../accounting/payables/supplier_bills/manage.rst:31
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:15
 #: ../../accounting/receivables/customer_invoices/cash_rounding.rst:19
 #: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:24
 #: ../../accounting/receivables/customer_invoices/installment_plans.rst:20
 #: ../../accounting/receivables/customer_invoices/payment_terms.rst:19
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:31
 #: ../../accounting/receivables/customer_payments/check.rst:39
 #: ../../accounting/receivables/customer_payments/check.rst:103
 #: ../../accounting/receivables/customer_payments/credit_cards.rst:40
@@ -815,7 +814,7 @@ msgstr ""
 "sincronizarán cada 4 horas."
 
 #: ../../accounting/bank/feeds/synchronize.rst:73
-#: ../../accounting/localizations/mexico.rst:531
+#: ../../accounting/localizations/mexico.rst:533
 msgid "FAQ"
 msgstr "FAQ"
 
@@ -920,7 +919,7 @@ msgstr ""
 #: ../../accounting/bank/misc.rst:3 ../../accounting/payables/misc.rst:3
 #: ../../accounting/payables/misc/employee_expense.rst:187
 msgid "Miscellaneous"
-msgstr "Miscelánea"
+msgstr "Varios"
 
 #: ../../accounting/bank/misc/batch.rst:3
 msgid "How to manage batch deposits of checks?"
@@ -1398,7 +1397,7 @@ msgstr ""
 #: ../../accounting/others/reporting/main_reports.rst:153
 #: ../../accounting/overview/main_concepts/memento.rst:177
 msgid "Bank Reconciliation"
-msgstr "Conciliación Bancaria"
+msgstr "Reconciliación bancaria"
 
 #: ../../accounting/bank/reconciliation/configure.rst:3
 msgid "Configure model of entries"
@@ -1728,7 +1727,7 @@ msgstr ""
 
 #: ../../accounting/bank/setup.rst:3
 msgid "Setup"
-msgstr "Configuración"
+msgstr "Configurar"
 
 #: ../../accounting/bank/setup/create_bank_account.rst:3
 msgid "How to setup a new bank account?"
@@ -1798,6 +1797,17 @@ msgstr ""
 "compañía en las preferencias de su usuario para poder agregar, editar o "
 "borrar cuentas bancarias de otra compañía."
 
+#: ../../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 "Tipo"
+
+#: ../../accounting/bank/setup/create_bank_account.rst:0
+msgid ""
+"Bank account type: Normal or IBAN. Inferred from the bank account number."
+msgstr ""
+
 #: ../../accounting/bank/setup/create_bank_account.rst:0
 msgid "ABA/Routing"
 msgstr ""
@@ -1806,6 +1816,16 @@ msgstr ""
 msgid "American Bankers Association Routing Number"
 msgstr ""
 
+#: ../../accounting/bank/setup/create_bank_account.rst:0
+msgid "Account Holder Name"
+msgstr "Nombre del titular de la cuenta"
+
+#: ../../accounting/bank/setup/create_bank_account.rst:0
+msgid ""
+"Account holder name, in case it is different than the name of the Account "
+"Holder"
+msgstr ""
+
 #: ../../accounting/bank/setup/create_bank_account.rst:49
 msgid "View *Bank Account* in our Online Demonstration"
 msgstr "Vea **Cuenta Bancaria** en nuestra Demostración En Línea"
@@ -2095,11 +2115,6 @@ msgstr "Activo"
 msgid "Set active to false to hide the Journal without removing it."
 msgstr "Establezca active a false para ocultar el diario sin eliminarlo."
 
-#: ../../accounting/bank/setup/manage_cash_register.rst:0
-#: ../../accounting/others/configuration/account_type.rst:0
-msgid "Type"
-msgstr "Tipo"
-
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Select 'Sale' for customer invoices journals."
 msgstr "Selecciona \"Venta\" para ver registros de facturas de clientes."
@@ -2223,11 +2238,11 @@ msgstr "Moneda"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "The currency used to enter statement"
-msgstr "La moneda utilizada para introducir en los estados."
+msgstr "La divisa utilizada para introducir asientos."
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Debit Methods"
-msgstr "Métodos de débito"
+msgstr "Métodos de cobro"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 #: ../../accounting/payables/pay/check.rst:0
@@ -2297,7 +2312,7 @@ msgstr ""
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Loss Account"
-msgstr "Cuenta de Pérdidas"
+msgstr "Cuenta de pérdidas"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid ""
@@ -2460,6 +2475,310 @@ msgstr ""
 msgid "Localizations"
 msgstr "Localizaciones"
 
+#: ../../accounting/localizations/colombia.rst:3
+msgid "Colombia"
+msgstr "Colombia"
+
+#: ../../accounting/localizations/colombia.rst:6
+#: ../../accounting/localizations/mexico.rst:14
+#: ../../accounting/others/taxes/B2B_B2C.rst:63
+msgid "Introduction"
+msgstr "Introducción"
+
+#: ../../accounting/localizations/colombia.rst:8
+msgid ""
+"Electronic invoicing for Colombia is available from Odoo 12 and requires the"
+" next modules:"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:11
+msgid ""
+"**l11n_co**: All the basic data to manage the accounting module, contains "
+"the default setup for: chart of accounts, taxes, retentions, identification "
+"document types"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:14
+msgid ""
+"**l10n_co_edi**: This module includes all the extra fields that are required"
+" for the Integration with Carvajal T&S and generate the electronic invoice, "
+"based on the DIAN legal requirements."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:19
+msgid "Workflow"
+msgstr "Flujo"
+
+#: ../../accounting/localizations/colombia.rst:28
+msgid "1. Install the Colombian localization modules"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:30
+msgid ""
+"For this, go in Apps and search for Colombia. Then click Install for the "
+"first two modules."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:37
+msgid "2. Configure credentials for Carvajal T&S web service"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:39
+msgid ""
+"Once that the modules are installed, in order to be able to connect with "
+"Carvajal T&S Web Service, it's necessary to configure the user and "
+"credentials, this information will be provided by Carvajal T&S."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:43
+#: ../../accounting/localizations/colombia.rst:64
+msgid ""
+"Go to :menuselection:`Accounting --> Configuration --> Settings` and look "
+"for the *Colombian Electronic Invoice* section."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:49
+msgid ""
+"Using the Testing mode it is possible to connect with a Carvajal T&S testing"
+" environment. This allows users to test the complete workflow and "
+"integration with the CEN Financiero portal, which is accessible here: "
+"https://cenfinancierolab.cen.biz"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:54
+msgid ""
+"Once that Odoo and Carvajal T&S is fully configured and ready for production"
+" the testing environment can be disabled."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:58
+msgid "3. Configure your report data"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:60
+msgid ""
+"As part of the configurable information that is sent in the XML, you can "
+"define the data for the fiscal section and the bank information in the PDF."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:71
+msgid "4. Configure data required in the XML"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:74
+msgid "4.1 Partner"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:77
+msgid "4.1.1 Identification"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:79
+msgid ""
+"As part of the Colombian Localization, the document types defined by the "
+"DIAN are now available on the Partner form. Colombian partners have to have "
+"their identification number and document type set:"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:86
+msgid ""
+"When the document type is RUT the identification number needs to be "
+"configured in Odoo including the verification digit, Odoo will split this "
+"number when the data to the third party vendor is sent."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:92
+msgid "4.1.2 Fiscal structure (RUT)"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:94
+msgid ""
+"The partner's responsibility codes (section 53 in the RUT document) are "
+"included as part of the electronic invoice module given that is part of the "
+"information required by the DIAN ."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:98
+msgid ""
+"These fields can be found in :menuselection:`Partner --> Sales & Purchase "
+"Tab --> Fiscal Information`"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:104
+msgid ""
+"Additionally two booleans fields were added in order to specify the fiscal "
+"regimen of the partner."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:108
+msgid "4.2 Taxes"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:110
+msgid ""
+"If your sales transactions include products with taxes, it's important to "
+"consider that an extra field *Value Type* needs to be configured per tax. "
+"This option is located in the Advanced Options tab."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:117
+msgid ""
+"Retention tax types (ICA, IVA, Fuente) are also included in the options to "
+"configure your taxes. This configuration is used in order to correctly "
+"display taxes in the invoice PDF."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:125
+msgid "4.3 Journals"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:127
+msgid ""
+"Once the DIAN has assigned the official sequence and prefix for the "
+"electronic invoice resolution, the Sales journals related to your invoice "
+"documents need to be updated in Odoo.  The sequence can be accessed using "
+"developer mode: :menuselection:`Accounting --> Settings --> Configuration "
+"Setting --> Journals`."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:136
+msgid ""
+"Once that the sequence is opened, the Prefix and Next Number fields should "
+"be configured and synchronized with the CEN Financiero."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:143
+msgid "4.4 Users"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:145
+msgid ""
+"The default template that is used by Odoo on the invoice PDF includes the "
+"job position of the salesperson, so these fields should be configured:"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:153
+#: ../../accounting/localizations/mexico.rst:196
+msgid "Usage and testing"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:156
+msgid "1. Invoice"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:158
+msgid ""
+"When all your master data and credentials has been configured, it's possible"
+" to start testing the electronic invoice workflow."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:162
+msgid "1.1 Invoice creation"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:164
+msgid ""
+"The functional workflow that takes place before an invoice validation "
+"doesn't change. The main changes that are introduced with the electronic "
+"invoice are the next fields:"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:171
+msgid "There are three types of documents:"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:173
+msgid ""
+"**Factura Electronica**: This is the regular type of document and its "
+"applicable for Invoices, Credit Notes and Debit Notes."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:175
+msgid ""
+"**Factura de Importación**: This should be selected for importation "
+"transactions."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:177
+msgid ""
+"**Factura de contingencia**: This is an exceptional type that is used as a "
+"manual backup in case that the company is not able to use the ERP and it's "
+"necessary to generate the invoice manually, when this invoice is added to "
+"the ERP, this invoice type should be selected."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:184
+msgid "1.2 Invoice validation"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:186
+msgid ""
+"After the invoice is validated an XML file is created and sent automatically"
+" to Carvajal, this file is displayed in the chatter."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:192
+msgid ""
+"An extra field is now displayed in \"Other Info\" tab with the name of the "
+"XML file. Additionally there is a second extra field that is displayed with "
+"the Electronic Invoice status, with the initial value \"In progress\":"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:201
+msgid "1.3 Reception of legal XML and PDF"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:203
+msgid ""
+"The electronic invoice vendor receives the XML file and proceeds to validate"
+" the structure and the information in it, if everything is correct the "
+"invoice status changes to \"Validated\" after using the \"Check Carvajal "
+"Status\" button in the Action dropdown. They then proceed to generate a "
+"Legal XML which includes a digital signature and a unique code (CUFE), a PDF"
+" invoice that includes a QR code and the CUFE is also generated."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:211
+msgid "After this:"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:213
+msgid ""
+"A ZIP containing the legal XML and the PDF is downloaded and displayed in "
+"the invoice chatter:"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:222
+msgid "The Electronic Invoice status changes to \"Accepted\""
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:225
+msgid "1.4 Common errors"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:227
+msgid ""
+"During the XML validation the most common errors are usually related to "
+"missing master data. In such cases, error messages are shown in the chatter "
+"after updating the electronic invoice status."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:234
+msgid ""
+"After the master data is corrected, it's possible to reprocess the XML with "
+"the new data and send the updated version, using the following button:"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:245
+msgid "2. Additional use cases"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:247
+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/france.rst:3
 msgid "France"
 msgstr "Francia"
@@ -2837,7 +3156,7 @@ msgstr ""
 #: ../../accounting/localizations/spain.rst:27
 #: ../../accounting/others/reporting/main_reports.rst:30
 msgid "Balance Sheet"
-msgstr "Balance de Situación"
+msgstr "Balance de situación"
 
 #: ../../accounting/localizations/germany.rst:24
 #: ../../accounting/localizations/nederlands.rst:19
@@ -2885,11 +3204,6 @@ msgstr ""
 "información necesaria para permitirte usar Odoo en una empresa con sede "
 "fijada en \"México\"."
 
-#: ../../accounting/localizations/mexico.rst:14
-#: ../../accounting/others/taxes/B2B_B2C.rst:63
-msgid "Introduction"
-msgstr "Introducción"
-
 #: ../../accounting/localizations/mexico.rst:16
 msgid "The mexican localization is a group of 3 modules:"
 msgstr "La localización mexicana es un grupo de 3 módulos:"
@@ -2981,11 +3295,11 @@ msgstr ""
 "generar también el complemento de pago firmado (3.3 solamente) todo se "
 "integra completamente con el flujo de facturación normal en Odoo."
 
-#: ../../accounting/localizations/mexico.rst:66
+#: ../../accounting/localizations/mexico.rst:68
 msgid "3. Set you legal information in the company"
 msgstr "3. Establece tu información legal en la empresa"
 
-#: ../../accounting/localizations/mexico.rst:68
+#: ../../accounting/localizations/mexico.rst:70
 msgid ""
 "First, make sure that your company is configured with the correct data. Go "
 "in :menuselection:`Settings --> Users --> Companies` and enter a valid "
@@ -2997,7 +3311,7 @@ msgstr ""
 "Empresas` e ingrese una dirección válida y el IVA. No olvides definir una "
 "posición fiscal mexicana en la información contacto de tu empresa."
 
-#: ../../accounting/localizations/mexico.rst:75
+#: ../../accounting/localizations/mexico.rst:77
 msgid ""
 "If you want use the Mexican localization on test mode, you can put any known"
 " address inside Mexico with all fields for the company address and set the "
@@ -3007,7 +3321,7 @@ msgstr ""
 " cualquier dirección conocida dentro de México con todos los campos para la "
 "dirección de la empresa y establecer el IVA en ** ACO560518KW7 **."
 
-#: ../../accounting/localizations/mexico.rst:83
+#: ../../accounting/localizations/mexico.rst:85
 msgid ""
 "4. Set the proper \"Fiscal Position\" on the partner that represent the "
 "company"
@@ -3015,7 +3329,7 @@ msgstr ""
 "4. Establezca la \"Posición fiscal\" adecuada en el tipo de socio que "
 "representa la empresa"
 
-#: ../../accounting/localizations/mexico.rst:85
+#: ../../accounting/localizations/mexico.rst:87
 msgid ""
 "Go In the same form where you are editing the company save the record in "
 "order to set this form as a readonly and on readonly view click on the "
@@ -3027,11 +3341,11 @@ msgstr ""
 "Vaya a la carta de la información general de la compañía, y configure la Posición Fiscal correcta. \n"
 "(para el ** Entorno de prueba ** debe seleccionar * 601 - General de Ley Personas Morales *, simplemente búsquelo como un campo en la barra de búsqueda de Odoo si no encuentra la opción)."
 
-#: ../../accounting/localizations/mexico.rst:92
+#: ../../accounting/localizations/mexico.rst:94
 msgid "5. Enabling CFDI Version 3.3"
 msgstr "5. Habilitación de la nueva localización mexicana 3.3 CFDI"
 
-#: ../../accounting/localizations/mexico.rst:95
+#: ../../accounting/localizations/mexico.rst:97
 msgid ""
 "This steps are only necessary when you will enable the CFDI 3.3 (only "
 "available for V11.0 and above) if you do not have Version 11.0 or above on "
@@ -3043,11 +3357,11 @@ msgstr ""
 " versión 11.0 en su instancia de SaaS, solicite una actualización. Para "
 "enviar un ticket a soporte, diríjase a https://www.odoo.com/help."
 
-#: ../../accounting/localizations/mexico.rst:100
+#: ../../accounting/localizations/mexico.rst:102
 msgid "Enable debug mode:"
 msgstr "Habilite el modo desarrollador: "
 
-#: ../../accounting/localizations/mexico.rst:105
+#: ../../accounting/localizations/mexico.rst:107
 msgid ""
 "Go and look the following technical parameter, on :menuselection:`Settings "
 "--> Technical --> Parameters --> System Parameters` and set the parameter "
@@ -3055,7 +3369,7 @@ msgid ""
 "name does not exist)."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:111
+#: ../../accounting/localizations/mexico.rst:113
 msgid ""
 "The CFDI 3.2 will be legally possible until November 30th 2017 enable the "
 "3.3 version will be a mandatory step to comply with the new `SAT "
@@ -3063,36 +3377,36 @@ msgid ""
 "the default behavior."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:120
+#: ../../accounting/localizations/mexico.rst:122
 msgid "Important considerations when yo enable the CFDI 3.3"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:122
-#: ../../accounting/localizations/mexico.rst:611
+#: ../../accounting/localizations/mexico.rst:124
+#: ../../accounting/localizations/mexico.rst:613
 msgid ""
 "Your tax which represent the VAT 16% and 0% must have the \"Factor Type\" "
 "field set to \"Tasa\"."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:130
+#: ../../accounting/localizations/mexico.rst:132
 msgid ""
 "You 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:137
+#: ../../accounting/localizations/mexico.rst:139
 msgid ""
 "All products must have for CFDI 3.3 the \"SAT code\" and the field "
 "\"Reference\" properly set, you can export them and re import them to do it "
 "faster."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:144
+#: ../../accounting/localizations/mexico.rst:146
 msgid "6. Configure the PAC in order to sign properly the invoices"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:146
+#: ../../accounting/localizations/mexico.rst:148
 msgid ""
 "To configure the EDI with the **PACs**, you can go in "
 ":menuselection:`Accounting --> Settings --> Electronic Invoicing (MX)`. You "
@@ -3100,14 +3414,14 @@ msgid ""
 "and then enter your PAC username and PAC password."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:152
+#: ../../accounting/localizations/mexico.rst:154
 msgid ""
 "Remember you must sign up in the refereed PAC before hand, that process can "
 "be done with the PAC itself on this case we will have two (2) availables "
 "`Finkok`_ and `Solución Factible`_."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:156
+#: ../../accounting/localizations/mexico.rst:158
 msgid ""
 "You must process your **Private Key (CSD)** with the SAT institution before "
 "follow this steps, if you do not have such information please try all the "
@@ -3116,163 +3430,159 @@ msgid ""
 "environment with real transactions."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:166
+#: ../../accounting/localizations/mexico.rst:168
 msgid ""
 "If you ticked the box *MX PAC test environment* there is no need to enter a "
 "PAC username or password."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:173
+#: ../../accounting/localizations/mexico.rst:175
 msgid ""
 "Here is a SAT certificate you can use if you want to use the *Test "
 "Environment* for the Mexican Accounting Localization."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:176
+#: ../../accounting/localizations/mexico.rst:178
 msgid "`Certificate`_"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:177
+#: ../../accounting/localizations/mexico.rst:179
 msgid "`Certificate Key`_"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:178
+#: ../../accounting/localizations/mexico.rst:180
 msgid "**Password :** 12345678a"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:181
+#: ../../accounting/localizations/mexico.rst:183
 msgid "7. Configure the tag in sales taxes"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:183
+#: ../../accounting/localizations/mexico.rst:185
 msgid ""
 "This tag is used to set the tax type code, transferred or withhold, "
 "applicable to the concept in the CFDI. So, if the tax is a sale tax the "
 "\"Tag\" field should be \"IVA\", \"ISR\" or \"IEPS\"."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:190
+#: ../../accounting/localizations/mexico.rst:192
 msgid ""
 "Note that the default taxes already has a tag assigned, but when you create "
 "a new tax you should choose a tag."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:194
-msgid "Usage and testing"
-msgstr ""
-
-#: ../../accounting/localizations/mexico.rst:197
+#: ../../accounting/localizations/mexico.rst:199
 msgid "Invoicing"
 msgstr "Facturación"
 
-#: ../../accounting/localizations/mexico.rst:199
+#: ../../accounting/localizations/mexico.rst:201
 msgid ""
 "To use the mexican invoicing you just need to do a normal invoice following "
 "the normal Odoo's behaviour."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:202
+#: ../../accounting/localizations/mexico.rst:204
 msgid ""
 "Once you validate your first invoice a correctly signed invoice should look "
 "like this:"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:209
+#: ../../accounting/localizations/mexico.rst:211
 msgid ""
 "You can generate the PDF just clicking on the Print button on the invoice or"
 " sending it by email following the normal process on odoo to send your "
 "invoice by email."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:216
+#: ../../accounting/localizations/mexico.rst:218
 msgid ""
 "Once you send the electronic invoice by email this is the way it should "
 "looks like."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:223
+#: ../../accounting/localizations/mexico.rst:225
 msgid "Cancelling invoices"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:225
+#: ../../accounting/localizations/mexico.rst:227
 msgid ""
 "The cancellation process is completely linked to the normal cancellation in "
 "Odoo."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:227
+#: ../../accounting/localizations/mexico.rst:229
 msgid "If the invoice is not paid."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:229
+#: ../../accounting/localizations/mexico.rst:231
 msgid "Go to to the customer invoice journal where the invoice belong to"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:237
+#: ../../accounting/localizations/mexico.rst:239
 msgid "Check the \"Allow cancelling entries\" field"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:242
+#: ../../accounting/localizations/mexico.rst:244
 msgid "Go back to your invoice and click on the button \"Cancel Invoice\""
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:247
+#: ../../accounting/localizations/mexico.rst:249
 msgid ""
 "For security reasons it is recommendable return the check on the to allow "
 "cancelling to false again, then go to the journal and un check such field."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:250
+#: ../../accounting/localizations/mexico.rst:252
 msgid "**Legal considerations**"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:252
+#: ../../accounting/localizations/mexico.rst:254
 msgid "A cancelled invoice will automatically cancelled on the SAT."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:253
+#: ../../accounting/localizations/mexico.rst:255
 msgid ""
 "If you retry to use the same invoice after cancelled, you will have as much "
 "cancelled CFDI as you tried, then all those xml are important to maintain a "
 "good control of the cancellation reasons."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:256
+#: ../../accounting/localizations/mexico.rst:258
 msgid ""
 "You must unlink all related payment done to an invoice on odoo before cancel"
 " such document, this payments must be cancelled to following the same "
 "approach but setting the \"Allow Cancel Entries\" in the payment itself."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:261
+#: ../../accounting/localizations/mexico.rst:263
 msgid "Payments (Just available for CFDI 3.3)"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:263
+#: ../../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."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:266
+#: ../../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\"."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:269
+#: ../../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:271
+#: ../../accounting/localizations/mexico.rst:273
 msgid "You must print the payment in order to retrieve the PDF properly."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:272
+#: ../../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 "
@@ -3281,66 +3591,66 @@ msgid ""
 "caso de anticipos recibidos**."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:277
+#: ../../accounting/localizations/mexico.rst:279
 msgid ""
 "Related to topic 4 it is blocked the possibility to create a Customer "
 "Payment without a proper invoice."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:282
+#: ../../accounting/localizations/mexico.rst:284
 msgid "The accounting for Mexico in odoo is composed by 3 reports:"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:284
+#: ../../accounting/localizations/mexico.rst:286
 msgid "Chart of Account (Called and shown as COA)."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:285
+#: ../../accounting/localizations/mexico.rst:287
 msgid "Electronic Trial Balance."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:286
+#: ../../accounting/localizations/mexico.rst:288
 msgid "DIOT report."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:288
+#: ../../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."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:291
+#: ../../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:297
+#: ../../accounting/localizations/mexico.rst:299
 msgid "Electronic Accounting (Requires Accounting App)"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:300
+#: ../../accounting/localizations/mexico.rst:302
 msgid "Electronic Chart of account CoA"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:302
+#: ../../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)**"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:309
+#: ../../accounting/localizations/mexico.rst:311
 msgid "**How to add new accounts?**"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:311
+#: ../../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."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:314
+#: ../../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 "
@@ -3350,17 +3660,17 @@ msgid ""
 " xml."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:324
+#: ../../accounting/localizations/mexico.rst:326
 msgid "**What is the meaning of the tag?**"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:326
+#: ../../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**."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:330
+#: ../../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 "
@@ -3368,11 +3678,11 @@ msgid ""
 "is not created you can create one on the fly."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:336
+#: ../../accounting/localizations/mexico.rst:338
 msgid "Electronic Trial Balance"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:338
+#: ../../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 "
@@ -3381,28 +3691,28 @@ msgid ""
 "the previous selection of the period you want to export."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:347
+#: ../../accounting/localizations/mexico.rst:349
 msgid ""
 "All the normal auditory and analysis features are available here also as any"
 " regular Odoo Report."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:351
+#: ../../accounting/localizations/mexico.rst:353
 msgid "DIOT Report (Requires Accounting App)"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:353
+#: ../../accounting/localizations/mexico.rst:355
 msgid "**What is the DIOT and the importance of presenting it SAT**"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:355
+#: ../../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."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:358
+#: ../../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 "
@@ -3410,25 +3720,25 @@ msgid ""
 "the same, with our providers."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:363
+#: ../../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:"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:367
+#: ../../accounting/localizations/mexico.rst:369
 msgid "**When to file the DIOT and in what format?**"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:369
+#: ../../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:373
+#: ../../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 "
@@ -3436,24 +3746,24 @@ msgid ""
 "to said data."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:378
+#: ../../accounting/localizations/mexico.rst:380
 msgid "**Where the DIOT is presented?**"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:380
+#: ../../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."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:384
+#: ../../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."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:387
+#: ../../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 "
@@ -3462,18 +3772,18 @@ msgid ""
 "that you will still have these records and of course, your CD or USB."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:393
+#: ../../accounting/localizations/mexico.rst:395
 msgid "**One more fact to know: the Batch load?**"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:395
+#: ../../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:"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:399
+#: ../../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 "
@@ -3483,7 +3793,7 @@ msgid ""
 "integration for the presentation in time and form to the SAT."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:406
+#: ../../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 "
@@ -3491,41 +3801,41 @@ msgid ""
 "Third Parties."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:411
+#: ../../accounting/localizations/mexico.rst:413
 msgid "You can find the `official information here`_."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:413
+#: ../../accounting/localizations/mexico.rst:415
 msgid "**How Generate this report in odoo?**"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:415
+#: ../../accounting/localizations/mexico.rst:417
 msgid ""
 "Go to  :menuselection:`Accounting --> Reports --> Mexico --> Transactions "
 "with third partied (DIOT)`."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:420
+#: ../../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."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:426
+#: ../../accounting/localizations/mexico.rst:428
 msgid "Click on \"Export (TXT)."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:431
+#: ../../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."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:435
+#: ../../accounting/localizations/mexico.rst:437
 msgid "Important considerations on your Supplier and Invice data for the DIOT"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:437
+#: ../../accounting/localizations/mexico.rst:439
 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 "
@@ -3534,34 +3844,34 @@ msgid ""
 " suppliers."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:445
+#: ../../accounting/localizations/mexico.rst:447
 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:448
+#: ../../accounting/localizations/mexico.rst:450
 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:451
+#: ../../accounting/localizations/mexico.rst:453
 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:454
+#: ../../accounting/localizations/mexico.rst:456
 msgid ""
 "Remember this report only shows the Supplier Invoices that were actually "
 "paid."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:456
+#: ../../accounting/localizations/mexico.rst:458
 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 "
@@ -3571,26 +3881,26 @@ msgid ""
 "your partners are correctly set."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:467
+#: ../../accounting/localizations/mexico.rst:469
 msgid "Extra Recommended features"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:470
+#: ../../accounting/localizations/mexico.rst:472
 msgid "Contact Module (Free)"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:472
+#: ../../accounting/localizations/mexico.rst:474
 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:477
+#: ../../accounting/localizations/mexico.rst:479
 msgid "Multi currency (Requires Accounting App)"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:479
+#: ../../accounting/localizations/mexico.rst:481
 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"
@@ -3600,17 +3910,17 @@ msgid ""
 "information daily in the system manually."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:486
+#: ../../accounting/localizations/mexico.rst:488
 msgid "Go to settings and enable the multi currency feature."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:492
+#: ../../accounting/localizations/mexico.rst:494
 msgid ""
 "Enabling Explicit errors on the CFDI using the XSD local validator (CFDI "
 "3.3)"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:494
+#: ../../accounting/localizations/mexico.rst:496
 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 "
@@ -3618,72 +3928,72 @@ msgid ""
 "debug mode enabled)."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:499
+#: ../../accounting/localizations/mexico.rst:501
 msgid ""
 "Go to :menuselection:`Settings --> Technical --> Actions --> Server Actions`"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:500
+#: ../../accounting/localizations/mexico.rst:502
 msgid "Look for the Action called \"Download XSD files to CFDI\""
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:501
+#: ../../accounting/localizations/mexico.rst:503
 msgid "Click on button \"Create Contextual Action\""
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:502
+#: ../../accounting/localizations/mexico.rst:504
 msgid ""
 "Go to the company form :menuselection:`Settings --> Users&Companies --> "
 "Companies`"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:503
+#: ../../accounting/localizations/mexico.rst:505
 msgid "Open any company you have."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:504
-#: ../../accounting/localizations/mexico.rst:527
+#: ../../accounting/localizations/mexico.rst:506
+#: ../../accounting/localizations/mexico.rst:529
 msgid "Click on \"Action\" and then on \"Download XSD file to CFDI\"."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:509
+#: ../../accounting/localizations/mexico.rst:511
 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:514
+#: ../../accounting/localizations/mexico.rst:516
 msgid "If you see an error like this:"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:516
+#: ../../accounting/localizations/mexico.rst:518
 msgid "The cfdi generated is not valid"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:518
+#: ../../accounting/localizations/mexico.rst:520
 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:522
+#: ../../accounting/localizations/mexico.rst:524
 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:526
+#: ../../accounting/localizations/mexico.rst:528
 msgid "Go to the company in which the error occurs."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:533
+#: ../../accounting/localizations/mexico.rst:535
 msgid "**Error message** (Only applicable on CFDI 3.3):"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:535
+#: ../../accounting/localizations/mexico.rst:537
 msgid ""
 ":9:0:ERROR:SCHEMASV:SCHEMAV_CVC_MINLENGTH_VALID: Element "
 "'{http://www.sat.gob.mx/cfd/3}Concepto', attribute 'NoIdentificacion': "
@@ -3691,43 +4001,43 @@ msgid ""
 "allowed minimum length of '1'."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:537
+#: ../../accounting/localizations/mexico.rst:539
 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:540
+#: ../../accounting/localizations/mexico.rst:542
 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:543
-#: ../../accounting/localizations/mexico.rst:568
-#: ../../accounting/localizations/mexico.rst:578
-#: ../../accounting/localizations/mexico.rst:591
-#: ../../accounting/localizations/mexico.rst:602
+#: ../../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
 msgid "**Error message**:"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:545
+#: ../../accounting/localizations/mexico.rst:547
 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:547
+#: ../../accounting/localizations/mexico.rst:549
 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:550
+#: ../../accounting/localizations/mexico.rst:552
 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"
@@ -3737,20 +4047,20 @@ msgid ""
 "considerations about fiscal positions."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:557
+#: ../../accounting/localizations/mexico.rst:559
 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:565
+#: ../../accounting/localizations/mexico.rst:567
 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:570
+#: ../../accounting/localizations/mexico.rst:572
 msgid ""
 ":2:0:ERROR:SCHEMASV:SCHEMAV_CVC_ENUMERATION_VALID: Element "
 "'{http://www.sat.gob.mx/cfd/3}Comprobante', attribute 'FormaPago': [facet "
@@ -3759,11 +4069,11 @@ msgid ""
 "'26', '27', '28', '29', '30', '99'}"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:573
+#: ../../accounting/localizations/mexico.rst:575
 msgid "**Solution:** The payment method is required on your invoice."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:580
+#: ../../accounting/localizations/mexico.rst:582
 msgid ""
 ":2:0:ERROR:SCHEMASV:SCHEMAV_CVC_ENUMERATION_VALID: Element "
 "'{http://www.sat.gob.mx/cfd/3}Comprobante', attribute 'LugarExpedicion': "
@@ -3777,16 +4087,16 @@ msgid ""
 "missing."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:585
+#: ../../accounting/localizations/mexico.rst:587
 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 `3. Set you legal "
-"information in the company`."
+"the required fields for your address following the step :ref:`mx-legal-"
+"info`."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:593
+#: ../../accounting/localizations/mexico.rst:595
 msgid ""
 ":2:0:ERROR:SCHEMASV:SCHEMAV_CVC_DATATYPE_VALID_1_2_1: Element "
 "'{http://www.sat.gob.mx/cfd/3}Comprobante', attribute 'LugarExpedicion': '' "
@@ -3794,13 +4104,13 @@ msgid ""
 "'{http://www.sat.gob.mx/sitio_internet/cfd/catalogos}c_CodigoPostal'."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:596
+#: ../../accounting/localizations/mexico.rst:598
 msgid ""
 "**Solution:** The postal code on your company address is not a valid one for"
 " Mexico, fix it."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:604
+#: ../../accounting/localizations/mexico.rst:606
 msgid ""
 ":18:0:ERROR:SCHEMASV:SCHEMAV_CVC_COMPLEX_TYPE_4: Element "
 "'{http://www.sat.gob.mx/cfd/3}Traslado': The attribute 'TipoFactor' is "
@@ -3809,7 +4119,7 @@ msgid ""
 "is required but missing.\", '')"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:608
+#: ../../accounting/localizations/mexico.rst:610
 msgid ""
 "**Solution:** Set the mexican name for the tax 0% and 16% in your system and"
 " used on the invoice."
@@ -4414,135 +4724,6 @@ msgstr ""
 msgid "Explanation of the fields:"
 msgstr "Explicación de los campos:"
 
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Status"
-msgstr "Estado"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "When an asset is created, the status is 'Draft'."
-msgstr "Cuando un activo es creado, el estado es 'Borrador'."
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid ""
-"If the asset is confirmed, the status goes in 'Running' and the depreciation"
-" lines can be posted in the accounting."
-msgstr ""
-"Si el activo es confirmado, el estado entra en 'Funcionamiento' y las líneas"
-" de depreciación pueden ser publicadas en la contabilidad."
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid ""
-"You can manually close an asset when the depreciation is over. If the last "
-"line of depreciation is posted, the asset automatically goes in that status."
-msgstr ""
-"Puede manualmente cerrar un activo cuando la depreciación se termina. Si la "
-"última línea de depreciación es publicada, el activo automáticamente va a "
-"ese estado."
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Category"
-msgstr "Categoría"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Category of asset"
-msgstr "Categoría del activo"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Date"
-msgstr "Fecha"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Date of asset"
-msgstr "Fecha del activo"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Gross Value"
-msgstr "Valor bruto"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Gross value of asset"
-msgstr "Valor bruto del activo"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Salvage Value"
-msgstr "Valor de rescate"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "It is the amount you plan to have that you cannot depreciate."
-msgstr "Es el monto que prevee tener que no puede depreciar."
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Computation Method"
-msgstr "Método de cálculo"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Choose the method to use to compute the amount of depreciation lines."
-msgstr ""
-"Elija el método a usar para calcular el monto en las líneas de depreciación."
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid ""
-"* Linear: Calculated on basis of: Gross Value / Number of Depreciations"
-msgstr "Lineal: Calculado en base de: Valor Bruto / Número de Depreciaciones"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid ""
-"* Degressive: Calculated on basis of: Residual Value * Degressive Factor"
-msgstr ""
-"Decreciente: Calculado en base de: Valor Residual * Factor Decreciente"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Time Method Based On"
-msgstr "Método temporal basado en"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Choose the method to use to compute the dates and number of entries."
-msgstr ""
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid ""
-"* Number of Entries: Fix the number of entries and the time between 2 "
-"depreciations."
-msgstr ""
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid ""
-"* Ending Date: Choose the time between 2 depreciations and the date the "
-"depreciations won't go beyond."
-msgstr ""
-"Fecha de Cierre: Elija el tiempo entre 2 depreciaciones y la fecha en que "
-"las depreciaciones no irán por encima de."
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Prorata Temporis"
-msgstr "Tiempo prorrateado"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid ""
-"Indicates that the first depreciation entry for this asset have to be done "
-"from the purchase date instead of the first January / Start date of fiscal "
-"year"
-msgstr ""
-"Indica que el primer asiento de depreciación tiene que ser realizado desde "
-"la compra en vez desde el 1 de enero o fecha de comienzo del ejercicio "
-"fiscal."
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Number of Depreciations"
-msgstr "Número de Depreciaciones"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "The number of depreciations needed to depreciate your asset"
-msgstr "El número de depreciaciones para depreciar el activo"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Number of Months in a Period"
-msgstr "Número de meses en un periodo"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "The amount of time between two depreciations, in months"
-msgstr "La cantidad de tiempo entre dos depreciaciones, en meses"
-
 #: ../../accounting/others/adviser/assets.rst:88
 msgid "Try creating an *Asset* in our online demonstration"
 msgstr "Trata de crear un *Activo* en la demostración en línea."
@@ -4706,7 +4887,7 @@ msgstr ""
 
 #: ../../accounting/others/adviser/budget.rst:35
 msgid "Budgetary Positions"
-msgstr "Posiciones Presupuestarias"
+msgstr "Posiciones presupuestarias"
 
 #: ../../accounting/others/adviser/budget.rst:37
 msgid ""
@@ -4869,15 +5050,11 @@ msgstr ""
 msgid ":doc:`../../receivables/customer_invoices/overview`"
 msgstr ":doc:`../../cuentas por cobrar/cliente_facturas/resumen`"
 
-#: ../../accounting/others/adviser/budget.rst:128
-msgid ":doc:`../../../purchase/overview/process/from_po_to_invoice`"
-msgstr ":doc:`../../../compra/resumen/proceso/desde_oc_a_factura`"
-
-#: ../../accounting/others/adviser/budget.rst:130
+#: ../../accounting/others/adviser/budget.rst:129
 msgid "Go back in the budget list and find the Smith Project."
 msgstr "Regrese en la lista de presupuesto y encuentre el Proyecto Smith."
 
-#: ../../accounting/others/adviser/budget.rst:132
+#: ../../accounting/others/adviser/budget.rst:131
 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 "
@@ -4887,7 +5064,7 @@ msgstr ""
 "factura y las líneas de compra reservadas en las cuentas y las mostrará en "
 "la columna **Monto Práctico**."
 
-#: ../../accounting/others/adviser/budget.rst:141
+#: ../../accounting/others/adviser/budget.rst:140
 msgid ""
 "The theoretical amount represents the amount of money you theoretically "
 "could have spend / should have received in function of the date. When your "
@@ -5098,6 +5275,37 @@ msgstr ""
 " que la si o no ganancia corriente del año en la **Hoja de Balance** esta "
 "correctamente reportando un saldo 0."
 
+#: ../../accounting/others/adviser/fiscalyear.rst:93
+msgid ":doc:`../configuration/fiscal_year`"
+msgstr ""
+
+#: ../../accounting/others/adviser/reverse_entry.rst:3
+msgid "Reverse an accounting entry automatically"
+msgstr ""
+
+#: ../../accounting/others/adviser/reverse_entry.rst:5
+msgid ""
+"You may want to automatically reverse an accounting entry at a specific "
+"date."
+msgstr ""
+
+#: ../../accounting/others/adviser/reverse_entry.rst:8
+msgid ""
+"This is, for example, used when you make a provision (e.g. provision for bad"
+" debt). When making the accounting entry for the provision, the amount you "
+"entered is only an estimated amount. You will only be sure of the amount at "
+"the end of the fiscal year. That's why, at that point, you want the "
+"accounting entry to be reversed to be able to enter the real loss that "
+"occurred."
+msgstr ""
+
+#: ../../accounting/others/adviser/reverse_entry.rst:15
+msgid ""
+"For this, you just have to tick the box \"Reverse Automatically\" on the "
+"journal entry and to define a reversal date. The accounting entry will be "
+"reversed at that date."
+msgstr ""
+
 #: ../../accounting/others/analytic.rst:3
 msgid "Analytic"
 msgstr "Analítico"
@@ -5258,21 +5466,12 @@ msgstr "Producto de Compra"
 #: ../../accounting/others/analytic/purchases_expenses.rst:104
 msgid ""
 "We also need to buy a software for our customers. In the purchase app create"
-" a purchase order for the software product. (please refer to the following "
-"document: :doc:`../../../purchase/overview/process/from_po_to_invoice`). "
-"Within the line we can link the product's cost with the analytical account. "
-"Specify the order line and select the correct analytical account. Confirm "
-"the sale."
+" a purchase order for the software product. Within the line we can link the "
+"product's cost with the analytical account. Specify the order line and "
+"select the correct analytical account. Confirm the sale."
 msgstr ""
-"También necesitamos comprar un software para nuestros clientes. En la "
-"aplicación de compras cree una orden de compra para el producto software. "
-"(por favor refiérase al siguiente documento: "
-":doc:`../../../compra/resumen/proceso/desde_oc_a_factura`). Dentro de la "
-"línea podemos vincular el costo del producto con la cuenta analítica. "
-"Especifique la línea de la orden y seleccione la cuenta analítica correcta. "
-"Confirme la venta."
 
-#: ../../accounting/others/analytic/purchases_expenses.rst:114
+#: ../../accounting/others/analytic/purchases_expenses.rst:113
 msgid ""
 "Accept the delivery and enter the invoice. Once the invoice is entered the "
 "cost price (**Vendor Price** field) will be booked in the analytical "
@@ -5282,11 +5481,11 @@ msgstr ""
 "precio de costo (campo **Precio del Proveedor**) será registrado en la "
 "cuenta analítica."
 
-#: ../../accounting/others/analytic/purchases_expenses.rst:118
+#: ../../accounting/others/analytic/purchases_expenses.rst:117
 msgid "Subcontracting"
 msgstr "Subcontratación"
 
-#: ../../accounting/others/analytic/purchases_expenses.rst:120
+#: ../../accounting/others/analytic/purchases_expenses.rst:119
 msgid ""
 "The purchase module can be used in the same way as seen previously to handle"
 " subcontracting. if we purchase a service from another company we can re "
@@ -5299,17 +5498,17 @@ msgstr ""
 " analítica correcta. Simplemente necesitamos crear el producto correcto del "
 "proveedor."
 
-#: ../../accounting/others/analytic/purchases_expenses.rst:128
+#: ../../accounting/others/analytic/purchases_expenses.rst:127
 msgid "You can also track cost with timesheets, see: :doc:`timesheets`"
 msgstr ""
 "Puede también rastrear costos con hojas de trabajo, vea :doc:`hojas de "
 "trabajo`"
 
-#: ../../accounting/others/analytic/purchases_expenses.rst:131
+#: ../../accounting/others/analytic/purchases_expenses.rst:130
 msgid "Track costs in accounting"
 msgstr "Rastree costos en la contabilidad"
 
-#: ../../accounting/others/analytic/purchases_expenses.rst:133
+#: ../../accounting/others/analytic/purchases_expenses.rst:132
 msgid ""
 "Now that everything is booked and points to the analytical account. Simply "
 "open it to check the costs related to that account."
@@ -5317,7 +5516,7 @@ msgstr ""
 "Ahora que todo esta registrado y apunta a la cuenta analítica. Simplemente "
 "ábralo para revisar los costos relacionados a esa cuenta."
 
-#: ../../accounting/others/analytic/purchases_expenses.rst:136
+#: ../../accounting/others/analytic/purchases_expenses.rst:135
 msgid ""
 "Enter the accounting module, click on :menuselection:`Advisers --> Analytic "
 "Accounts --> Open Charts`."
@@ -5325,7 +5524,7 @@ msgstr ""
 "Ingrese al módulo contabilidad, de clic en :menuselection:`Consejeros --> "
 "Cuentas Analíticas --> Abrir Asientos`."
 
-#: ../../accounting/others/analytic/purchases_expenses.rst:139
+#: ../../accounting/others/analytic/purchases_expenses.rst:138
 msgid ""
 "Select \"consulting pack - Smith\" and click on the cost and revenue button "
 "to have an overview of all cost linked to the account."
@@ -5333,7 +5532,7 @@ msgstr ""
 "Seleccione \"paquete de consulta - Smith\" y de clic en el botón costo e "
 "ingreso para tener un resumen de todos los costos vinculados a la cuenta."
 
-#: ../../accounting/others/analytic/purchases_expenses.rst:147
+#: ../../accounting/others/analytic/purchases_expenses.rst:146
 msgid ""
 "If you would like to have the revenue as well you should invoice the "
 "Consulting Pack in the Invoice menu and link the invoice line to this same "
@@ -6325,7 +6524,7 @@ msgstr "**Listas de los tipos de cuentas**"
 
 #: ../../accounting/others/configuration/account_type.rst:27
 msgid "Receivable"
-msgstr "Por Cobrar"
+msgstr "Por cobrar"
 
 #: ../../accounting/others/configuration/account_type.rst:29
 msgid "Payable"
@@ -6337,7 +6536,7 @@ msgstr "Banco y caja"
 
 #: ../../accounting/others/configuration/account_type.rst:33
 msgid "Current Assets"
-msgstr "Activos Corrientes"
+msgstr "Activos actuales"
 
 #: ../../accounting/others/configuration/account_type.rst:35
 msgid "Non-current Assets"
@@ -6345,7 +6544,7 @@ msgstr "Activos no-corrientes"
 
 #: ../../accounting/others/configuration/account_type.rst:37
 msgid "Prepayments"
-msgstr "Anticipos"
+msgstr "Pre-pagos"
 
 #: ../../accounting/others/configuration/account_type.rst:39
 msgid "Fixed Assets"
@@ -6353,7 +6552,7 @@ msgstr "Activos fijos"
 
 #: ../../accounting/others/configuration/account_type.rst:41
 msgid "Current Liabilities"
-msgstr "Pasivos Corrientes"
+msgstr "Pasivo actual"
 
 #: ../../accounting/others/configuration/account_type.rst:43
 msgid "Non-current Liabilities"
@@ -6361,7 +6560,7 @@ msgstr "Pasivos no-corrientes"
 
 #: ../../accounting/others/configuration/account_type.rst:45
 msgid "Equity"
-msgstr "Capital"
+msgstr "Valor neto"
 
 #: ../../accounting/others/configuration/account_type.rst:47
 msgid "Current Year Earnings"
@@ -6369,7 +6568,7 @@ msgstr "Ganancias año actual"
 
 #: ../../accounting/others/configuration/account_type.rst:49
 msgid "Other Income"
-msgstr "Otro Ingreso"
+msgstr "Otro impuesto"
 
 #: ../../accounting/others/configuration/account_type.rst:51
 #: ../../accounting/receivables/customer_invoices/installment_plans.rst:63
@@ -6381,7 +6580,7 @@ msgstr "Ingreso"
 
 #: ../../accounting/others/configuration/account_type.rst:53
 msgid "Depreciation"
-msgstr "Depreciación"
+msgstr "Amortización"
 
 #: ../../accounting/others/configuration/account_type.rst:55
 msgid "Expenses"
@@ -6451,12 +6650,12 @@ msgstr "Etiquetas opcionales a asignar en informes de ventas"
 
 #: ../../accounting/others/configuration/account_type.rst:0
 msgid "Account Currency"
-msgstr "Moneda de la Cuenta"
+msgstr "Cuenta de la moneda"
 
 #: ../../accounting/others/configuration/account_type.rst:0
 msgid "Forces all moves for this account to have this account currency."
 msgstr ""
-"Obliga a todos los movimientos de esta cuenta a tener la moneda de la misma."
+"Fuerza a todos los movimientos de esta cuenta a tener la moneda de la misma."
 
 #: ../../accounting/others/configuration/account_type.rst:0
 msgid "Internal Type"
@@ -6488,6 +6687,46 @@ msgstr ""
 msgid "View *Create Account* in our Online Demonstration"
 msgstr "Vea **Crear una Cuenta** en nuestra Demostración en Línea"
 
+#: ../../accounting/others/configuration/fiscal_year.rst:3
+msgid "Manage Fiscal Years"
+msgstr ""
+
+#: ../../accounting/others/configuration/fiscal_year.rst:5
+msgid ""
+"In most cases, the fiscal years last 12 months. If it is your case, you just"
+" have to define what is the last day of your fiscal year in the accounting "
+"settings. By default, it is set on the 31st December."
+msgstr ""
+
+#: ../../accounting/others/configuration/fiscal_year.rst:12
+msgid ""
+"However, there might be some exceptions. For example, if it is the first "
+"fiscal year of your business, it could last more or less than 12 months. In "
+"this case, some additional configuration is required."
+msgstr ""
+
+#: ../../accounting/others/configuration/fiscal_year.rst:16
+msgid ""
+"Go in :menuselection:`accounting --> configuration --> settings` and "
+"activate the fiscal years."
+msgstr ""
+
+#: ../../accounting/others/configuration/fiscal_year.rst:22
+msgid ""
+"You can then configure your fiscal years in :menuselection:`accounting --> "
+"configuration --> fiscal years`."
+msgstr ""
+
+#: ../../accounting/others/configuration/fiscal_year.rst:29
+msgid ""
+"You only have to create fiscal years if they last more or less than 12 "
+"months."
+msgstr ""
+
+#: ../../accounting/others/configuration/fiscal_year.rst:34
+msgid ":doc:`../adviser/fiscalyear`"
+msgstr ""
+
 #: ../../accounting/others/inventory.rst:3
 msgid "Inventory"
 msgstr "Inventario"
@@ -7121,6 +7360,7 @@ msgstr ""
 
 #: ../../accounting/others/multicurrencies/exchange.rst:109
 #: ../../accounting/payables/pay/multiple.rst:153
+#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:68
 msgid ":doc:`../../bank/reconciliation/configure`"
 msgstr ":doc:`../../banco/conciliación/configuración`"
 
@@ -7772,7 +8012,7 @@ msgstr ""
 
 #: ../../accounting/others/reporting/main_reports.rst:39
 msgid "Profit and Loss"
-msgstr "Ganancias y Pérdidas"
+msgstr "Pérdidas y ganancias"
 
 #: ../../accounting/others/reporting/main_reports.rst:41
 msgid ""
@@ -7794,7 +8034,7 @@ msgstr "Un listado de todas sus cuentas agrupadas por clase."
 
 #: ../../accounting/others/reporting/main_reports.rst:57
 msgid "Executive Summary"
-msgstr "Resumen Ejecutivo"
+msgstr "Resumen ejecutivo"
 
 #: ../../accounting/others/reporting/main_reports.rst:59
 msgid ""
@@ -7918,7 +8158,7 @@ msgstr ""
 
 #: ../../accounting/others/reporting/main_reports.rst:103
 msgid "General Ledger"
-msgstr "Libro Mayor"
+msgstr "Libro mayor"
 
 #: ../../accounting/others/reporting/main_reports.rst:105
 msgid ""
@@ -7936,7 +8176,7 @@ msgstr ""
 
 #: ../../accounting/others/reporting/main_reports.rst:115
 msgid "Aged Payable"
-msgstr "Vencida por Pagar"
+msgstr "Historial de pagos"
 
 #: ../../accounting/others/reporting/main_reports.rst:117
 msgid ""
@@ -7950,7 +8190,7 @@ msgstr ""
 
 #: ../../accounting/others/reporting/main_reports.rst:125
 msgid "Aged Receivable"
-msgstr "Vencida por Cobrar"
+msgstr "A cobrar vencido"
 
 #: ../../accounting/others/reporting/main_reports.rst:127
 msgid ""
@@ -7963,7 +8203,7 @@ msgstr ""
 
 #: ../../accounting/others/reporting/main_reports.rst:134
 msgid "Cash Flow Statement"
-msgstr "Estado de Flujo de Caja"
+msgstr "Estado de Flujos de Efectivo"
 
 #: ../../accounting/others/reporting/main_reports.rst:136
 msgid ""
@@ -7978,7 +8218,7 @@ msgstr ""
 
 #: ../../accounting/others/reporting/main_reports.rst:144
 msgid "Tax Report"
-msgstr "Informe de Impuestos"
+msgstr "Reporte Impuestos"
 
 #: ../../accounting/others/reporting/main_reports.rst:146
 msgid ""
@@ -8619,7 +8859,7 @@ msgstr "Al reconciliar la factura y el pago, se genera esta entrada:"
 
 #: ../../accounting/others/taxes/cash_basis_taxes.rst:72
 msgid "Tax Cash Basis Journal"
-msgstr "Diario Impuesto Base de Efectivo"
+msgstr "Impuestos Diario de base de efectivo"
 
 #: ../../accounting/others/taxes/cash_basis_taxes.rst:78
 msgid "Tax Received Account $15"
@@ -10118,7 +10358,7 @@ msgstr "Cuenta"
 #: ../../accounting/receivables/customer_payments/credit_cards.rst:79
 #: ../../accounting/receivables/customer_payments/credit_cards.rst:143
 msgid "Account Receivable"
-msgstr "Cuenta por Cobrar"
+msgstr "Cuenta a cobrar"
 
 #: ../../accounting/overview/main_concepts/memento.rst:218
 #: ../../accounting/overview/main_concepts/memento.rst:244
@@ -10401,7 +10641,6 @@ msgid "15"
 msgstr "15"
 
 #: ../../accounting/overview/process_overview/customer_invoice.rst:117
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:89
 msgid "Payment"
 msgstr "Pagos"
 
@@ -11378,7 +11617,7 @@ msgstr ""
 
 #: ../../accounting/payables/pay.rst:3
 msgid "Vendor Payments"
-msgstr ""
+msgstr "Pagos de Proveedor"
 
 #: ../../accounting/payables/pay/check.rst:3
 msgid "Pay by Checks"
@@ -12158,7 +12397,6 @@ msgstr ""
 
 #: ../../accounting/payables/pay/sepa.rst:132
 #: ../../accounting/receivables/customer_payments/credit_cards.rst:168
-#: ../../accounting/receivables/customer_payments/followup.rst:168
 #: ../../accounting/receivables/customer_payments/recording.rst:129
 msgid ":doc:`check`"
 msgstr ":doc:`revisar`"
@@ -12754,227 +12992,80 @@ msgid "Customer Invoices"
 msgstr "Facturas de cliente"
 
 #: ../../accounting/receivables/customer_invoices/cash_discounts.rst:3
-msgid "How to setup cash discounts?"
-msgstr "¿Cómo instalar descuentos por pronto pago?"
+msgid "Offer cash discounts"
+msgstr ""
 
 #: ../../accounting/receivables/customer_invoices/cash_discounts.rst:5
 msgid ""
-"Cash discounts are an incentive (usually a small percentage) that you offer "
-"to customers in return for paying a bill owed before the scheduled due date."
-" If used properly, cash discounts improve the Days Sales Outstanding aspect "
-"of a business's cash conversion cycle."
+"Cash discounts are incentives you can offer to customers to motivate them to"
+" pay within a specific time frame. For instance, you offer a 2% discount if "
+"the customer pays you within the first 5 days of the invoice, when it is due"
+" in 30 days. This approach can greatly improve your average collection "
+"period."
 msgstr ""
-"Los descuentos por pronto pago son un incentivo (usualmente un pequeño "
-"porcentaje) que Ud. le ofrece a clientes en retorno por pagar una factura "
-"adeudada antes de la fecha de vencimiento programada. Si es usado "
-"correctamente, los descuentos por pronto pago mejoran el áspecto de Días de "
-"Venta Destacados del ciclo de conversión de efectivo de un negocio."
 
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:10
+#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:12
+msgid "Set up a cash discount"
+msgstr ""
+
+#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:14
 msgid ""
-"For example, a typical cash discount would be: you offer a 2% discount on an"
-" invoice due in 30 days if the customer were to pay within the first 5 days "
-"of receiving the invoice."
+"To set up a cash discount, go to :menuselection:`Accounting --> "
+"Configuration --> Management --> Payment Terms` and click on *Create*. Add a"
+" *Percent* type of term with a corresponding value (e.g. 98% of the total "
+"price for a 2% discount) and the number of days during which the offer is "
+"valid. You can also change the default balance term if needed."
 msgstr ""
-"Por ejemplo, un descuento por pronto pago típico sería: Ud. ofrece un 2% de "
-"descuento en una factura pagadera a 30 días si el cliente fuera a pagar "
-"dentro de los primeros 5 días de recibir la factura. "
 
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:18
-msgid "Payment terms"
-msgstr "Términos de Pago"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:20
-msgid ""
-"In order to manage cash discounts, we will use the payment terms concept of "
-"Odoo (From the Accounting module, go to :menuselection:`Configuration --> "
-"Management --> Payment terms --> Create`)."
+#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:25
+msgid "Start offering the cash discount"
 msgstr ""
-"Para administrar descuentos por pronto pago, usaremos el concepto de "
-"términos de pago de Odoo (Desde el módulo Contabilidad, vaya a "
-":menuselection:`Configuración --> Administración --> Términos de pago --> "
-"Crear`)."
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:24
-msgid ""
-"Let's start with the above example: a 2% discount on an invoice due in 30 "
-"days if the customer were to pay within the first 5 days."
-msgstr ""
-"Empecemos con el siguiente ejemplo: un 2% de descuento en una factura "
-"pagadera a 30 días si el cliente fuera a pagar dentro de los primeros 5 "
-"días."
 
 #: ../../accounting/receivables/customer_invoices/cash_discounts.rst:27
 msgid ""
-"A typical payment term of 30 days would have only one installment: balance "
-"in 30 days. But, in order to configure the cash discount, you can configure "
-"the payment term with two installments:"
+"Now, you can create a customer invoice and select the cash discount payment "
+"term you added. Once the invoice is validated, Odoo will automatically split"
+" the account receivables part of the journal entry into two installments "
+"having different due dates. Since the discounted price is already "
+"calculated, your payment controls will be simplified."
 msgstr ""
-"Un término de pago típico de 30 días tendría solo un plazo: saldo en 30 "
-"días. Pero, para configurar el descuento por pronto pago, puede configurar "
-"el término de pago con dos plazos:"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:31
-msgid "98% within 5 days"
-msgstr "98% dentro de 5 días"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:32
-msgid "balance within 30 days"
-msgstr "saldo dentro de 30 días"
 
 #: ../../accounting/receivables/customer_invoices/cash_discounts.rst:37
-msgid ""
-"To make it clear that it's not a payment term but a cash discount, don't "
-"forget to set a clear description that will appear on the invoice: Invoice "
-"is due within 30 days, but you can benefit from a 2% cash discount if you "
-"pay within 5 days."
+msgid "Grant the cash discount"
 msgstr ""
-"Para hacerlo claro, ese no es un término de pago pero si un descuento por "
-"pronto pago, no olvide configurar una descripción clara que aparecerá en la "
-"factura: La factura es pagadera a 30 días, pero puede beneficiarse de un "
-"descuento por pronto pago del 2% si paga dentro de 5 días."
 
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:43
-msgid "Bank reconciliation model"
-msgstr "Modelo de Conciliación Bancaria"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:45
+#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:39
 msgid ""
-"In order to speed up the bank reconciliation process, we can create a model "
-"of entry for all cash discounts. To do that, from the Accounting application"
-" dashboard, click on the \"More\" link on the bank and choose the option "
-"\"Reconciliation Models\"."
+"The customer fulfilled the payment terms and therefore benefits from the "
+"cash discount. When you process the bank statement, match the payment with "
+"the related journal entry. Then, select the remaining cash discount and "
+"click on *Create Write-off* to reconcile it."
 msgstr ""
-"Para apresurar el proceso de conciliación bancaria, podemos crerar un modelo"
-" de entrada para todos los descuentos por pronto pago. Para hacerlo, desde "
-"el tablero de la aplicación de contabilidad, de clic en el link \"Más\" en "
-"el banco y elija la opción \"Modelos de Conciliación\"."
 
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:53
-msgid "Create a new model for cash discounts as follow:"
-msgstr "Cree un nuevo modelo para descuentos por pronto pago como sigue:"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:55
-msgid "**Button Label**: Cash Discount"
-msgstr "**Pestaña del Botón**: Descuentos por Pronto Pago"
+#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:48
+msgid ""
+"You can also create a dedicated reconciliation model to make the process "
+"easier. In this case, you should add a tax to the model based on the taxes "
+"applied to your invoices. This means that if you handle multiple tax rates, "
+"you need to create several reconciliation models. Note that depending on "
+"your localisation, you might already have a Cash Discount model available by"
+" default."
+msgstr ""
 
 #: ../../accounting/receivables/customer_invoices/cash_discounts.rst:56
-msgid "**Account**: Cash Discount (according to your country)"
-msgstr "**Cuenta**: Descuentos por Pronto Pago (de acuerdo a su país)"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:57
-msgid "**Amount Type**: Percentage"
-msgstr "**Tipo de Monto**: Porcentaje"
+msgid "Register the full payment"
+msgstr ""
 
 #: ../../accounting/receivables/customer_invoices/cash_discounts.rst:58
-msgid "**Amount**: 100%"
-msgstr "**Monto**: 100%"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:60
-msgid "**Taxes**: depending on your country, you may put a tax on the cash"
+msgid ""
+"In this case, the customer has not fulfilled the payment term and cannot "
+"benefit from the cash discount. When you process the bank statement, match "
+"the payment with the two related journal entries."
 msgstr ""
-"**Impuestos**: dependiendo de su país, puede poner un descuento en el "
-"efectivo"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:60
-msgid "discount if taxes have to be deduced"
-msgstr "descuento si se deben deducir impuestos"
 
 #: ../../accounting/receivables/customer_invoices/cash_discounts.rst:67
-msgid ""
-"Even if it's a 2% cash discount, set a 100% amount on the reconciliation "
-"model as it means 100% of the remaining balance (the 2%). You can use the "
-"same reconciliation model for all your cash discount. No need to create a "
-"model per payment term."
+msgid ":doc:`../../receivables/customer_invoices/payment_terms`"
 msgstr ""
-"Aún si es un descuento por pronto pago del 2%, configure un monto de 100% en"
-" el modelo de conciliación ya que significa 100% del saldo pendiente (el "
-"2%). Puede usar el mismo modelo de conciliación para todos sus descuentos "
-"por pronto pago. No necesita crear un modelo para cada término de pago."
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:73
-msgid "Creating an invoice with a cash discount"
-msgstr "Crear una factura con un descuento por pronto pago"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:75
-msgid ""
-"When you create a customer invoice, set the right payment term \"30 days, 2%"
-" cash discount\" right after having selected the customer."
-msgstr ""
-"Cuando cree una factura de cliente, establezca el término de pago correcto "
-"\"30 días, 2% de descuento por pronto pago\", justo después de haber "
-"seleccionado al cliente."
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:81
-msgid ""
-"Once the invoice is validated, Odoo will automatically split the account "
-"receivable part of the journal entry with two installments having a "
-"different due date: 98% within 5 days, 2% within 30 days."
-msgstr ""
-"Una vez la factura es validada, Odoo automáticamente dividirá la parte de la"
-" cuenta por cobrar del diario de entrada con dos plazos con fecha de "
-"vencimiento diferente: 98% dentro de 5 días, 2% dentro de 30 días."
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:92
-msgid "Paying the invoice with a cash discount"
-msgstr "Pagando la factura con un descuento por pronto pago"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:94
-msgid ""
-"If the customer pays with a cash discount, when processing the bank "
-"statement, you will match the payment (98%) with the related line in the "
-"journal entry."
-msgstr ""
-"Si el cliente paga con un descuento por pronto pago, cuando este procesando "
-"el extracto bancario, Ud. corresponderá el pago (98%) con la línea "
-"relacionada en el diario de entrada."
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:101
-msgid ""
-"As you can see in the above screenshot, when selecting the customer, you "
-"also see the 2% remaining of 3$. If you want to accept the cash discount (if"
-" the customer paid within the 5 days), you can click on this line with 2%, "
-"click on \"Open Balance\", and select your \"Cash Discount\" reconciliation "
-"model. That way, the invoice is marked as fully paid."
-msgstr ""
-"Como puede ver en la captura de pantalla anterior, cuando selecciona el "
-"cliente, también puede el 2% de 3$ pendiente. Si quiere aceptar el descuento"
-" por pronto pago (si el cliente pagó dentro de los 5 días), puede dar clic "
-"en esta línea con 2%, de clic en \"Abrir Saldo\", y seleccione su modelo de "
-"conciliación \"Descuento por Pronto Pago\". De esta manera, la factura queda"
-" marcada como totalmente pagada. "
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:109
-msgid ""
-"from now on, matching the remaining 2% has to be done manually. In the "
-"future, we plan to automate the reconciliation of the 2% if the 98% are paid"
-" on time."
-msgstr ""
-"desde ahora, corresponder el pendiente 2% debe hacerse manualmente. En el "
-"futuro, planeamos automatizar la conciliación del 2% si el 98% es pagado a "
-"tiempo."
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:113
-msgid "Paying the invoice in full"
-msgstr "Pagando la factura en total"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:115
-msgid ""
-"If the customer pays the invoice fully, without benefiting from the cash "
-"discount, you will reconcile the payment (in full) with the two lines from "
-"the invoice (98% and 2%). Just click on the two lines to match them with the"
-" payment."
-msgstr ""
-"Si el cliente paga la factura totalmente, sin beneficiarse del descuento por"
-" pronto pago, Ud. conciliará el pago (en total) con las dos líneas de la "
-"factura (98% y 2%). Solo de clic en las dos líneas para corresponderlas con "
-"el pago."
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:125
-#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:116
-#: ../../accounting/receivables/customer_invoices/installment_plans.rst:86
-msgid ":doc:`overview`"
-msgstr ":doc:`resumen`"
 
 #: ../../accounting/receivables/customer_invoices/cash_rounding.rst:2
 msgid "Set up cash roundings"
@@ -13261,6 +13352,11 @@ msgstr ""
 "Para analizar todos sus contratos actuales que tienen ingresos diferidos, "
 "puede usar el menú Reportes > Análisis de Ingresos Diferidos."
 
+#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:116
+#: ../../accounting/receivables/customer_invoices/installment_plans.rst:86
+msgid ":doc:`overview`"
+msgstr ":doc:`resumen`"
+
 #: ../../accounting/receivables/customer_invoices/installment_plans.rst:3
 msgid "How to define an installment plan on customer invoices?"
 msgstr "¿Cómo definir un plan de plazos en facturas de cliente?"
@@ -13930,376 +14026,6 @@ msgstr ""
 msgid "Customer Payments"
 msgstr "Pagos de cliente"
 
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:3
-msgid "How to automate customer follow-ups with plans?"
-msgstr "¿Cómo automatizar seguimientos a clientes con planes?"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:5
-msgid ""
-"With the Odoo Accounting application, you get a dynamic aged receivable "
-"report, customer statements and you can easily send them to customers."
-msgstr ""
-"Con la aplicación de Contabilidad de Odoo, obtiene un reporte dinámico de "
-"cuentas por cobrar antiguas, estados de clientes y puede fácilmente "
-"enviarlos a clientes."
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:8
-msgid ""
-"If you want to go further in the automation of the credit collection "
-"process, you can use follow-up plans. They will help you automate all the "
-"steps to get paid, by triggering them at the right time: send customer "
-"statements by emails, send regular letter (through the Docsaway "
-"integration), create a task to manually call the customer, etc..."
-msgstr ""
-"Si quiere ir más allá en la automatización del proceso de percepción de "
-"créditos, puede usar planes de seguimiento. Estos le ayudarán a automatizar "
-"todos los pasos para obtener pagos, generándolos en el momento adecuado: "
-"enviar estados de cliente por email, enviar cartas regulares (a través de la"
-" integración Docsaway), crear una tarea para manualmente llamar al cliente, "
-"etc..."
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:14
-msgid "Here is an example of a plan:"
-msgstr "Aquí tenemos un ejemplo de un plan:"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:17
-msgid "When?"
-msgstr "¿Cuándo?"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:17
-msgid "What?"
-msgstr "¿Qué?"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:17
-msgid "Who?"
-msgstr "¿Quién?"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:19
-msgid "3 days before due date"
-msgstr "3 días antes de la fecha de vencimiento"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:19
-msgid "Email"
-msgstr "Correo electrónico"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:19
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:21
-msgid "automated"
-msgstr "automatizado"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:21
-msgid "1 day after due date"
-msgstr "1 día después de la fecha de vencimiento"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:21
-msgid "Email + Regular Letter"
-msgstr "Email + Carta Regular"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:23
-msgid "15 days after due date"
-msgstr "15 días después de la fecha de vencimiento"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:23
-msgid "Call the customer"
-msgstr "Llamar al cliente"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:23
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:25
-msgid "John Mac Gregor"
-msgstr "John Mac Gregor"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:25
-msgid "35 days after due date"
-msgstr "35 días después de la fecha de vencimiento"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:25
-msgid "Email + Letter + Call"
-msgstr "Email + Carta Regular + Llamada"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:27
-msgid "60 days after due date"
-msgstr "60 días después de la fecha de vencimiento"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:27
-msgid "Formal notice"
-msgstr "Notificación Oficial"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:27
-msgid "Bailiff"
-msgstr "Alguacil"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:34
-msgid "Install Reminder Module"
-msgstr "Instalar el módulo de Recordatorio"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:36
-msgid ""
-"You must start by activating the feature, using the menu "
-":menuselection:`Configuration --> Settings` of the Accounting application. "
-"From the settings screen, activate the feature **Enable payment follow-up "
-"management**."
-msgstr ""
-"Debe empezar activando la función, usando el menú "
-":menuselection:`Configuración --> Ajustes` de la aplicación Contabilidad. "
-"Desde la pantalla de ajustes, active la función **Permitir la administración"
-" de seguimiento de pago**."
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:44
-msgid "Define Payment Follow-ups Levels"
-msgstr "Definir Niveles de Seguimiento de Pagos"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:46
-msgid ""
-"To automate customer follow ups, you must configure your follow–up levels "
-"using the menu :menuselection:`Accounting --> Configuration --> Payment "
-"Follow-ups`. You should define one and only one follow-up plan per company."
-msgstr ""
-"Para automatizar los seguimientos a cliente, debe configurar los niveles de "
-"seguimiento usando el menú :menuselection:`Contabilidad --> Configuración "
-"--> Seguimientos de Pagos`. Debe definir un y solo un plan de seguimiento "
-"por compañía."
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:50
-msgid ""
-"The levels of follow-up are relative to the due date; when no payment term "
-"is specified, the invoice date will be considered as the due date."
-msgstr ""
-"Los niveles de seguimiento son relativos a la fecha de vencimiento; cuando "
-"no hay un término de pago especifico, la fecha de la factura será "
-"considerada como la fecha de vencimiento."
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:53
-msgid ""
-"For each level, you should define the number of days and create a note which"
-" will automatically be added into the reminder letter."
-msgstr ""
-"Para cada nivel, Ud. debe definir el número de días y crear una nota la cual"
-" será agregada automáticamente a la carta de recordatorio."
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:59
-msgid "Odoo defines several actions for every reminder:"
-msgstr "Odoo define varias acciones para cada recordatorio:"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:61
-msgid ""
-"**Manual Action:** assign a responsible that will have to call the customer"
-msgstr ""
-"**Acción Manual:** asignar un responsable que tendrá que llamar al cliente"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:62
-msgid "**Send an Email:** send an email to customer using the provided text"
-msgstr ""
-"**Enviar un Email:** enviar un email al cliente usando el texto entregado"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:63
-msgid ""
-"**Send a Letter:** send a letter by regular mail, using the provided note"
-msgstr ""
-"**Enviar una Carta:** enviar una carta por correo regular, usando la nota "
-"entregada"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:69
-msgid ""
-"As you need to provide a number of days relative to the due date, you can "
-"use a negative number. As an example, if an invoice is issued the January "
-"1st but the due date is January 20, if you set a reminder 3 days before the "
-"due date, the customer may receive an email in January 17."
-msgstr ""
-"Como tienes que proporcionar un número de días en relación con la fecha de "
-"vencimiento, puedes utilizar un número negativo. Por ejemplo, si se emite "
-"una factura el 1 de enero pero la fecha de vencimiento es el 20 de enero, si"
-" estableces un recordatorio 3 días antes de la fecha de vencimiento, el "
-"cliente puede recibir un correo electrónico el 17 de enero."
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:76
-msgid "Doing your weekly follow-ups"
-msgstr "Haga sus seguimientos semanales"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:78
-msgid ""
-"Once everything is setup, Odoo will prepare follow-up letters and emails "
-"automatically for you. All you have to do is to the menu "
-":menuselection:`Sales --> Customers Statement` in the accounting "
-"application."
-msgstr ""
-"Una vez que todo esta ingresado, Odoo prepará las cartas y emails de "
-"seguimiento por Ud. automáticamente. Todo lo que tiene que hacer es ir al "
-"menú :menuselection:`Ventas --> Estado de Clientes` en la aplicación de "
-"contabilidad."
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:85
-msgid ""
-"Odoo will automatically propose you actions based on the follow-up plan you "
-"defined, invoices to pay and payment received."
-msgstr ""
-"Odoo automáticamente le propondrá acciones basadas en el plan de seguimiento"
-" que definió, facturas a pagar y pagos recibidos."
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:88
-msgid ""
-"You can use this menu every day, once a week or once a month. You do not "
-"risk to send two times the same reminder to your customer. Odoo only "
-"proposes you the action you have to do. If you do it every day, you will "
-"have a few calls to do per day. If you do it once a month, you will have "
-"much more work once you do it."
-msgstr ""
-"Puede usar este menú diariamente, una vez a la semana o una vez al mes. No "
-"se arriesgue a enviar dos veces el mismo recordatorio a su cliente. Odoo "
-"solamente le propone la acción que tiene que hacer. Si lo hace diariamente, "
-"solo tendrá algunas llamadas que hacer por día. Si lo hace una vez al mes, "
-"tendrá mucho más trabajo una vez lo haga."
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:94
-msgid ""
-"It's up to you to organize the way you want to work. But it's a good "
-"practice to reconcile your bank statements before launching the follow-ups. "
-"That way, all paid invoices will be reconciled and you will not send a "
-"follow-up letter to a customer that already paid his invoice."
-msgstr ""
-"Es su decisión organizar la forma como quiere trabajar. Pero es una buena "
-"practiva conciliar sus extractos bancarios antes de la puesta en marcha de "
-"los recordatorios. De esta manera, todas las facturas pagadas serán "
-"conciliadas y no tendrá que enviar una carta de seguimiento a un cliente que"
-" ya ha pagado su factura."
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:99
-msgid "From a customer follow-up proposition, you can:"
-msgstr "Desde la propuesta de seguimiento a un cliente, Ud. puede:"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:101
-msgid "Get the customer information to contact him"
-msgstr "Obtener la información del cliente para contactarlo"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:103
-msgid "Drill down to the customer information form by clicking on its name"
-msgstr ""
-"Examinar a fondo el formulario de información del cliente dando clic en su "
-"nombre"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:105
-msgid "Change the text (or the email or letter) and adapt to the customer"
-msgstr "Cambiar el texto (o el email o la carta) y adaptarlo al cliente"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:107
-msgid ""
-"Change the colored dot to mark the customer as being a good, normal or bad "
-"debtor"
-msgstr ""
-"Cambiar el punto coloreado para marcar el cliente como bueno, normal o mal "
-"deudor"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:110
-msgid "Log a note is you called the customer"
-msgstr "Registrar una nota es porque Ud. llamó al cliente"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:112
-msgid "Exclude some invoices from the statement table (litigation)"
-msgstr "Excluir algunas facturas de la tabla del estado (litigación)"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:114
-msgid "Send an email with the statement"
-msgstr "Enviar un email con el estado"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:116
-msgid ""
-"Print a letter, or send a regular mail (if you installed the Docsaway "
-"integration)"
-msgstr ""
-"Para importar reportes QIF, debe activar la caracteristica en Odoo. En el aplicado de Contabilidad, ir al menu 'menuselection: Connfiguracion...>Parametros, de los parametros de contabilidad, testar los reportes de banco ''Importar en Formato QIF'' y aplicar.\n"
-"Una vez que ha instalado esta caracteristica, puede instalar su cuento bancario para permitir de importar a ficheros de reportes. Para hacer eso, ir a la Tabla de Contenidos (''Dashboard')y clicar al boton ''Menu'' del cuento bancario. Despues, clicar al ''Imporatr eporte' para cargar su primero fichero QIF.\n"
-"Cargar su fichero QIF "
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:119
-msgid ""
-"Plan the next reminder (but it's better to keep in automatic mode so that "
-"Odoo will stick to the follow-up plan of the company)"
-msgstr ""
-"Planear el siguiente recordatorio (pero es mejor mantener un modo automático"
-" para que Odoo se adhiera al plan de seguimiento de la compañía)"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:122
-msgid "Drill down to an invoice"
-msgstr "Examinar a fondo una factura"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:124
-msgid ""
-"Change the expected payment date of an invoice (thus, impacting the next "
-"time Odoo will propose you to send a reminder)"
-msgstr ""
-"Cambiar la fecha de pago esperada de una factura (así, impactando la "
-"siguiente ocasión Odoo le propondrá enviar un recordatorio)"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:128
-msgid ""
-"You can force a customer statement, even if Odoo do not proposes you to do "
-"it, because it's not the right date yet. To do this, you should go to the "
-"Aged Receivable report (in the report menu of the Accounting application). "
-"From this report, you can click on a customer to get to his customer "
-"statement."
-msgstr ""
-"Puede generar el estado de un cliente, aún si Odoo no le propone hacerlo, "
-"porque no esta en la fecha correcta aún. Para hacerlo, debe ir al reporte de"
-" Antiguas Cuentas por Cobrar (en el menú de reportes de la aplicación de "
-"Contabilidad). Desde este reporte, puede dar clic en un cliente para obtener"
-" su estado de cliente."
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:135
-msgid "How to exclude an invoice from auto follow up?"
-msgstr "¿Cómo excluir una factura de auto seguimiento?"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:137
-msgid "To see all **overdue invoices** or **on need of action**,"
-msgstr ""
-"Para ver todas las **facturas vencidas** o **en necesidad de acción**,"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:139
-msgid "Go to :menuselection:`Accounting --> Sales --> Customers Statement`"
-msgstr ""
-"Vaya a :menuselection:`Contabilidad --> Ventas --> Estado de Clientes`"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:145
-msgid "Exclude a specific invoice for a specific date"
-msgstr "Excluir una factura específica para una fecha determinada"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:147
-msgid ""
-"Odoo can exclude an invoice from follow-ups actions for specific date by "
-"clicking on **Log a Note**, then choose one of the ready options (*one "
-"week*, *two weeks*, *one month*, *two months*), So Odoo will calculate the "
-"required date according to the current date."
-msgstr ""
-"Odoo puede excluir una factura de las acciones de seguimiento para fechas "
-"específicas haciendo clic en **Registrar una Nota**, luego elija una de las "
-"opciones listas (*una semana*, *dos semanas*, *un mes*, *dos meses*), así "
-"Odoo calculará la fecha requerida de acuerdo a la fecha actual."
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:155
-msgid ""
-"Another way to achieve it is the following: click on the required invoice, "
-"then choose **Change expected payment date/note**, then enter a new payment "
-"date and note."
-msgstr ""
-"Otra forma de alcanzarlo es la siguiente: de clic en la factura requerida, "
-"luego elija **Cambiar fecha esperada de pago/nota**, luego ingrese la nueva "
-"fecha de pago y nota."
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:162
-msgid "Exclude a specific invoice forever"
-msgstr "Excluir una factura específica para siempre"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:164
-msgid ""
-"Odoo can exclude an invoice for a specific customer by clicking on the "
-"checkbox **Excluded**"
-msgstr ""
-"Odoo puede excluir una factura para un cliente específico haciendo clic en "
-"la casilla **Excluidos**"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:168
-msgid "If you click on **History**, you can see all follow ups actions."
-msgstr ""
-"Si hace clic en **Historial**, puede ver todas las accionesde seguimiento."
-
 #: ../../accounting/receivables/customer_payments/check.rst:3
 msgid "How to register customer payments by checks?"
 msgstr "¿Cómo registrar pagos de clientes con cheques?"
@@ -14807,7 +14533,6 @@ msgstr ""
 " cuenta bancaria relacionada)."
 
 #: ../../accounting/receivables/customer_payments/credit_cards.rst:166
-#: ../../accounting/receivables/customer_payments/followup.rst:167
 msgid ":doc:`recording`"
 msgstr ":doc:`recording`"
 
@@ -14822,306 +14547,95 @@ msgid ":doc:`followup`"
 msgstr ":doc:`followup`"
 
 #: ../../accounting/receivables/customer_payments/followup.rst:3
-msgid "How to get paid and organize customer follow-ups?"
-msgstr "¿Cómo obtener pagos y organizar seguimientos a clientes?"
+msgid "Follow-up on invoices and get paid faster"
+msgstr ""
 
 #: ../../accounting/receivables/customer_payments/followup.rst:5
 msgid ""
-"Getting paid and organizing customer reminders is always a difficult task, "
-"however it is critical for the health of the company to stay diligent about "
-"outstanding receivables. Fortunately, Odoo provides the right tools to track"
-" receivables, automate customer statements, and measure your performance."
+"It is essential for your business to collect payments when they are overdue."
+" Odoo will help you identify payments that are late and will allow you to "
+"send the appropriate reminders."
 msgstr ""
-"Obtener pagos y organizar recordatorios a clientes siempre es una tarea "
-"díficil, sin embargo, es crítico para la salud de la compañía ser diligente "
-"con las cuentas por cobrar pendientes. Afortunadamente, Odoo proveé las "
-"herramientas adecuadas para rastrear cuentas por cobrar, automatizar estados"
-" de clientes, y medir su comportamiento."
 
-#: ../../accounting/receivables/customer_payments/followup.rst:12
-msgid "Customer follow-ups: A step by step guide"
-msgstr "Seguimientos a clientes: guía paso a paso"
+#: ../../accounting/receivables/customer_payments/followup.rst:10
+msgid "Manage your follow-ups"
+msgstr ""
 
-#: ../../accounting/receivables/customer_payments/followup.rst:15
-msgid "Cleaning up outstanding payments"
-msgstr "Deshaciéndose de pagos pendientes"
+#: ../../accounting/receivables/customer_payments/followup.rst:13
+msgid ""
+"We recommend that you reconcile your bank statements before launching your "
+"follow-up process. It will avoid you the trouble of sending a statement to a"
+" customer that has already paid you."
+msgstr ""
 
 #: ../../accounting/receivables/customer_payments/followup.rst:17
 msgid ""
-"If you have any unreconciled transactions in your bank account, you will "
-"need to process them first before you begin analyzing your customers "
-"statements. This ensures that you have recorded all of the latest customer "
-"payments before sending out reminders to any customers with outstanding "
-"balances."
+"The overdue invoices you need to follow-up on are available by default in "
+":menuselection:`Accounting --> Sales --> Follow-up Reports`. There, you can "
+"easily send a reminder by email or print it as a letter. Then, you can click"
+" on the *Done* button to view the next follow-up that needs your attention."
 msgstr ""
-"Si tiene algunas transacciones sin conciliar en su cuenta bancaria, "
-"necesitará procesarlas primero antes de empezar a analizar los estados de "
-"sus clientes. Esto asegura que ha registrado todos los últimos pagos de "
-"clientes antes de enviar recordatorios a clientes con saldos pendientes."
 
-#: ../../accounting/receivables/customer_payments/followup.rst:27
-msgid "Checking the Aged Receivables report"
-msgstr "Revisar el reporte de Antiguas Cuentas por Cobrar"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:29
+#: ../../accounting/receivables/customer_payments/followup.rst:23
 msgid ""
-"After you have reconciled all of your bank accounts, you can then generate "
-"an accurate Aged Receivables Report from the Reports menu. This report will "
-"display all of the customers and their outstanding balances on open "
-"invoices."
+"Otherwise, if now is not the time for a reminder, click on *Remind me "
+"later*. You will get the next report according to the *Next Reminder Date* "
+"set on the statement."
 msgstr ""
-"Después de haber conciliado todas sus cuentas bancarias, puede generar un "
-"Reporte de Antiguas Cuentas por Cobrar preciso desde el menú de Reportes., "
-"Este reporte mostrará todos los clientes y sus saldos pendientes en facturas"
-" abiertas."
 
-#: ../../accounting/receivables/customer_payments/followup.rst:37
+#: ../../accounting/receivables/customer_payments/followup.rst:28
 msgid ""
-"The report displays this information in time increments to better paint a "
-"picture of the outstanding balances your customers hold and for how long "
-"they have held these outstanding balances. You can then appropriately focus "
-"your efforts on the appropriate customers."
+"To avoid sending too many reminders in a short period of time, change the "
+"number of days calculated between each report by going to "
+":menuselection:`Accounting --> Configuration --> Settings --> Payment "
+"Follow-up`."
+msgstr ""
+
+#: ../../accounting/receivables/customer_payments/followup.rst:33
+msgid ""
+"You can also set a trust level for your customers by marking them as bad, "
+"normal or good debtors on the follow-up reports."
+msgstr ""
+
+#: ../../accounting/receivables/customer_payments/followup.rst:40
+msgid "Send reminders in batch"
 msgstr ""
-"El reporte muestra esta información con incrementos de tiempo para la mejor "
-"visualización de los saldos pendientes que mantienen sus clientes y por "
-"cuánto tiempo han mantenido estos saldos. Luego, puede enfocar "
-"apropiadamente sus esfuerzos en los clientes puntuales."
 
 #: ../../accounting/receivables/customer_payments/followup.rst:42
 msgid ""
-"You can then select any of the customers on this list and Odoo will open up "
-"their invoice details in the form of the Customer Follow-Up letter, also "
-"known as the **Customer Statement**."
+"To get your follow-up process easier, you can send reminder emails in batch "
+"from your follow-up reports page. Select all the reports you would like to "
+"process, click on *Action* and then on *Process Follow-ups*. A pdf document "
+"containing all of the follow-up letters for you to print will also be "
+"automatically generated."
 msgstr ""
-"Puede seleccionar cualquiera de los clientes en la lista y Odoo abrirá los "
-"detalles de sus facturas en la forma de carta de Seguimiento a Clientes, "
-"también conocida como **Estado de Cliente**."
 
-#: ../../accounting/receivables/customer_payments/followup.rst:49
-msgid "From the customer statement, you can:"
-msgstr "Desde el estado de cliente, Ud. puede:"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:51
-msgid "Change and customize the message that is sent to the customer"
-msgstr "Cambiar y personalizar el mensaje que es enviado al cliente"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:53
-msgid "Send a reminder email to the customer"
-msgstr "Enviar un recordatorio al cliente"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:55
-msgid "Send a printed reminder letter to the customer"
-msgstr "Enviar una carta de recordatorio impresa al cliente"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:57
-msgid "Send automated printed reminders by utilizing our Docsaway integration"
+#: ../../accounting/receivables/customer_payments/followup.rst:52
+msgid "Plan a follow-up process"
 msgstr ""
-"Enviar recordatorios impresos automátizados por medio de nuestra integración"
-" Docsaway"
 
-#: ../../accounting/receivables/customer_payments/followup.rst:60
-msgid "Zoom in on the different open invoices or payments"
-msgstr "Acercar en las diferentes facturas abiertas o pagos"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:62
-msgid "Remove an invoice or payment from the report (in case of conflict)"
-msgstr "Remover una factura o pago desde el reporte (en caso de conflicto)"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:64
-msgid "Log any call notes made to the customer"
-msgstr "Registrar cualquier nota de llamada hecha al cliente"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:66
+#: ../../accounting/receivables/customer_payments/followup.rst:54
 msgid ""
-"Schedule your next follow up task to stay on top of customer payments (e.g. "
-"call back in 15 days if not payments are made)"
+"To plan a follow-up process, go to :menuselection:`Accounting --> "
+"Configuration --> Settings` and activate the *Follow-up Levels* feature "
+"under the *Customer Payments* section. Then, click on the new *Follow-up "
+"Levels* button that has appeared on your settings page."
+msgstr ""
+
+#: ../../accounting/receivables/customer_payments/followup.rst:59
+msgid ""
+"A follow-up plan with several actions is available by default in Odoo, but "
+"you can customize it any way you want. Depending on a specific number of "
+"overdue days, plan to send an email, a letter or to undertake a manual "
+"action. You can also edit the template used for the statement according to "
+"the stage of the process."
 msgstr ""
-"Programar su próximo seguimiento para permanecer encima de los pagos de "
-"clientes (ej. llamar en 15 días si los pagos no se han hecho)"
 
 #: ../../accounting/receivables/customer_payments/followup.rst:69
 msgid ""
-"You can set reminders for when you would like to next contact the particular"
-" customer. Selecting **Manual** will open up the follow up scheduling tool, "
-"while selecting **Auto** will automatically recommend that you contact the "
-"customer 15 days from then if the customer has not yet paid for the invoice."
-" Installing the **Follow-Up Plans** module will allow you to define "
-"automated actions and intervals to send reminders."
+"If you would like to get a reminder before the actual due date, set a "
+"negative number of due days."
 msgstr ""
-"Puede configurar recordatorios para cuando quisiera contactar de nuevo a un "
-"cliente en particular. Seleccionando **Manual** abrirá la herramienta "
-"programar seguimiento, mientras que seleccionando **Auto** le recomendaremos"
-" automáticamente que contacte al cliente dentro de 15 días si el cliente no "
-"ha pagado aún la factura. Instalando el módulo **Planes de Seguimiento** le "
-"permitiremos definir acciones automatizadas e intervalos para enviar "
-"recordatorios."
-
-#: ../../accounting/receivables/customer_payments/followup.rst:79
-msgid ""
-"If you have already sent out a reminder to a customer a few days ago, a "
-"warning message will appear at the top of the screen, reminding you that you"
-" should not send another reminder so soon since one was already sent "
-"recently. Every time you log a note, Odoo will automatically set the next "
-"reminder date, unless you choose to manually set it by selecting the next "
-"reminder button at the top right of the screen."
-msgstr ""
-"Si ya le ha enviado un recordatorio a un cliente hace unos días, un mensaje "
-"de alerta aparecerá en la parte superior de la pantalla, recordándole que no"
-" debe enviar otro recordatorio tan pronto ya que uno ya fue enviado "
-"recientemente. Cada vez que registre una nota, Odoo configurará "
-"automáticamente la siguiente fecha de recordatorio, a menos que elija "
-"configurarla manualmente seleccionando el botón de siguiente recordatorio en"
-" el extremo superior derecho de la pantalla."
-
-#: ../../accounting/receivables/customer_payments/followup.rst:88
-msgid ""
-"You can also specify the expected payment date on an invoice line directly, "
-"therefore defining the next reminder in case the invoice has not been paid."
-msgstr ""
-"También puede específicar la fecha de pago esperado directamente en una "
-"línea de la factura, por consiguiente, definir el siguiente recordatorio en "
-"caso que la factura no haya sido pagada."
-
-#: ../../accounting/receivables/customer_payments/followup.rst:92
-msgid "Sending customer statements"
-msgstr "Enviar estados de clientes"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:94
-msgid ""
-"Send your customers reminders in batches in the menu :menuselection:`Sales "
-"--> Customer Statements`."
-msgstr ""
-"Enviar sus recordatorios a clientes en lote en el menú "
-":menuselection:`Ventas --> Estados de Clientes`."
-
-#: ../../accounting/receivables/customer_payments/followup.rst:97
-msgid ""
-"Here Odoo will open all the statements awaiting to be processed, which is "
-"determined by the last reminder they received. You can choose to process "
-"them one by one, send multiple letters or emails in batches, or set a next "
-"action date for the next time they'll be contacted."
-msgstr ""
-"Aquí Odoo abrirá todos los estados que están esperando ser procesados, lo "
-"cual es determinado por el último recordatorio que ellos recibieron. Puede "
-"elegir procesarlos uno por uno, enviar múltiples cartas o emails en lotes, o"
-" configurar una fecha siguiente de acción para la siguiente ocasión en que "
-"sean contactados."
-
-#: ../../accounting/receivables/customer_payments/followup.rst:104
-msgid ""
-"If an invoice has not yet been paid, Odoo will remind you to contact at "
-"particular customer based after their next action date."
-msgstr ""
-"Si una factura aún no ha sido pagada, Odoo le recordará contactar al cliente"
-" particular basado después en su fecha siguiente de acción."
-
-#: ../../accounting/receivables/customer_payments/followup.rst:107
-msgid ""
-"You can access the customer statement report daily and Odoo will only "
-"display the customers you need to contact on any given day. This is based "
-"on:"
-msgstr ""
-"Puede ingresar al reporte de estado del cliente diariamente y Odoo solo "
-"mostrará los clientes que debe contactar en algún día dado. Esto es basado "
-"en:"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:111
-msgid "Customers you have not yet received a payment from"
-msgstr "Clientes de los aún no ha recibido un pago"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:113
-msgid ""
-"Customers that have not been reminded over the last X days (\"X\" being "
-"defined as the overdue date of the invoice after the first reminder, then "
-"the next action date set at every reminder)"
-msgstr ""
-"Clientes que no han sigo recordados durante los últimdos X días (\"X\" "
-"siendo definido como la fecha vencida de la factura después del primer "
-"recordatorio, luego la siguiente fecha de acción configura cada "
-"recordatorio)"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:118
-msgid "Setting up your dunning process"
-msgstr "Configurar su proceso de reclamación"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:120
-msgid ""
-"The **Payment Follow-up Management** module allows you to define reminder "
-"plans. After installing it from the **Apps** menu, go to the **Follow-up "
-"Levels** menu in the accounting configuration to set up your dunning "
-"process."
-msgstr ""
-"El módulo **Administración de Recordatorios de Pago** le permite definir "
-"planes de recordatorio. Después de instalarlo desde el menú "
-"**Aplicaciones**, vaya al menú **Niveles de Seguimiento** en la "
-"configuración de contabilidad para configurar su proceso de reclamación."
-
-#: ../../accounting/receivables/customer_payments/followup.rst:125
-msgid "Some Examples are:"
-msgstr "Algunos ejemplos son:"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:127
-msgid "**Email**: 3 days before overdue date"
-msgstr "**Email**:3 días antes de la fecha de vencimiento"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:129
-msgid "**Email+Letter**: at the overdue date"
-msgstr "**Email+Carta**: en la fecha de vencimiento"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:131
-msgid "**Email+Call**: 15 days after the overdue date"
-msgstr "**Email+Llamada**: 15 días después de la fecha de vencimiento"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:133
-msgid "**Email+Letter**: 60 days after the overdue date"
-msgstr "**Email+Carta**: 60 días después de la fecha de vencimiento"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:138
-msgid ""
-"Thanks to this module, you can send every email and letters in batches for "
-"all your customers at once. The next reminder will automatically be computed"
-" based on your configured follow-up plan."
-msgstr ""
-"Gracias a este módulo, puede enviar cada email y carta en lotes para todos "
-"sus clientes a la vez. El siguiente recordatorio será automáticamente "
-"calculado basado en su plan configurado de seguimiento."
-
-#: ../../accounting/receivables/customer_payments/followup.rst:142
-msgid ""
-"The module will also add a red/green dot on each customer, this will allow "
-"you to easily mark customer status's with the following options: \"Good "
-"Debtor, Normal Debtor, or bad debtors."
-msgstr ""
-"El módulo también agregará un punto rojo/verde en cada cliente, esto "
-"permitirá que pueda fácilmente marcar el estado del cliente con las "
-"siguientes opciones: \"Buen Deudor, Deudor Normal, o malos deudores."
-
-#: ../../accounting/receivables/customer_payments/followup.rst:150
-msgid "DSO: Measuring your performance"
-msgstr "DDV: Medir su comportamiento"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:152
-msgid ""
-"The DSO (Days of Outstanding Sales) is a measure of the average number of "
-"days that a company takes to collect revenue after a sale has been made. DSO"
-" is calculated by dividing the amount of accounts receivable during a given "
-"period by the total value of credit sales during the same period, and "
-"multiplying the result by the number of days in the period measured."
-msgstr ""
-"El DDV (Días Destacados de Ventas) es una medida de promedio de número de "
-"días que una compañía toma para percibir ingresos después de una venta "
-"realizada. El DDV es calculado dividiendo el monto en las cuentas por cobrar"
-" durante un período dado por el valor total de ventas a crédito durante el "
-"mismo período, y multiplicando el resultado por el número de días en el "
-"período medido."
-
-#: ../../accounting/receivables/customer_payments/followup.rst:159
-msgid ""
-"You can get the DSO of your company from the Executive Summary report under "
-"Reporting (check the KPI average debtors days)."
-msgstr ""
-"Puede obtener el DDV de su compañía desde el reporte Resumen Ejecutivo bajo "
-"Reportes (revisar el KPI días promedio de deudores)."
 
 #: ../../accounting/receivables/customer_payments/payment_sepa.rst:3
 #: ../../accounting/receivables/customer_payments/payment_sepa.rst:29
diff --git a/locale/es/LC_MESSAGES/applications.po b/locale/es/LC_MESSAGES/applications.po
index daa10806b..75168005d 100644
--- a/locale/es/LC_MESSAGES/applications.po
+++ b/locale/es/LC_MESSAGES/applications.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2015-TODAY, Odoo S.A.
-# This file is distributed under the same license as the Odoo Business package.
+# This file is distributed under the same license as the Odoo package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 10.0\n"
+"Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-07 09:30+0200\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Martin Trigaux, 2017\n"
+"Last-Translator: Martin Trigaux, 2018\n"
 "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/locale/es/LC_MESSAGES/discuss.po b/locale/es/LC_MESSAGES/discuss.po
index 288e943ca..d0825a250 100644
--- a/locale/es/LC_MESSAGES/discuss.po
+++ b/locale/es/LC_MESSAGES/discuss.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-27 11:08+0200\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Pablo Rojas <rojaspablo88@gmail.com>, 2018\n"
+"Last-Translator: Fairuoz Hussein Naranjo <l92hunaf@gmail.com>, 2018\n"
 "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,23 +30,32 @@ msgstr ""
 msgid ""
 "This document is mainly dedicated to Odoo on-premise users who don't benefit"
 " from an out-of-the-box solution to send and receive emails in Odoo, unlike "
-"in `Odoo Online <https://www.odoo.com/trial>`__ & `Odoo.sh "
+"`Odoo Online <https://www.odoo.com/trial>`__ & `Odoo.sh "
 "<https://www.odoo.sh>`__."
 msgstr ""
 
 #: ../../discuss/email_servers.rst:9
 msgid ""
 "If no one in your company is used to manage email servers, we strongly "
-"recommend that you opt for such convenient Odoo hosting solutions. Indeed "
-"their email system works instantly and is monitored by professionals. "
-"Nevertheless you can still use your own email servers if you want to manage "
-"your email server's reputation yourself."
+"recommend that you opt for those Odoo hosting solutions. Their email system "
+"works instantly and is monitored by professionals. Nevertheless you can "
+"still use your own email servers if you want to manage your email server's "
+"reputation yourself."
 msgstr ""
 
 #: ../../discuss/email_servers.rst:15
 msgid ""
-"You will find here below some useful information to do so by integrating "
-"your own email solution with Odoo. .. note::"
+"You will find here below some useful information on how to integrate your "
+"own email solution with Odoo."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:18
+msgid ""
+"Office 365 email servers don't allow easiliy to send external emails from "
+"hosts like Odoo. Refer to the `Microsoft's documentation "
+"<https://support.office.com/en-us/article/How-to-set-up-a-multifunction-"
+"device-or-application-to-send-email-using-"
+"Office-365-69f58e99-c550-4274-ad18-c805d654b4c4>`__ to make it work."
 msgstr ""
 
 #: ../../discuss/email_servers.rst:24
@@ -498,6 +507,27 @@ msgid ""
 "their *Category* is set as *Meeting*."
 msgstr ""
 
+#: ../../discuss/plan_activities.rst:40
+msgid "Schedule a chain of activities to follow"
+msgstr ""
+
+#: ../../discuss/plan_activities.rst:42
+msgid ""
+"Odoo helps you easily plan your usual flow of activities. Go to "
+":menuselection:`Configuration --> Activity Types` and set the common "
+"following steps as *Recommended next activities*."
+msgstr ""
+
+#: ../../discuss/plan_activities.rst:49
+msgid ""
+"Now, when an activity is completed, you can select *Done & schedule next*. "
+"The next steps will automatically be suggested to you."
+msgstr ""
+
+#: ../../discuss/plan_activities.rst:55
+msgid "Have fun getting better organized by planning activities !"
+msgstr ""
+
 #: ../../discuss/team_communication.rst:3
 msgid "How to efficiently communicate in team using channels"
 msgstr ""
diff --git a/locale/es/LC_MESSAGES/ecommerce.po b/locale/es/LC_MESSAGES/ecommerce.po
index 0dc951844..136b93309 100644
--- a/locale/es/LC_MESSAGES/ecommerce.po
+++ b/locale/es/LC_MESSAGES/ecommerce.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2015-TODAY, Odoo S.A.
-# This file is distributed under the same license as the Odoo Business package.
+# This file is distributed under the same license as the Odoo package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 10.0\n"
+"Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-10 09:08+0200\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Kelly Quintero <kiutba@gmail.com>, 2018\n"
+"Last-Translator: Lina Maria Avendaño Carvajal <lina8823@gmail.com>, 2018\n"
 "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -273,9 +273,9 @@ msgid ""
 "drop-down menu or color buttons. You get several variants as soon as there "
 "are 2 values for 1 attribute."
 msgstr ""
-"Agregue tantos atributos como necesite de tres tipos diferentes: botones de "
+"Agregue tantos atributos como necesite de 3 tipos diferentes: botones de "
 "opción, menús desplegables o botones de color. Obtendrá distintas variantes "
-"tan pronto como tenga dos valores por atributo."
+"tan pronto como tenga 2 valores por 1 atributo."
 
 #: ../../ecommerce/managing_products/variants.rst:30
 msgid "How to edit variants"
@@ -350,8 +350,8 @@ msgid ""
 "The Price Extra is added to the product price whenever the corresponding "
 "attribute value is selected."
 msgstr ""
-"El Precio Extra es agregado al precio del producto el valor del atributo "
-"correspondiente es seleccionado"
+"El \"Precio Extra\" es agregado al precio del producto cuando el valor del "
+"atributo correspondiente es seleccionado"
 
 #: ../../ecommerce/managing_products/variants.rst:76
 msgid ""
@@ -359,7 +359,7 @@ msgid ""
 "product variants. See :doc:`../maximizing_revenue/pricing`."
 msgstr ""
 "Las fórmulas en las listas de precios le permiten configurar métodos de "
-"cálculos avanzados de precios para las variantes de los productos. Ver: "
+"cálculos de precios avanzados para las variantes de los productos. Ver: "
 "doc:'../maximzing_revenue/pricing'"
 
 #: ../../ecommerce/managing_products/variants.rst:80
@@ -570,7 +570,7 @@ msgstr ""
 #: ../../ecommerce/maximizing_revenue/promo_code.rst:9
 #: ../../ecommerce/maximizing_revenue/reviews.rst:13
 msgid "Setup"
-msgstr "Configuración"
+msgstr "Configurar"
 
 #: ../../ecommerce/maximizing_revenue/promo_code.rst:11
 msgid ""
@@ -604,6 +604,8 @@ msgid ""
 "Once turned on you see a new section on the right side. On clicking *Apply* "
 "prices get automatically updated in the cart."
 msgstr ""
+"Una vez activado verá una nueva sección en el lado derecho. Al seleccionar "
+"*Aplicar* los precios serán actualizados automáticamente en la cartilla"
 
 #: ../../ecommerce/maximizing_revenue/promo_code.rst:33
 msgid ""
@@ -742,7 +744,7 @@ msgstr ""
 
 #: ../../ecommerce/overview/introduction.rst:15
 msgid "Pricing"
-msgstr "Fijación de precios"
+msgstr "Precio"
 
 #: ../../ecommerce/overview/introduction.rst:16
 msgid "Taxes"
diff --git a/locale/es/LC_MESSAGES/general.po b/locale/es/LC_MESSAGES/general.po
index 85ab9590f..24f87a2ba 100644
--- a/locale/es/LC_MESSAGES/general.po
+++ b/locale/es/LC_MESSAGES/general.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2015-TODAY, Odoo S.A.
-# This file is distributed under the same license as the Odoo Business package.
+# This file is distributed under the same license as the Odoo package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 10.0\n"
+"Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-10 09:08+0200\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Pablo Rojas <rojaspablo88@gmail.com>, 2017\n"
+"Last-Translator: Jimmy Ramos <jimmybanegas93@gmail.com>, 2018\n"
 "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -302,6 +302,12 @@ msgid ""
 "unique identifier. You can also find this record using its name but you will"
 " be stuck if at least 2 records have the same name."
 msgstr ""
+"Para re-crear las relaciones entre los distintos registros, deberías usar el"
+" identificador único de la aplicación original y mapearlo con la columna "
+"**ID** (ID Externo) en Odoo. Cuando importas otro registor que se relaciona "
+"con el primero, usa **XXX/ID** (XXX/ID Externo) para el identificador "
+"original. Puedes también encontrar este registro usando su nombre pero te "
+"vas a encontrar con al menos 2 registros con el mismo nombre."
 
 #: ../../general/base_import/import_faq.rst:54
 msgid ""
@@ -309,6 +315,9 @@ msgid ""
 "re-import modified data later, it's thus good practice to specify it "
 "whenever possible."
 msgstr ""
+"El **ID** será usado para actualizar la importacion original si necesitas "
+"re-importar los datos después, aunque es buena práctica especificarlo cuando"
+" sea posible."
 
 #: ../../general/base_import/import_faq.rst:60
 msgid "I cannot find the field I want to map my column to"
@@ -324,6 +333,13 @@ msgid ""
 "wrong or that you want to map your column to a field that is not proposed by"
 " default."
 msgstr ""
+"Odoo trata de buscar con algo de heurística, basado en las primeras diez "
+"líneas de los archivos, el tipo del campo por cada columna dentro de tu "
+"archivo. Por ejemplo si tienes una columna que solo contiene númetos, solo "
+"los campos que son de tipo *Entero* se mostrarán para que escojas. Miestras "
+"que este comportamiento puede resultar bueno y fácil para muchos casos, es "
+"también posible que no salga bien o que quieras mapear tu columna con un "
+"campo que no es propuesto por defecto."
 
 #: ../../general/base_import/import_faq.rst:71
 msgid ""
@@ -331,6 +347,9 @@ msgid ""
 "fields (advanced)** option, you will then be able to choose from the "
 "complete list of fields for each column."
 msgstr ""
+"Si eso pasa, solo tienes que seleccionar la opción **Mostrar campos de "
+"campos de relación (avanzado)**, despúes podrás elegir de la lista completa "
+"de cada columna."
 
 #: ../../general/base_import/import_faq.rst:79
 msgid "Where can I change the date import format?"
@@ -345,6 +364,13 @@ msgid ""
 "inverted as example) as it is difficult to guess correctly which part is the"
 " day and which one is the month in a date like '01-03-2016'."
 msgstr ""
+"Odoo puede detectar automáticamente si una columna es una fecha y tratar de "
+"inferir el formato de la fecha de un set de formatos de fechas más usuados. "
+"Mientras este proceso puede funcionar para muchos formatos de fecha simples,"
+" algunos más exóticos not podrán ser reconocidos y por lo tanto es posible "
+"tener algún tipo de confusión (día y mes invertido por ejemplo) ya que es "
+"difícil saber cual parte es el día y cual es el mes en fechas como "
+"'01-03-2016'."
 
 #: ../../general/base_import/import_faq.rst:83
 msgid ""
@@ -353,6 +379,11 @@ msgid ""
 "selector. If this format is incorrect you can change it to your liking using"
 " the *ISO 8601* to define the format."
 msgstr ""
+"Para ver cuáles formatos de fecha ha encontrado Odoo en tu archvico, puedes "
+"revisar **Formato de fecha** que es mostrado cuando haces clic en "
+"**Opciones** bajo el selector de archivos. Si el formato es incorrecto "
+"puedes cambiarlo a tu preferencia usando el **ISO 8601** para definir el "
+"formato."
 
 #: ../../general/base_import/import_faq.rst:86
 msgid ""
@@ -361,6 +392,10 @@ msgid ""
 " stored. That way you will be sure that the date format is correct in Odoo "
 "whatever your locale date format is."
 msgstr ""
+"Si estás importando un archivo de excel (.xls, .xlsx), puedes usar celdad "
+"tipo fecha ya que las fechas se muestran de manera distinta a como se "
+"almacenan. De esa forma te puedes asegurar que el formato de fecha está "
+"correcto independientemente del formato de fecha de la localización."
 
 #: ../../general/base_import/import_faq.rst:91
 msgid "Can I import numbers with currency sign (e.g.: $32.00)?"
@@ -375,11 +410,17 @@ msgid ""
 "known to Odoo, it might not be recognized as a number though and it will "
 "crash."
 msgstr ""
+"Sí, soportamos números con paréntesis que representan signos negativos así "
+"como números con el signo de moneda. Odoo detecta automáticamtte cual "
+"separador miles/decimal usas (puedes cambiar eso bajo **opciones**). Si usas"
+" un símbolo de moneda que no es conocido por Odoo, puede no ser reconocido "
+"como un número y podrá dar error."
 
 #: ../../general/base_import/import_faq.rst:95
 msgid ""
 "Examples of supported numbers (using thirty-two thousands as an example):"
 msgstr ""
+"Ejemplos de números soportados (usadndo treinta y dos mil como ejemplo):"
 
 #: ../../general/base_import/import_faq.rst:97
 msgid "32.000,00"
@@ -424,6 +465,8 @@ msgstr "$ (32.000,00)"
 #: ../../general/base_import/import_faq.rst:113
 msgid "What can I do when the Import preview table isn't displayed correctly?"
 msgstr ""
+"¿Qué puedo hacer cuando la tabla de vista previa de Importar no se muestra "
+"correctamente?"
 
 #: ../../general/base_import/import_faq.rst:115
 msgid ""
@@ -432,6 +475,11 @@ msgid ""
 "settings, you can modify the File Format Options (displayed under the Browse"
 " CSV file bar after you select your file)."
 msgstr ""
+"Por defecto, la previsualización de la importación se establece con comas "
+"como separadores de campo y comillas como delimitadores de texto. Si su "
+"archivo CSV no tiene estos parámetros, puede modificar las opciones de "
+"formato de archivo (mostradas bajo la barra de 'Seleccionar archivo CSV' "
+"después de seleccionar el archivo)."
 
 #: ../../general/base_import/import_faq.rst:117
 msgid ""
@@ -439,12 +487,18 @@ msgid ""
 "detect the separations. You will need to change the file format options in "
 "your spreadsheet application. See the following question."
 msgstr ""
+"Tenga en cuenta que si su archivo CSV tiene como separador el tabulador, "
+"Odoo no detectará las separaciones. Necesitará cambiar las opciones del "
+"formato de archivo en su aplicación de hoja de cálculo. Vea la siguiente "
+"pregunta."
 
 #: ../../general/base_import/import_faq.rst:122
 msgid ""
 "How can I change the CSV file format options when saving in my spreadsheet "
 "application?"
 msgstr ""
+"¿Cómo puede cambiar el formato del archivo CSV cuando se guarda en mi "
+"aplicación de hoja de cálculo?"
 
 #: ../../general/base_import/import_faq.rst:124
 msgid ""
@@ -454,16 +508,24 @@ msgid ""
 "modify all three options (in 'Save As' dialog box > Check the box 'Edit "
 "filter settings' > Save)."
 msgstr ""
+"Si edita y guarda archivos en las aplicaciones de hoja de cálculo, se "
+"aplicará la configuración regional del ordenador para el separador y el "
+"delimitador. Le sugerimos usar OpenOffice o LibreOffice Calc, que permiten "
+"modificar dichas opciones (en 'Guardar como...' > Marcar casilla 'Editar "
+"filtro' > Gurdar)."
 
 #: ../../general/base_import/import_faq.rst:126
 msgid ""
 "Microsoft Excel will allow you to modify only the encoding when saving (in "
 "'Save As' dialog box > click 'Tools' dropdown list > Encoding tab)."
 msgstr ""
+"Microsoft Excel permite modificar solamente la codificación cuando guarda un"
+" archivo CSV (en el cuadro de diálogo 'Guardar como' > pulsar la lista "
+"desplegable 'Herramientas' > pestaña 'Codificación')."
 
 #: ../../general/base_import/import_faq.rst:131
 msgid "What's the difference between Database ID and External ID?"
-msgstr ""
+msgstr "¿Cuál es la diferencia entre id. de la BD e ID Externo?"
 
 #: ../../general/base_import/import_faq.rst:133
 msgid ""
@@ -474,12 +536,19 @@ msgid ""
 "mechanisms. You must use one and only one mechanism per field you want to "
 "import."
 msgstr ""
+"Algunos campos definen una relación con otro objeto. Por ejemplo, el país de"
+" un contacto es un enlace a un objeto 'País'. Cuando quiere importar esos "
+"campos, Odoo tendrá que recrear los enlaces entre los correspondientes "
+"campos. Odoo provee 3 mecanismos. Debe usar uno y sólo uno de esos "
+"mecanismos por campo a importar."
 
 #: ../../general/base_import/import_faq.rst:135
 msgid ""
 "For example, to reference the country of a contact, Odoo proposes you 3 "
 "different fields to import:"
 msgstr ""
+"Por ejemplo, para referenciar el país de un contacto, Odoo propone 3 modos "
+"diferentes de importación:"
 
 #: ../../general/base_import/import_faq.rst:137
 msgid "Country: the name or code of the country"
@@ -490,16 +559,21 @@ msgid ""
 "Country/Database ID: the unique Odoo ID for a record, defined by the ID "
 "postgresql column"
 msgstr ""
+"País/ID de Base de datos: el ID único de Odoo para un registro, definido por"
+" la columna ID de PostgreSQL"
 
 #: ../../general/base_import/import_faq.rst:139
 msgid ""
 "Country/External ID: the ID of this record referenced in another application"
 " (or the .XML file that imported it)"
 msgstr ""
+"País/ID Externo: el ID de este registro referenciado en otra aplicación (o "
+"del archivo .XML que lo importó)"
 
 #: ../../general/base_import/import_faq.rst:141
 msgid "For the country Belgium, you can use one of these 3 ways to import:"
 msgstr ""
+"Para el país Bélgica, puede usar uno de estos3 métodos de importación:"
 
 #: ../../general/base_import/import_faq.rst:143
 msgid "Country: Belgium"
@@ -507,7 +581,7 @@ msgstr "País: Bélgica"
 
 #: ../../general/base_import/import_faq.rst:144
 msgid "Country/Database ID: 21"
-msgstr ""
+msgstr "País/Id. de la BD: 21"
 
 #: ../../general/base_import/import_faq.rst:145
 msgid "Country/External ID: base.be"
@@ -519,12 +593,17 @@ msgid ""
 "records in relations. Here is when you should use one or the other, "
 "according to your need:"
 msgstr ""
+"De acuerdo a sus necesidades, puede usar una de estas 3 formas de "
+"referenciar registros en las relaciones. Aquí es donde debe usar una u otra,"
+" conforme a sus necesidades:"
 
 #: ../../general/base_import/import_faq.rst:149
 msgid ""
 "Use Country: This is the easiest way when your data come from CSV files that"
 " have been created manually."
 msgstr ""
+"Usar País: Ésta es lo forma más sencilla cuando los datos provienen de "
+"archivos CSV que se han creado manualmente."
 
 #: ../../general/base_import/import_faq.rst:150
 msgid ""
@@ -533,12 +612,18 @@ msgid ""
 "may have several records with the same name, but they always have a unique "
 "Database ID)"
 msgstr ""
+"Usar País/Id. de la BD: Raramente debería usar esta notación. Se usa más a "
+"menudo por los desarrolladores puesto que su principal ventaja es la de no "
+"tener nunca conflictos (puede que tenga varios registros con el mismo "
+"nombre, pero sólo tendrán un único id. de base de datos)"
 
 #: ../../general/base_import/import_faq.rst:151
 msgid ""
 "Use Country/External ID: Use External ID when you import data from a third "
 "party application."
 msgstr ""
+"Usar País/Id. externo: Use id. externo cuando importa datos de una "
+"aplicación externa."
 
 #: ../../general/base_import/import_faq.rst:153
 msgid ""
@@ -548,18 +633,27 @@ msgid ""
 "\"Field/External ID\". The following two CSV files give you an example for "
 "Products and their Categories."
 msgstr ""
+"Cuando se usan identificadores externos, puede importar archivos CSV con la "
+"columna \"Id. externo\" para definir el id. externo de cada registro a "
+"importar. Entonces, podrá hacer referencia a ese registro con columnas del "
+"tipo \"Id. de campo/externo\". Los siguientes dos archivos son un ejemplo "
+"para los productos y sus categorías."
 
 #: ../../general/base_import/import_faq.rst:155
 msgid ""
 "`CSV file for categories "
 "<../../_static/example_files/External_id_3rd_party_application_product_categories.csv>`_."
 msgstr ""
+"`Archivo CSV para categorías "
+"<../../_static/example_files/External_id_3rd_party_application_product_categories.csv>`_."
 
 #: ../../general/base_import/import_faq.rst:157
 msgid ""
 "`CSV file for Products "
 "<../../_static/example_files/External_id_3rd_party_application_products.csv>`_."
 msgstr ""
+"`Archivo CSV para Productos "
+"<../../_static/example_files/External_id_3rd_party_application_products.csv>`_."
 
 #: ../../general/base_import/import_faq.rst:161
 msgid "What can I do if I have multiple matches for a field?"
@@ -575,6 +669,13 @@ msgid ""
 "Category list (\"Misc. Products/Sellable\"). We recommend you modify one of "
 "the duplicates' values or your product category hierarchy."
 msgstr ""
+"Si por ejemplo tiene dos categorías de producto con el nombre hijo de "
+"\"Vendibles\" (por ejemplo \"Productos miscelánea/Vendibles\" y \"Otros "
+"productos/Vendibles\"), la validación se para, pero aún podrá importar los "
+"datos. Sin embargo, recomendamos no importar los datos porque estarán "
+"vinculados todos a la primera categoría \"Vendibles\" encontrada en la lista"
+" de categorías de producto (\"Misc. Productos/Vendibles\"). Recomendamos "
+"modificar uno de los valores duplicados o la jerarquía de categorías."
 
 #: ../../general/base_import/import_faq.rst:165
 msgid ""
@@ -582,12 +683,17 @@ msgid ""
 "categories, we recommend you use make use of the external ID for this field "
 "'Category'."
 msgstr ""
+"Sin embargo, si no desea cambiar la configuración de las categorías de "
+"producto, le recomendamos que haga uso de id. externo para este campo "
+"'Categoría'."
 
 #: ../../general/base_import/import_faq.rst:170
 msgid ""
 "How can I import a many2many relationship field (e.g. a customer that has "
 "multiple tags)?"
 msgstr ""
+"¿Cómo puedo importar un campo de relación many2many (muchos a muchos; por "
+"ejemplo: un cliente que tiene múltiples etiquetas)?"
 
 #: ../../general/base_import/import_faq.rst:172
 msgid ""
@@ -596,18 +702,26 @@ msgid ""
 "'Retailer' then you will encode \"Manufacturer,Retailer\" in the same column"
 " of your CSV file."
 msgstr ""
+"Las etiquetas deben de ir separadas por comas sin espacios. Por ejemplo, si "
+"quieres que tu cliente sea vinculado con ambas etiquetas 'Fabricante' y "
+"'Mayorista', entonces debes codificar 'Fabricante,Mayorista\" en la misma "
+"columna del archivo CSV."
 
 #: ../../general/base_import/import_faq.rst:174
 msgid ""
 "`CSV file for Manufacturer, Retailer "
 "<../../_static/example_files/m2m_customers_tags.csv>`_."
 msgstr ""
+"`Archivo CSV para Fabricante, Minorista "
+"<../../_static/example_files/m2m_customers_tags.csv>`_."
 
 #: ../../general/base_import/import_faq.rst:179
 msgid ""
 "How can I import a one2many relationship (e.g. several Order Lines of a "
 "Sales Order)?"
 msgstr ""
+"¿Cómo puedo importar una relación uno a muchos (one2many - por ejemplo: las "
+"líneas de pedido del pedido de venta)?"
 
 #: ../../general/base_import/import_faq.rst:181
 msgid ""
@@ -619,36 +733,51 @@ msgid ""
 "purchase.order_functional_error_line_cant_adpat.CSV file of some quotations "
 "you can import, based on demo data."
 msgstr ""
+"Si quiere importar los pedidos de venta teniendo varias líneas de pedido; "
+"para cada línea de pedido, necesita reservar una fila específica en el "
+"archivo CSV. La primera línea de pedido será importada en la misma fila que "
+"la información relativa al pedido. Cualquier línea adicional necesitará una "
+"fila adicional que no tenga información en los campos relativos al pedido."
 
 #: ../../general/base_import/import_faq.rst:184
 msgid ""
 "`File for some Quotations "
 "<../../_static/example_files/purchase.order_functional_error_line_cant_adpat.csv>`_."
 msgstr ""
+"`Archivo para algunas Cotizaciones "
+"<../../_static/example_files/purchase.order_functional_error_line_cant_adpat.csv>`_."
 
 #: ../../general/base_import/import_faq.rst:186
 msgid ""
 "The following CSV file shows how to import purchase orders with their "
 "respective purchase order lines:"
 msgstr ""
+"El siguiente archivo CSV muestra como importar pedidos de compra con sus "
+"respectivas líneas de pedido de compra:"
 
 #: ../../general/base_import/import_faq.rst:188
 msgid ""
 "`Purchase orders with their respective purchase order lines "
 "<../../_static/example_files/o2m_purchase_order_lines.csv>`_."
 msgstr ""
+"`Pedidos de compra con sus respectivas líneas de pedido de compra "
+"<../../_static/example_files/o2m_purchase_order_lines.csv>`_."
 
 #: ../../general/base_import/import_faq.rst:190
 msgid ""
 "The following CSV file shows how to import customers and their respective "
 "contacts:"
 msgstr ""
+"El siguiente archivo CSV muestra cómo importar clientes y sus respectivos "
+"contactos:"
 
 #: ../../general/base_import/import_faq.rst:192
 msgid ""
 "`Customers and their respective contacts "
 "<../../_static/example_files/o2m_customers_contacts.csv>`_."
 msgstr ""
+"`Clientes y sus respectivos contactos "
+"<../../_static/example_files/o2m_customers_contacts.csv>`_."
 
 #: ../../general/base_import/import_faq.rst:197
 msgid "Can I import several times the same record?"
@@ -663,16 +792,25 @@ msgid ""
 "two imports. Odoo will take care of creating or modifying each record "
 "depending if it's new or not."
 msgstr ""
+"Si importas un fichero que contiene uno de las siguientes columnas "
+"\"External ID\" o \"Database ID\", los registros que ya han sido importados "
+"serán modificados en lugar de ser creados de nuevo. Esto es bastante útil, "
+"ya que le permitirá importar varias veces el mismo CSV realizando cambios "
+"entre dos importaciones. Odoo tendrá cuidado de crear o modificar cada "
+"registro dependiendo de si es nuevo o no."
 
 #: ../../general/base_import/import_faq.rst:201
 msgid ""
 "This feature allows you to use the Import/Export tool of Odoo to modify a "
 "batch of records in your favorite spreadsheet application."
 msgstr ""
+"Esta características permite usar la herramienta de importación/exportación "
+"de Odoo para modificar un lote de registros en su aplicación de hoja de "
+"cálculo favorita."
 
 #: ../../general/base_import/import_faq.rst:206
 msgid "What happens if I do not provide a value for a specific field?"
-msgstr ""
+msgstr "¿Qué pasa si no proveo de un valor para un campo específico?"
 
 #: ../../general/base_import/import_faq.rst:208
 msgid ""
@@ -681,10 +819,15 @@ msgid ""
 "in your CSV file, Odoo will set the EMPTY value in the field, instead of "
 "assigning the default value."
 msgstr ""
+"Si no ha establecido todos los campos en su archivo CSV, Odoo asignará el "
+"valor por defecto para cada uno de los campos no definidos. Pero si "
+"establece campos con valores vacíos en su archivo CSV, Odoo establecerá el "
+"valor VACÍO en el campo, en lugar de asignar el valor por defecto."
 
 #: ../../general/base_import/import_faq.rst:213
 msgid "How to export/import different tables from an SQL application to Odoo?"
 msgstr ""
+"¿Cómo exportar/importar diferentes tablas de una aplicación SQL a Odoo?"
 
 #: ../../general/base_import/import_faq.rst:215
 msgid ""
@@ -693,6 +836,10 @@ msgid ""
 " companies and persons, you will have to recreate the link between each "
 "person and the company they work for)."
 msgstr ""
+"Si necesita importar datos de diversas tablas, puede recrear relaciones "
+"entre los registros pertenecientes a diferentes tablas (por ejemplo, si "
+"importa compañías y personas, tendrá que recrear el enlace entre cada "
+"persona y la compañía para la que trabaja)."
 
 #: ../../general/base_import/import_faq.rst:217
 msgid ""
@@ -703,6 +850,12 @@ msgid ""
 "this \"External ID\" with the name of the application or table. (like "
 "'company_1', 'person_1' instead of '1')"
 msgstr ""
+"Para gestionar relaciones entre tablas, puede utilizar el \"External ID\" "
+"facilitado por Odoo. El \"External ID\" de un registro es el identificador "
+"único de ese registro en otra aplicación. Este \"External ID\" debe ser "
+"único entre todos los registros de todos los objetos, así que es una buena "
+"practica para prefijar este \"External ID\" con el nombre de la aplicación o"
+" la tabla (como \"company _1\", \"contact_1\", en lugar de \"1\")."
 
 #: ../../general/base_import/import_faq.rst:219
 msgid ""
@@ -713,26 +866,36 @@ msgid ""
 "href=\"/base_import/static/csv/database_import_test.sql\">dump of such a "
 "PostgreSQL database</a>)"
 msgstr ""
+"Como ejemplo, supongo que tiene una base de datos SQL con dos tablas que "
+"quiere importar: compañías y personas. Cada persona pertenece a una "
+"compañía, por lo que tendrá que recrear el enlace entre la persona y la "
+"compañía en la que trabaja. (Si quiere comprobar este ejemplo, aquí hay un<a"
+" href=\"/base_import/static/csv/database_import_test.sql\">dump de dicha "
+"base de datos PostgreSQL</a>)"
 
 #: ../../general/base_import/import_faq.rst:221
 msgid ""
 "We will first export all companies and their \"External ID\". In PSQL, write"
 " the following command:"
 msgstr ""
+"Se exportará primero todas las compañías y sus id. externos. En PSQL, "
+"escriba el siguiente comando:"
 
 #: ../../general/base_import/import_faq.rst:227
 msgid "This SQL command will create the following CSV file::"
-msgstr ""
+msgstr "Este comando SQL creará el siguiente archivo CSV:"
 
 #: ../../general/base_import/import_faq.rst:234
 msgid ""
 "To create the CSV file for persons, linked to companies, we will use the "
 "following SQL command in PSQL:"
 msgstr ""
+"Para crear un archivo CSV para personas, enlazadas a compañías, usaremos el "
+"siguiente comando SQL en PSQL:"
 
 #: ../../general/base_import/import_faq.rst:240
 msgid "It will produce the following CSV file::"
-msgstr ""
+msgstr "Se creará el siguiente archivo CSV:"
 
 #: ../../general/base_import/import_faq.rst:248
 msgid ""
@@ -743,6 +906,13 @@ msgid ""
 "avoid a conflict of ID between persons and companies (person_1 and company_1"
 " who shared the same ID 1 in the orignial database)."
 msgstr ""
+"Como puede ver en este archivo, Fabien y Laurence están trabajando para la "
+"compañía Bigees (company_1) y Eric está trabajando para la compañía Organi. "
+"La relación entre las personas y las compañías se hace usando el id. externo"
+" de las compañías. Hemos tenido que prefijar el id. externo con el nombre de"
+" la tabla para evitar un conflicto de id. entre las personas y las compañías"
+" (person_1 y company_1 comparten el mismo ID 1 en la base de datos "
+"original)."
 
 #: ../../general/base_import/import_faq.rst:250
 msgid ""
@@ -751,10 +921,15 @@ msgid ""
 "contacts and 3 companies. (the firsts two contacts are linked to the first "
 "company). You must first import the companies and then the persons."
 msgstr ""
+"Los dos archivos producidos están listos para ser importados en Odoo sin "
+"ninguna modificación. Después de haber importado estos dos archivos CSV, "
+"tendrá 4 contactos y 3 compañías (los  dos primeros contactos están "
+"enlazados a la primer compañía). Debe importar primero las compañías y luego"
+" los contactos."
 
 #: ../../general/odoo_basics.rst:3
 msgid "Basics"
-msgstr ""
+msgstr "Básico"
 
 #: ../../general/odoo_basics/add_user.rst:3
 msgid "How to add a user"
@@ -765,6 +940,8 @@ msgid ""
 "Odoo provides you with the option to add additional users at any given "
 "point."
 msgstr ""
+"Odoo le provee la opción de agregar usuarios adicionales en cualquier "
+"momento."
 
 #: ../../general/odoo_basics/add_user.rst:9
 msgid "Add individual users"
@@ -777,12 +954,19 @@ msgid ""
 "professional email address - the one he will use to log into Odoo instance -"
 " and a picture."
 msgstr ""
+"Desde el módulo de Configuración, ingresa al submenú :menuselection:`Usuario"
+" --> Usuario` y hace clic en **Crear**. Se añade primero el nombre del nuevo"
+" vendedor y su correo electrónico profesional o de la empresa, el que usará "
+"para iniciar sesión en la instancia de Odoo, así como la imagen del perfil."
 
 #: ../../general/odoo_basics/add_user.rst:19
 msgid ""
 "Under Access Rights, you can choose which applications your user can access "
 "and use. Different levels of rights are available depending on the app."
 msgstr ""
+"En \"Derechos de Acceso\", se puede elegir las aplicaciones que el usuario "
+"tiene acceso y puede utilizar. Los diferentes niveles de derechos están "
+"disponibles dependiendo de la aplicación. "
 
 #: ../../general/odoo_basics/add_user.rst:23
 msgid ""
@@ -790,6 +974,10 @@ msgid ""
 "invitation email will automatically be sent to the user. The user must click"
 " on it to accept the invitation to your instance and create a log-in."
 msgstr ""
+"Cuando haya terminado de editar la página y haya hecho clic en **Guardar**, "
+"un correo electrónico de invitación se enviará automáticamente al usuario. "
+"El usuario deberá dar clic en aceptar la invitación para su instancia y "
+"deberá crear un ingreso."
 
 #: ../../general/odoo_basics/add_user.rst:32
 msgid ""
@@ -797,6 +985,9 @@ msgid ""
 "Refer to our `*Pricing page* <https://www.odoo.com/pricing>`__ for more "
 "information."
 msgstr ""
+"Recuerde que cada usuario adicional incrementará la cuota de suscripción. "
+"Refierase a nuestra `*Página de precios* <https://www.odoo.com/pricing>`__ "
+"para más información."
 
 #: ../../general/odoo_basics/add_user.rst:39
 msgid ""
@@ -806,36 +997,44 @@ msgid ""
 " to set his password. You will then be able to define his accesses rights "
 "under the :menuselection:`Settings --> Users menu`."
 msgstr ""
+"También se puede agregar un nuevo vendedor sobre la marcha del equipo de "
+"ventas, incluso antes de que se haya registrado como usuario Odoo. Desde la "
+"captura de pantalla anterior, haga clic en \"Crear\" para añadir a su "
+"vendedor y escriba su nombre y correo electrónico. Después de guardar, el "
+"vendedor recibirá una invitación que contiene un enlace a establecer su "
+"contraseña. A continuación, será capaz de definir sus derechos de acceso "
+"bajo el menú :menuselection:`Configuración --> Usuarios`."
 
 #: ../../general/odoo_basics/add_user.rst:45
 msgid ""
 "`Deactivating Users <../../db_management/documentation.html#deactivating-"
 "users>`_"
 msgstr ""
-
-#: ../../general/odoo_basics/add_user.rst:46
-msgid ":doc:`../../crm/salesteam/setup/create_team`"
-msgstr ""
+"`Desactivando Usuarios <../../db_management/documentation.html#deactivating-"
+"users>`_"
 
 #: ../../general/odoo_basics/choose_language.rst:3
 msgid "Manage Odoo in your own language"
-msgstr ""
+msgstr "Gestione Odoo en su propio lenguaje"
 
 #: ../../general/odoo_basics/choose_language.rst:5
 msgid ""
 "Odoo provides you with the option to manage Odoo in different languages, and"
 " each user can use Odoo in his own language ."
 msgstr ""
+"Odoo le provee la opción de gestrionar Odoo en diferentes lenguajes, y cada "
+"usuario puede usar Odoo en su propio lenguaje."
 
 #: ../../general/odoo_basics/choose_language.rst:9
 msgid "Load your desired language"
-msgstr ""
+msgstr "Cargue su lenguaje deseado"
 
 #: ../../general/odoo_basics/choose_language.rst:11
 msgid ""
 "The first thing to do is to load your desired language on your Odoo "
 "instance."
 msgstr ""
+"Lo primero por hacer es cargar su lenguaje deseado en la instancia Odoo."
 
 #: ../../general/odoo_basics/choose_language.rst:14
 msgid ""
@@ -843,12 +1042,18 @@ msgid ""
 " the page select :menuselection:`Translations --> Load a Translation`, "
 "select a language to install and click on **LOAD.**"
 msgstr ""
+"Desde el tablero general clic sobre la aplicación **Configuraciones**; en la"
+" esquina superior izquierda seleccione :menuselection:`Traducciones --> "
+"Cargar una Traducción`, seleccionar un lenguaje a instalar y clic en "
+"**CARGAR.**"
 
 #: ../../general/odoo_basics/choose_language.rst:23
 msgid ""
 "If you check the \"Websites to translate\" checkbox you will have the option"
 " to change the navigation language on your website."
 msgstr ""
+"Si selecciona los \"Sitios web a traducir\"  tendrá la opción de cambiar el "
+"lenguaje de navenagción en su sitio web."
 
 #: ../../general/odoo_basics/choose_language.rst:27
 msgid "Change your language"
@@ -859,26 +1064,32 @@ msgid ""
 "You can change the language to the installed language by going to the drop-"
 "down menu at the top right side of the screen, choose **Preferences**."
 msgstr ""
+"Puedes cambiar el lenguaje instalado yendo al menú desplegable en la esquina"
+" superior derecha de tu pantalla, elige **Preferencias**"
 
 #: ../../general/odoo_basics/choose_language.rst:36
 msgid ""
 "Then change the Language setting to your installed language and click "
 "**SAVE.**"
 msgstr ""
+"Después change la configuración Lenguaje a tu lenguaje instalado y haz clic "
+"en **GUARDAR.**"
 
 #: ../../general/odoo_basics/choose_language.rst:42
 msgid "Open a new menu to view the changes."
-msgstr ""
+msgstr "Abre un nuuevo menú para ver los cambios."
 
 #: ../../general/odoo_basics/choose_language.rst:45
 msgid "Change another user's language"
-msgstr ""
+msgstr "Cambiar el lenguaje de otro usuario"
 
 #: ../../general/odoo_basics/choose_language.rst:47
 msgid ""
 "Odoo also gives you the possibility for each user to choose his preferred "
 "language."
 msgstr ""
+"Odoo también le da la posibilidad de que cada usuario elija su lenguaje de "
+"preferencial."
 
 #: ../../general/odoo_basics/choose_language.rst:50
 msgid ""
@@ -889,7 +1100,13 @@ msgid ""
 " change the Language to any previously installed language and click "
 "**SAVE.**"
 msgstr ""
+"Para cambiar el lenguaje de un usuario diferente, seleccione "
+":menuselection:`Usuarios` desde la aplicación Configuraciones. Tnedrás la "
+"lista de todos los usuarios y podrás elegir el usuario al que quieres "
+"cambiar el lenguaje. Selecciona el usuario y haz clic en **Editar** en la "
+"ezquina superior izquierda. Bajo Preferencias puedes cambair el Lenguaje a "
+"cualquier lenguaje instalado previamenre y hacer clic en **SAVE.**"
 
 #: ../../general/odoo_basics/choose_language.rst:61
 msgid ":doc:`../../website/publish/translate`"
-msgstr ""
+msgstr ":doc:`../../website/publish/translate`"
diff --git a/locale/es/LC_MESSAGES/helpdesk.po b/locale/es/LC_MESSAGES/helpdesk.po
index 396022ba3..4fb636e54 100644
--- a/locale/es/LC_MESSAGES/helpdesk.po
+++ b/locale/es/LC_MESSAGES/helpdesk.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2015-TODAY, Odoo S.A.
-# This file is distributed under the same license as the Odoo Business package.
+# This file is distributed under the same license as the Odoo package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 10.0\n"
+"Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-08 14:28+0100\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Christopher Ormaza <chris.ormaza@gmail.com>, 2017\n"
+"Last-Translator: Diego de cos <diegodecos@hotmail.com>, 2018\n"
 "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: ../../helpdesk.rst:5
 msgid "Helpdesk"
-msgstr "Soporte"
+msgstr "Helpdesk"
 
 #: ../../helpdesk/getting_started.rst:3
 msgid "Get started with Odoo Helpdesk"
@@ -32,7 +32,7 @@ msgstr "Información general"
 
 #: ../../helpdesk/getting_started.rst:9
 msgid "Getting started with Odoo Helpdesk"
-msgstr ""
+msgstr "Comenzando con Odoo HelpDesk (Mesa de Ayuda)"
 
 #: ../../helpdesk/getting_started.rst:11
 msgid "Installing Odoo Helpdesk:"
diff --git a/locale/es/LC_MESSAGES/index.po b/locale/es/LC_MESSAGES/index.po
index 924c1c109..b886f2c8f 100644
--- a/locale/es/LC_MESSAGES/index.po
+++ b/locale/es/LC_MESSAGES/index.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2015-TODAY, Odoo S.A.
-# This file is distributed under the same license as the Odoo Business package.
+# This file is distributed under the same license as the Odoo package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 10.0\n"
+"Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-07 09:30+0200\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Pedro M. Baeza <pedro.baeza@gmail.com>, 2017\n"
+"Last-Translator: Pedro M. Baeza <pedro.baeza@gmail.com>, 2018\n"
 "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/locale/es/LC_MESSAGES/inventory.po b/locale/es/LC_MESSAGES/inventory.po
index a77be85bc..68f4a13a7 100644
--- a/locale/es/LC_MESSAGES/inventory.po
+++ b/locale/es/LC_MESSAGES/inventory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2015-TODAY, Odoo S.A.
-# This file is distributed under the same license as the Odoo Business package.
+# This file is distributed under the same license as the Odoo package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 10.0\n"
+"Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-08 17:10+0100\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Raquel Iciarte <ric@odoo.com>, 2017\n"
+"Last-Translator: Julián Andrés Osorio López <mcjulian1107@gmail.com>, 2018\n"
 "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -379,7 +379,7 @@ msgstr ""
 
 #: ../../inventory/barcode/setup.rst:3
 msgid "Setup"
-msgstr "Configuración"
+msgstr "Configurar"
 
 #: ../../inventory/barcode/setup/hardware.rst:3
 msgid "Set up your barcode scanner"
@@ -927,8 +927,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the "
 "orderpoint without removing it."
 msgstr ""
-"Si el campo activo se desmarca, permite ocultar la regla de stock mínimo sin"
-" eliminarla."
+"Si el campo activo se establece a Falso, permite ocultar la regla de stock "
+"mínimo sin eliminarla."
 
 #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
 msgid "Product Unit of Measure"
@@ -964,9 +964,9 @@ msgid ""
 " Odoo generates a procurement to bring the forecasted quantity to the Max "
 "Quantity."
 msgstr ""
-"Cuando las existencias virtuales estén por debajo de la cantidad mínima "
-"especificada en este campo, Odoo generará un abastecimiento para llevar la "
-"cantidad prevista a la cantidad máxima."
+"Cuando el stock virtual esté por debajo de la cantidad mínima especificada "
+"en este campo, Odoo generará un abastecimiento para llevar la cantidad "
+"prevista a la cantidad máxima."
 
 #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
 msgid "Maximum Quantity"
@@ -978,9 +978,9 @@ msgid ""
 "procurement to bring the forecasted quantity to the Quantity specified as "
 "Max Quantity."
 msgstr ""
-"Cuando las existencias virtuales estén por debajo de la cantidad, Odoo "
-"generará un abastecimiento para llevar la cantidad prevista a la cantidad "
-"especificada como aquí como máxima."
+"Cuando el stock virtual esté por debajo de la cantidad, Odoo generará un "
+"abastecimiento para llevar la cantidad prevista a la cantidad especificada "
+"como aquí como máxima."
 
 #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
 msgid "Quantity Multiple"
@@ -5434,7 +5434,7 @@ msgstr "Órden de Entrega"
 
 #: ../../inventory/overview/concepts/double-entry.rst:255
 msgid "Purchase Order"
-msgstr "Órden de compra"
+msgstr "Pedido de compra"
 
 #: ../../inventory/overview/concepts/double-entry.rst:256
 msgid "..."
@@ -6735,7 +6735,7 @@ msgstr "Gestionar cadenas de fabricación de productos"
 
 #: ../../inventory/routes/concepts/use_routes.rst:13
 msgid "Manage default locations per product"
-msgstr "Gestiona ubicaciones por defecto por producto"
+msgstr "Gestiona ubicaciones predeterminadas por producto"
 
 #: ../../inventory/routes/concepts/use_routes.rst:15
 msgid ""
@@ -7001,7 +7001,7 @@ msgstr ""
 
 #: ../../inventory/routes/costing/landed_costs.rst:40
 msgid "Landed Cost Types"
-msgstr "Tipos de Costos en Destino"
+msgstr "Tipos de gastos de envío"
 
 #: ../../inventory/routes/costing/landed_costs.rst:42
 msgid ""
@@ -7933,10 +7933,6 @@ msgstr ":doc:`../../resumen/inicio/configurar`"
 msgid ":doc:`uom`"
 msgstr ":doc:`uom`"
 
-#: ../../inventory/settings/products/usage.rst:72
-msgid ":doc:`packages`"
-msgstr ":doc:`paquetes`"
-
 #: ../../inventory/settings/products/variants.rst:3
 msgid "Using product variants"
 msgstr "Usar variantes de productos"
diff --git a/locale/es/LC_MESSAGES/iot.po b/locale/es/LC_MESSAGES/iot.po
new file mode 100644
index 000000000..bcb37f2de
--- /dev/null
+++ b/locale/es/LC_MESSAGES/iot.po
@@ -0,0 +1,391 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2015-TODAY, Odoo S.A.
+# This file is distributed under the same license as the Odoo package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo 11.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: AleEscandon <alejandra.escandon@jarsa.com.mx>, 2018\n"
+"Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../../iot.rst:5
+msgid "Internet of Things (IoT)"
+msgstr ""
+
+#: ../../iot/connect.rst:3
+msgid "Connect an IoT Box to your database"
+msgstr ""
+
+#: ../../iot/connect.rst:5
+msgid "Install the Internet of Things (IoT) App on your Odoo Database."
+msgstr ""
+
+#: ../../iot/connect.rst:10
+msgid "Go in the IoT App and click on Connect on the IoT Boxes page."
+msgstr ""
+
+#: ../../iot/connect.rst:15
+msgid "Follow the steps to connect your IoT Box."
+msgstr ""
+
+#: ../../iot/connect.rst:21
+msgid "Ethernet Connection"
+msgstr ""
+
+#: ../../iot/connect.rst:23
+msgid ""
+"Connect to the IoT Box all the devices that have to be connected with cables"
+" (ethernet, usb devices, etc.)."
+msgstr ""
+
+#: ../../iot/connect.rst:26
+msgid "Power on the IoT Box."
+msgstr ""
+
+#: ../../iot/connect.rst:28
+msgid "Then click on the Scan button."
+msgstr ""
+
+#: ../../iot/connect.rst:34
+msgid "WiFi Connection"
+msgstr ""
+
+#: ../../iot/connect.rst:36
+msgid "Power on the IoT Box"
+msgstr ""
+
+#: ../../iot/connect.rst:38
+msgid "Copy the token"
+msgstr ""
+
+#: ../../iot/connect.rst:43
+msgid ""
+"Connect to the IoT Box WiFi Network (make sure there is no ethernet cable "
+"plugged in your computer)."
+msgstr ""
+
+#: ../../iot/connect.rst:49
+msgid ""
+"You will be redirected to the IoT Box Homepage (if it doesn't work, connect "
+"to the IP address of the box). Give a name to your IoT Box (not required) "
+"and paste the token, then click on next."
+msgstr ""
+
+#: ../../iot/connect.rst:57
+msgid ""
+"If you are on Runbot, do not forget to add the -all or -base in the token "
+"(e.g. this token **http://375228-saas-11-5-iot-"
+"f3f920.runbot16.odoo.com\\|4957098401** should become "
+"**http://375228-saas-11-5-iot-f3f920-all.runbot16.odoo.com\\|4957098401**)."
+msgstr ""
+
+#: ../../iot/connect.rst:63
+msgid ""
+"Choose the WiFi network you want to connect with (enter the password if "
+"there is one) and click on Submit. Wait a few seconds before being "
+"redirected to your database."
+msgstr ""
+
+#: ../../iot/connect.rst:70
+msgid "You should now see the IoT Box."
+msgstr ""
+
+#: ../../iot/connect.rst:76
+msgid "IoT Box Schema"
+msgstr ""
+
+#: ../../iot/pos.rst:3
+msgid "Use the IoT Box for the PoS"
+msgstr ""
+
+#: ../../iot/pos.rst:9
+msgid "Prerequisites"
+msgstr "Pre-requisitos"
+
+#: ../../iot/pos.rst:11
+msgid "Before starting, make sure you have the following:"
+msgstr ""
+
+#: ../../iot/pos.rst:13
+msgid "An IoT Box"
+msgstr ""
+
+#: ../../iot/pos.rst:15
+msgid "A 2A Power adapter with pi 3 b+ 2.5 A"
+msgstr ""
+
+#: ../../iot/pos.rst:17
+msgid "A computer or tablet with an up-to-date web browser"
+msgstr "Una computadora o tableta con un navegador web actualizado a la fecha"
+
+#: ../../iot/pos.rst:19
+msgid ""
+"A running SaaS or Odoo instance with the Point of Sale and IoT apps "
+"installed"
+msgstr ""
+
+#: ../../iot/pos.rst:22
+msgid "A local network setup with DHCP (this is the default setting)"
+msgstr ""
+
+#: ../../iot/pos.rst:24
+msgid ""
+"An Epson USB TM-T20 Printer or another ESC/POS compatible printer "
+"(officially supported printers are listed at the `POS Hardware page "
+"<https://www.odoo.com/page/pos-ipad-android-hardware>`__)"
+msgstr ""
+
+#: ../../iot/pos.rst:28
+msgid "A Honeywell Eclipse USB Barcode Scanner or another compatible scanner"
+msgstr ""
+"Un Escáner de código de barras USB Honeywell Eclipse u otro escáner "
+"compatible"
+
+#: ../../iot/pos.rst:30
+msgid "An Epson compatible cash drawer"
+msgstr "Un cajón de dinero Epson compatible"
+
+#: ../../iot/pos.rst:32
+msgid "An RJ45 Ethernet Cable (optional, WiFi is built in)"
+msgstr ""
+
+#: ../../iot/pos.rst:35
+msgid "Set Up"
+msgstr "Configurar"
+
+#: ../../iot/pos.rst:37
+msgid ""
+"To connect hardware to the PoS, the first step is to connect an IoT Box to "
+"your database. For this, follow this `documentation "
+"<https://docs.google.com/document/d/1vhWrSSlSdJcRYe4tjPpXKYVMTD47lVK3ysyYc7tJDlA/edit#>`__."
+msgstr ""
+
+#: ../../iot/pos.rst:44
+msgid "Then, you have to connect the peripheral devices to your IoT Box."
+msgstr ""
+
+#: ../../iot/pos.rst:46
+msgid ""
+"Officially supported hardware is listed on `the POS Hardware page "
+"<https://www.odoo.com/page/pos-ipad-android-hardware>`__, but other hardware"
+" might work as well."
+msgstr ""
+
+#: ../../iot/pos.rst:50
+msgid "**Printer**: Connect an ESC/POS printer to a USB port and power it on."
+msgstr ""
+"**Impresora**: Conectar una impresora ESC/POS a un puerto USB y encenderla."
+
+#: ../../iot/pos.rst:53
+msgid ""
+"**Cash drawer**: The cash drawer should be connected to the printer with an "
+"RJ25 cable."
+msgstr ""
+"**Cajón de dinero**: El cajón de dinero debe conectarse a la impresora con "
+"un cable RJ25."
+
+#: ../../iot/pos.rst:56
+msgid ""
+"**Barcode scanner**: Connect your barcode scanner. In order for your barcode"
+" scanner to be compatible it must behave as a keyboard and must be "
+"configured in **US QWERTY**. It also must end barcodes with an Enter "
+"character (keycode 28). This is most likely the default configuration of "
+"your barcode scanner."
+msgstr ""
+"**Escáner de código de barras**: Conecte el escáner de código de barras. "
+"Para que se escáner sea compatible, debe comportarse como un teclado y debe "
+"ser configurado en **US QWERTY**. También debe poner fin a los códigos de "
+"barras con una tecla ENTER (código clave 28). Esto es más probable en la "
+"configuración por defecto de su escáner."
+
+#: ../../iot/pos.rst:62
+msgid "**Scale**: Connect your scale and power it on."
+msgstr "**Escala**: Conecte su escala y enciéndala. "
+
+#: ../../iot/pos.rst:64
+msgid ""
+"**Ethernet**: If you do not wish to use Wi-Fi, plug in the Ethernet cable. "
+"Make sure this will connect the IoT Box to the same network as your POS "
+"device."
+msgstr ""
+
+#: ../../iot/pos.rst:68
+msgid ""
+"**Wi-Fi**: The current version of the IoT Box has Wi-Fi built in. Make sure "
+"not to plug in an Ethernet cable when booting, because all Wi-Fi "
+"functionality will be bypassed when a wired network connection is available "
+"on boot."
+msgstr ""
+
+#: ../../iot/pos.rst:73
+msgid ""
+"Once it's done, you can connect the IoT Box to your PoS. For this, go in "
+"Point of Sale > Configuration > PoS, tick the box \"IoT Box\" and select the"
+" IoT Box you want to connect with. Save the changes."
+msgstr ""
+
+#: ../../iot/pos.rst:77
+msgid "Set up is done, you can launch a new PoS Session."
+msgstr ""
+
+#: ../../iot/pos.rst:80
+msgid "Troubleshoot"
+msgstr "Solución de problemas"
+
+#: ../../iot/pos.rst:83
+msgid "The PoS cannot connect to the IoT Box"
+msgstr ""
+
+#: ../../iot/pos.rst:85
+msgid ""
+"The easiest way to make sure the IoT Box is properly set-up is to turn it on"
+" with the printer plugged in as it will print a receipt indicating any error"
+" if encountered or the IoT Box's IP address in case of success. If no "
+"receipt is printed, check the following steps:"
+msgstr ""
+
+#: ../../iot/pos.rst:91
+msgid ""
+"Make sure the IoT Box is powered on, indicated by a brightly lit red status "
+"LED."
+msgstr ""
+
+#: ../../iot/pos.rst:94
+msgid ""
+"Make sure the IoT Box is ready, this is indicated by a brightly lit green "
+"status LED just next to the red power status LED. The IoT Box should be "
+"ready ~2 minutes after it is started."
+msgstr ""
+
+#: ../../iot/pos.rst:98
+msgid ""
+"Make sure the IoT Box is connected to the same network as your POS device. "
+"Both the device and the IoT Box should be visible in the list of connected "
+"devices on your network router."
+msgstr ""
+
+#: ../../iot/pos.rst:102
+msgid ""
+"If you specified the IoT Box's IP address in the configuration, make sure it"
+" corresponds to the ip address printed on the IoT Box's status receipt."
+msgstr ""
+
+#: ../../iot/pos.rst:106
+msgid "Make sure that the POS is not loaded over HTTPS."
+msgstr "Asegúrese que el PdV no está cargado sobre HTTPS."
+
+#: ../../iot/pos.rst:108
+msgid ""
+"A bug in Firefox's HTTP implementation might prevent the autodiscovery from "
+"working reliably. You could also manually set up the IoT Box's IP address in"
+" the POS configuration."
+msgstr ""
+
+#: ../../iot/pos.rst:113
+msgid "The Barcode Scanner is not working"
+msgstr "El escáner de código de barra no está funcionando"
+
+#: ../../iot/pos.rst:115
+msgid ""
+"The barcode scanner must be configured in US QWERTY and emit an Enter after "
+"each barcode. This is the default configuration of most barcode readers. "
+"Refer to the barcode reader documentation for more information."
+msgstr ""
+"El escáner de código de barras se debe configurar en los Estados Unidos "
+"QWERTY y emite un Enter después de cada código de barras. Esta es la "
+"configuración por defecto de la mayoría de los lectores de códigos de "
+"barras. Consulte la documentación del lector de código de barras para "
+"obtener más información."
+
+#: ../../iot/pos.rst:120
+msgid ""
+"The IoT Box needs a 2A power supply to work with some barcode scanners. If "
+"you are not using the provided power supply, make sure the one you use has "
+"enough power."
+msgstr ""
+
+#: ../../iot/pos.rst:124
+msgid ""
+"Some barcode scanners will need more than 2A and will not work, or will work"
+" unreliably, even with the provided power supply. In those case you can plug"
+" the barcode scanner in a self-powered USB hub."
+msgstr ""
+"Algunos escáneres de códigos de barras necesitarán más de 2A y no "
+"funcionarán, o funcionan poco fiable, incluso con la fuente de alimentación "
+"proporcionada. En estos casos usted puede conectar el escáner de código de "
+"barras en un concentrador USB con alimentación propia."
+
+#: ../../iot/pos.rst:129
+msgid ""
+"Some poorly built barcode scanners do not advertise themselves as barcode "
+"scanners but as a usb keyboard instead, and will not be recognized by the "
+"IoT Box."
+msgstr ""
+
+#: ../../iot/pos.rst:134
+msgid "The Barcode Scanner is not working reliably"
+msgstr "El escáner de código de barra no está funcionando de manera segura"
+
+#: ../../iot/pos.rst:136
+msgid ""
+"Make sure that no more than one device with 'Scan via Proxy'/'Barcode "
+"Scanner' enabled are connected to the IoT Box at the same time."
+msgstr ""
+
+#: ../../iot/pos.rst:140
+msgid "Printing the receipt takes too much time"
+msgstr "Impresión del recibo tarda demasiado tiempo"
+
+#: ../../iot/pos.rst:142
+msgid ""
+"A small delay before the first print is expected, as the IoT Box will do "
+"some preprocessing to speed up the next printings. If you suffer delays "
+"afterwards it is most likely due to poor network connection between the POS "
+"and the IoT Box."
+msgstr ""
+
+#: ../../iot/pos.rst:148
+msgid "Some characters are not correctly printed on the receipt"
+msgstr "Algunos caracteres no se imprimen correctamente en el recibo"
+
+#: ../../iot/pos.rst:150
+msgid ""
+"The IoT Box does not support all languages and characters. It currently "
+"supports Latin and Cyrillic based scripts, with basic Japanese support."
+msgstr ""
+
+#: ../../iot/pos.rst:155
+msgid "The printer is offline"
+msgstr "La impresora está fuera de línea"
+
+#: ../../iot/pos.rst:157
+msgid ""
+"Make sure the printer is connected, powered, has enough paper and has its "
+"lid closed, and is not reporting an error. If the error persists, please "
+"contact support."
+msgstr ""
+"Asegúrese de que la impresora esté conectada, funcionando, debe de tener "
+"suficiente papel y tener su tapa cerrada, y que no informe error. Si el "
+"error persiste, póngase en contacto con soporte."
+
+#: ../../iot/pos.rst:162
+msgid "The cashdrawer does not open"
+msgstr "El cajón de dinero no abre"
+
+#: ../../iot/pos.rst:164
+msgid ""
+"The cashdrawer should be connected to the printer and should be activated in"
+" the POS configuration."
+msgstr ""
+"El cajón de dinero debe estar conectado a la impresora y se debe activar en "
+"la configuración de la terminal."
diff --git a/locale/es/LC_MESSAGES/livechat.po b/locale/es/LC_MESSAGES/livechat.po
index 3942c6bcc..ff0bd4a45 100644
--- a/locale/es/LC_MESSAGES/livechat.po
+++ b/locale/es/LC_MESSAGES/livechat.po
@@ -1,14 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2015-TODAY, Odoo S.A.
-# This file is distributed under the same license as the Odoo Business package.
+# This file is distributed under the same license as the Odoo package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 10.0\n"
+"Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-08 14:28+0100\n"
+"POT-Creation-Date: 2018-07-23 12:10+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Nicolás Broggi <rnbroggi@gmail.com>, 2018\n"
 "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: ../../livechat/livechat.rst:5
 msgid "Live Chat"
-msgstr "Chat en vivo"
+msgstr "Charla en vivo"
 
 #: ../../livechat/livechat.rst:8
 msgid "Chat in live with website visitors"
diff --git a/locale/es/LC_MESSAGES/manufacturing.po b/locale/es/LC_MESSAGES/manufacturing.po
index 80bb7a221..1ad749b6e 100644
--- a/locale/es/LC_MESSAGES/manufacturing.po
+++ b/locale/es/LC_MESSAGES/manufacturing.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2015-TODAY, Odoo S.A.
-# This file is distributed under the same license as the Odoo Business package.
+# This file is distributed under the same license as the Odoo package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 10.0\n"
+"Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-22 15:27+0100\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: oihane <oihanecruce@gmail.com>, 2017\n"
+"Last-Translator: Lina Maria Avendaño Carvajal <lina8823@gmail.com>, 2018\n"
 "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -51,13 +51,10 @@ msgstr ""
 #: ../../manufacturing/management/bill_configuration.rst:16
 msgid ""
 "If you choose to manage your manufacturing operations using manufacturing "
-"orders only, you will define basic bills of materials without routings. For "
-"more information about which method of management to use, review the "
-"**Getting Started** section of the *Manufacturing* chapter of the "
-"documentation."
+"orders only, you will define basic bills of materials without routings."
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:22
+#: ../../manufacturing/management/bill_configuration.rst:19
 msgid ""
 "Before creating your first bill of materials, you will need to create a "
 "product and at least one component (components are considered products in "
@@ -70,7 +67,7 @@ msgid ""
 "Materials`, or using the button on the top of the product form."
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:32
+#: ../../manufacturing/management/bill_configuration.rst:29
 msgid ""
 "Under the **Miscellaneous** tab, you can fill additional fields. "
 "**Sequence** defines the order in which your BoMs will be selected for "
@@ -78,11 +75,11 @@ msgid ""
 "allows you to track changes to your BoM over time."
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:38
+#: ../../manufacturing/management/bill_configuration.rst:35
 msgid "Adding a Routing to a BoM"
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:40
+#: ../../manufacturing/management/bill_configuration.rst:37
 msgid ""
 "A routing defines a series of operations required to manufacture a product "
 "and the work center at which each operation is performed. A routing may be "
@@ -90,14 +87,14 @@ msgid ""
 "information about configuring routings, review the chapter on routings."
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:46
+#: ../../manufacturing/management/bill_configuration.rst:43
 msgid ""
 "After enabling routings from :menuselection:`Configuration --> Settings`, "
 "you will be able to add a routing to a bill of materials by selecting a "
 "routing from the dropdown list or creating one on the fly."
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:50
+#: ../../manufacturing/management/bill_configuration.rst:47
 msgid ""
 "You may define the work operation or step in which each component is "
 "consumed using the field, **Consumed in Operation** under the **Components**"
@@ -107,23 +104,23 @@ msgid ""
 "consumed/produced at the final operation in the routing."
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:61
+#: ../../manufacturing/management/bill_configuration.rst:58
 msgid "Adding Byproducts to a BoM"
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:63
+#: ../../manufacturing/management/bill_configuration.rst:60
 msgid ""
 "In Odoo, a byproduct is any product produced by a BoM in addition to the "
 "primary product."
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:66
+#: ../../manufacturing/management/bill_configuration.rst:63
 msgid ""
 "To add byproducts to a BoM, you will first need to enable them from "
 ":menuselection:`Configuration --> Settings`."
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:72
+#: ../../manufacturing/management/bill_configuration.rst:69
 msgid ""
 "Once byproducts are enabled, you can add them to your bills of materials "
 "under the **Byproducts** tab of the bill of materials. You can add any "
@@ -131,11 +128,11 @@ msgid ""
 "of the routing as the primary product of the BoM."
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:81
+#: ../../manufacturing/management/bill_configuration.rst:78
 msgid "Setting up a BoM for a Product With Sub-Assemblies"
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:83
+#: ../../manufacturing/management/bill_configuration.rst:80
 #: ../../manufacturing/management/sub_assemblies.rst:5
 msgid ""
 "A subassembly is a manufactured product which is intended to be used as a "
@@ -145,7 +142,7 @@ msgid ""
 "that employs subassemblies is often referred to as a multi-level BoM."
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:90
+#: ../../manufacturing/management/bill_configuration.rst:87
 #: ../../manufacturing/management/sub_assemblies.rst:12
 msgid ""
 "Multi-level bills of materials in Odoo are accomplished by creating a top-"
@@ -155,11 +152,11 @@ msgid ""
 "subassembly is created as well."
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:97
+#: ../../manufacturing/management/bill_configuration.rst:94
 msgid "Configure the Top-Level Product BoM"
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:99
+#: ../../manufacturing/management/bill_configuration.rst:96
 #: ../../manufacturing/management/sub_assemblies.rst:21
 msgid ""
 "To configure a multi-level BoM, create the top-level product and its BoM. "
@@ -167,12 +164,12 @@ msgid ""
 "subassembly as you would for any product."
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:107
+#: ../../manufacturing/management/bill_configuration.rst:104
 #: ../../manufacturing/management/sub_assemblies.rst:29
 msgid "Configure the Subassembly Product Data"
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:109
+#: ../../manufacturing/management/bill_configuration.rst:106
 #: ../../manufacturing/management/sub_assemblies.rst:31
 msgid ""
 "On the product form of the subassembly, you must select the routes "
@@ -181,7 +178,7 @@ msgid ""
 "effect."
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:117
+#: ../../manufacturing/management/bill_configuration.rst:114
 #: ../../manufacturing/management/sub_assemblies.rst:39
 msgid ""
 "If you would like to be able to purchase the subassembly in addition to "
@@ -189,11 +186,11 @@ msgid ""
 "subassembly product form may be configured according to your preference."
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:123
+#: ../../manufacturing/management/bill_configuration.rst:120
 msgid "Using a Single BoM to Describe Several Variants of a Single Product"
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:125
+#: ../../manufacturing/management/bill_configuration.rst:122
 #: ../../manufacturing/management/product_variants.rst:5
 msgid ""
 "Odoo allows you to use one bill of materials for multiple variants of the "
@@ -201,7 +198,7 @@ msgid ""
 "Settings`."
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:132
+#: ../../manufacturing/management/bill_configuration.rst:129
 #: ../../manufacturing/management/product_variants.rst:12
 msgid ""
 "You will then be able to specify which component lines are to be used in the"
@@ -210,7 +207,7 @@ msgid ""
 "variants."
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:137
+#: ../../manufacturing/management/bill_configuration.rst:134
 #: ../../manufacturing/management/product_variants.rst:17
 msgid ""
 "When defining variant BoMs on a line-item-basis, the **Product Variant** "
@@ -409,6 +406,112 @@ msgstr ""
 msgid "Configure the Top -Level Product BoM"
 msgstr ""
 
+#: ../../manufacturing/management/unbuild.rst:3
+msgid "Unbuild a product"
+msgstr ""
+
+#: ../../manufacturing/management/unbuild.rst:5
+msgid ""
+"In Odoo Manufacturing App, you can *Unbuild* products. Two use cases can be "
+"managed: (1) you can unbuild products you have built yourself or (2) you can"
+" unbuild products you have received."
+msgstr ""
+
+#: ../../manufacturing/management/unbuild.rst:9
+msgid ""
+"Let's take the first case, you are manufacturing products yourself. If one "
+"of your product presents some defect, you might want to unbuild it instead "
+"of scrapping it completely, allowing you to reuse some components of the "
+"product."
+msgstr ""
+
+#: ../../manufacturing/management/unbuild.rst:14
+msgid ""
+"In the second case, you are buying products for the sole purpose of "
+"unbuilding them and recycling them."
+msgstr ""
+
+#: ../../manufacturing/management/unbuild.rst:18
+msgid "Unbuild Order"
+msgstr "örden de desconstrucción"
+
+#: ../../manufacturing/management/unbuild.rst:20
+msgid ""
+"While in the Manufacturing App, under the *Operations* tab you will find the"
+" menu *Unbuild Orders*."
+msgstr ""
+
+#: ../../manufacturing/management/unbuild.rst:26
+msgid ""
+"When creating a new one, you can either select a MO if you are unbuilding "
+"something you manufactured or only select a product if you are unbuilding "
+"something you received."
+msgstr ""
+
+#: ../../manufacturing/management/unbuild.rst:33
+msgid "When you are done, just click unbuild and the process will be over."
+msgstr ""
+
+#: ../../manufacturing/management/unbuild.rst:35
+msgid ""
+"If you unbuild a product that you manufactured before, you will get the "
+"components from the MO back in stock."
+msgstr ""
+
+#: ../../manufacturing/management/unbuild.rst:38
+msgid ""
+"If you unbuild a product you bought, you will get the components from the "
+"BoM back in stock."
+msgstr ""
+
 #: ../../manufacturing/overview.rst:5
 msgid "Overview"
 msgstr "Información general"
+
+#: ../../manufacturing/repair.rst:5
+msgid "Repair Management"
+msgstr ""
+
+#: ../../manufacturing/repair/repair.rst:3
+msgid "Repair products"
+msgstr ""
+
+#: ../../manufacturing/repair/repair.rst:5
+msgid ""
+"The Odoo *Repair* app allows you to manage a complete after sales process "
+"but also to simply repair products you have manufactured, if they present a "
+"defect."
+msgstr ""
+
+#: ../../manufacturing/repair/repair.rst:10
+msgid "Create a Repair Order"
+msgstr ""
+
+#: ../../manufacturing/repair/repair.rst:12
+msgid ""
+"Once in the app, you can access your existing *Repair Orders* and create a "
+"new one."
+msgstr ""
+
+#: ../../manufacturing/repair/repair.rst:19
+msgid "Manage a repair"
+msgstr ""
+
+#: ../../manufacturing/repair/repair.rst:21
+msgid ""
+"When a customer sends you a product for repair, create a new *Repair Order*."
+" Fill it in with all the information you may need such as the product, the "
+"customer, if it has to be invoiced after or before the repair, the parts you"
+" might need, etc."
+msgstr ""
+
+#: ../../manufacturing/repair/repair.rst:29
+msgid ""
+"Once everything is done, you can then send the repair quotation to your "
+"customer. If it is approved, you can confirm the repair. You will then be "
+"able to start & end the repair when it is completed."
+msgstr ""
+
+#: ../../manufacturing/repair/repair.rst:36
+msgid "You can now invoice the repair."
+msgstr ""
diff --git a/locale/es/LC_MESSAGES/mobile.po b/locale/es/LC_MESSAGES/mobile.po
new file mode 100644
index 000000000..5f14195c2
--- /dev/null
+++ b/locale/es/LC_MESSAGES/mobile.po
@@ -0,0 +1,127 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2015-TODAY, Odoo S.A.
+# This file is distributed under the same license as the Odoo package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo 11.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Diego de cos <diegodecos@hotmail.com>, 2018\n"
+"Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../../mobile/firebase.rst:5
+msgid "Mobile"
+msgstr "Móvil"
+
+#: ../../mobile/firebase.rst:8
+msgid "Setup your Firebase Cloud Messaging"
+msgstr ""
+
+#: ../../mobile/firebase.rst:10
+msgid ""
+"In order to have mobile notifications in our Android app, you need an API "
+"key."
+msgstr ""
+"Para tener notificaciones móviles en nuestra aplicación Android, necesita "
+"una clave API "
+
+#: ../../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 ""
+"La aplicación iOS no soporta notificaciones móviles en Oddo para versiones "
+">12"
+
+#: ../../mobile/firebase.rst:22
+msgid "Firebase Settings"
+msgstr ""
+
+#: ../../mobile/firebase.rst:25
+msgid "Create a new project"
+msgstr "Crear un nuevo proyecto"
+
+#: ../../mobile/firebase.rst:27
+msgid ""
+"First, make sure you to sign in to your Google Account. Then, go to "
+"`https://console.firebase.google.com "
+"<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 ""
+"Elija un nombre de proyecto, seleccione **Continuar**, entonces selecciones "
+"**Crear Proyecto**."
+
+#: ../../mobile/firebase.rst:37
+msgid "When you project is ready, click on **Continue**."
+msgstr "Cuando su proyecto esté listo, seleccione **Continuar**."
+
+#: ../../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 "Agregar una aplicación"
+
+#: ../../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 ""
+"Debe usar \"com.odoo.com\" como nombre de paquete Android. DE otro modo, no "
+"funcionará."
+
+#: ../../mobile/firebase.rst:56
+msgid ""
+"No need to download the config file, you can click on **Next** twice and "
+"skip the fourth step."
+msgstr ""
+"No necesita descargar el archivo de configuración, puede seleccionar "
+"*Siguiente** 2 veces y saltar al cuarto paso."
+
+#: ../../mobile/firebase.rst:60
+msgid "Get generated API key"
+msgstr "Obtenga la API key generada"
+
+#: ../../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 "Configuraciones en Odoo"
+
+#: ../../mobile/firebase.rst:76
+msgid "Simply paste the API key and the Sender ID from Cloud Messaging."
+msgstr ""
diff --git a/locale/es/LC_MESSAGES/point_of_sale.po b/locale/es/LC_MESSAGES/point_of_sale.po
index 26c9d13d3..78e3f7ccb 100644
--- a/locale/es/LC_MESSAGES/point_of_sale.po
+++ b/locale/es/LC_MESSAGES/point_of_sale.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-26 12:01+0200\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Raquel Iciarte <ric@odoo.com>, 2017\n"
+"Last-Translator: Cristopher Cravioto <ccr@odoo.com>, 2018\n"
 "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: ../../point_of_sale.rst:5
 msgid "Point of Sale"
-msgstr "Punto de Venta"
+msgstr "Punto de venta"
 
 #: ../../point_of_sale/advanced.rst:3
 msgid "Advanced topics"
@@ -55,8 +55,8 @@ msgstr ""
 
 #: ../../point_of_sale/advanced/barcode.rst:14
 msgid ""
-"Under the PosBox / Hardware category, you will find *Barcode Scanner* select"
-" it."
+"Under the IoT Box / Hardware category, you will find *Barcode Scanner* "
+"select it."
 msgstr ""
 
 #: ../../point_of_sale/advanced/barcode.rst:21
@@ -544,33 +544,26 @@ msgstr ""
 "<http://trendnet.com/products/proddetail.asp?prod=265_TU-S9>`__)"
 
 #: ../../point_of_sale/belgian_fdm/setup.rst:32
-msgid "A registered POSBox per POS configuration"
-msgstr "Un POSBox Registrado per configración de POS."
+msgid "A registered IoT Box per POS configuration"
+msgstr ""
 
 #: ../../point_of_sale/belgian_fdm/setup.rst:35
 msgid "Setup"
-msgstr "Configuración"
+msgstr "Configurar"
 
 #: ../../point_of_sale/belgian_fdm/setup.rst:38
-msgid "POSBox"
-msgstr "Terminal del Punto de Venta"
+msgid "IoT Box"
+msgstr "IoT Box"
 
 #: ../../point_of_sale/belgian_fdm/setup.rst:40
 msgid ""
-"In order to use a Fiscal Data Module, you will need a registered POSBox. "
-"These POSBoxes are similar to the regular POSBoxes we sell, but they are "
+"In order to use a Fiscal Data Module, you will need a registered IoT Box. "
+"These IoT Boxes are similar to the regular IoT Boxes we sell, but they are "
 "registered with the Belgian government. This is required by law. Attempting "
-"to use a Fiscal Data Module on a non-registered POSBox will not work. You "
-"can verify that the Fiscal Data Module is recognized by the POSBox by going "
-"to the *Hardware status page* via the POSBox homepage."
+"to use a Fiscal Data Module on a non-registered IoT Box will not work. You "
+"can verify that the Fiscal Data Module is recognized by the IoT Box by going"
+" to the *Hardware status page* via the IoT Box homepage."
 msgstr ""
-"Con el fin de utilizar Un Módulos de Datos fiscales, usted necesitará un "
-"POSBox registarado. Esos POSBox son similares a los POSBox regulares que "
-"nosotros vendemos, pero están registrado con el nombre del gobierno belga. "
-"Eso es requerido por las ley.  Al intentar usar un Módulo de Datos Fiscales "
-"en un POSBox  no registrado  no funcionará. Puede verificar que el Módulo "
-"Fiscal de Datos es reconocido por POSBox a través de ir a la  ** Página de "
-"Hardware* mediante la páginaweb POSBox."
 
 #: ../../point_of_sale/belgian_fdm/setup.rst:52
 msgid "Odoo"
@@ -582,23 +575,13 @@ msgid ""
 "**Belgian Registered Cash Register** app (technical name: "
 "``pos_blackbox_be``). Because of government restrictions imposed on us, this"
 " installation cannot be undone. After this, you will have to ensure that "
-"each POS configuration has a unique registered POSBox associated with it "
+"each POS configuration has a unique registered IoT Box associated with it "
 "(:menuselection:`Point of Sale --> Configuration --> Point of Sale` and "
-"ensure Hardware Proxy / POSBox and the serial number of your POSBox is set)."
-" The first time you open the Point of Sale and attempt to do a transaction, "
-"you will be asked to input the PIN that you received with your VAT signing "
-"card."
+"ensure Hardware Proxy / IoT Box and the serial number of your IoT Box is "
+"set). The first time you open the Point of Sale and attempt to do a "
+"transaction, you will be asked to input the PIN that you received with your "
+"VAT signing card."
 msgstr ""
-"En el Punto de Venta de Odoo se convirtió en un Punto de Venta certificado "
-"al instalar el módulo **Registro Belga de Registro de Efectivo** (nombre "
-"técnico: ``pos_blackbox_be``). Debido a las restricciones gubernamentales "
-"impuestas a nosotros, esta instalación no se puede deshacer. Después de "
-"esto, usted tendrá que asegurarse de que cada configuración del Punto de "
-"Venta tenga una POSBox único asociado a él (:menuselection:`Punto de Venta "
-"--> Configuración --> Punto de Venta` y garantizar que el Hardware Proxy / "
-"POSBox y que el número de serie del POSBOX esté establecido). La primera vez"
-" que abra el punto de venta y trate de hacer una transacción, se le pedirá "
-"que introduzca el NIP que recibió con su tarjeta de registro de VAT."
 
 #: ../../point_of_sale/belgian_fdm/setup.rst:69
 msgid "Certification & On-premise"
@@ -653,16 +636,12 @@ msgid "Selling products without a valid tax"
 msgstr "Vender productos sin el impuesto válido"
 
 #: ../../point_of_sale/belgian_fdm/setup.rst:90
-msgid "Multiple Odoo POS configurations per POSBox are not allowed"
+msgid "Multiple Odoo POS configurations per IoT Box are not allowed"
 msgstr ""
-"Múltiples configuraciones del Punto de Venta por Terminal del Punto del "
-"Venta no son permitidas"
 
 #: ../../point_of_sale/belgian_fdm/setup.rst:91
-msgid "Using the POS without a connection to the POSBox (and thus FDM)"
+msgid "Using the POS without a connection to the IoT Box (and thus FDM)"
 msgstr ""
-"Usar el Punto de Venta sin la conexión de la Terminal del Punto de Venta (y "
-"por lo tanto FDM)"
 
 #: ../../point_of_sale/belgian_fdm/setup.rst:92
 msgid "Blacklisted modules: pos_discount, pos_reprint, pos_loyalty"
@@ -707,1096 +686,6 @@ msgid ""
 "any future transactions."
 msgstr ""
 
-#: ../../point_of_sale/overview/setup.rst:3
-msgid "Point of Sale Hardware Setup"
-msgstr "Configuración Hardware del Punto de Venta"
-
-#: ../../point_of_sale/overview/setup.rst:6
-msgid "POSBox Setup Guide"
-msgstr "Guía de configuración Caja PdV"
-
-#: ../../point_of_sale/overview/setup.rst:11
-#: ../../point_of_sale/overview/setup.rst:205
-msgid "Prerequisites"
-msgstr "Pre-requisitos"
-
-#: ../../point_of_sale/overview/setup.rst:13
-msgid ""
-"Before you start setting up your POSBox make sure you have everything. You "
-"will need :"
-msgstr ""
-"Antes de comenzar a configurar su Caja PdV asegúrese de tener todo. "
-"Necesitará :"
-
-#: ../../point_of_sale/overview/setup.rst:16
-msgid "The POSBox"
-msgstr "La Caja PdV"
-
-#: ../../point_of_sale/overview/setup.rst:17
-msgid "A 2A Power adapter"
-msgstr "Un adaptador de energía 2A"
-
-#: ../../point_of_sale/overview/setup.rst:18
-msgid "A computer or tablet with an up-to-date web browser"
-msgstr "Una computadora o tableta con un navegador web actualizado a la fecha"
-
-#: ../../point_of_sale/overview/setup.rst:19
-msgid "A running SaaS or Odoo database with the Point of Sale installed"
-msgstr ""
-
-#: ../../point_of_sale/overview/setup.rst:20
-msgid "A local network set up with DHCP (this is the default setting)"
-msgstr ""
-"Una red local configurada con DHCP (esta es la configuración predeterminada)"
-
-#: ../../point_of_sale/overview/setup.rst:21
-msgid ""
-"An Epson USB TM-T20 Printer or another ESC/POS compatible printer "
-"(officially supported printers are listed at the `POS Hardware page "
-"<https://www.odoo.com/page/pos-ipad-android-hardware>`_)"
-msgstr ""
-
-#: ../../point_of_sale/overview/setup.rst:24
-msgid "A Honeywell Eclipse USB Barcode Scanner or another compatible scanner"
-msgstr ""
-"Un Escáner de código de barras USB Honeywell Eclipse u otro escáner "
-"compatible"
-
-#: ../../point_of_sale/overview/setup.rst:25
-msgid "An Epson compatible cash drawer"
-msgstr "Un cajón de dinero Epson compatible"
-
-#: ../../point_of_sale/overview/setup.rst:26
-msgid "An RJ45 Ethernet Cable (optional, Wi-Fi is built in)"
-msgstr ""
-
-#: ../../point_of_sale/overview/setup.rst:29
-#: ../../point_of_sale/overview/setup.rst:213
-msgid "Step By Step Setup Guide"
-msgstr "Guía de configuración Paso a Paso"
-
-#: ../../point_of_sale/overview/setup.rst:32
-msgid "Current version of the POSBox (since 2015)"
-msgstr "Última versión de la Caja PdV (desde 2015)"
-
-#: ../../point_of_sale/overview/setup.rst:36
-msgid "Connect peripheral devices"
-msgstr "Conectar dispositivos perisféricos"
-
-#: ../../point_of_sale/overview/setup.rst:38
-msgid ""
-"Officially supported hardware is listed on `the POS Hardware page "
-"<https://www.odoo.com/page/pos-ipad-android-hardware>`_, but other hardware "
-"might work as well."
-msgstr ""
-"El hardware con soporte oficial está listado en `the POS Hardware page "
-"<https://www.odoo.com/page/pos-ipad-android-hardware>`_, pero otro hardware "
-"debería funcionar bien."
-
-#: ../../point_of_sale/overview/setup.rst:42
-msgid "**Printer**: Connect an ESC/POS printer to a USB port and power it on."
-msgstr ""
-"**Impresora**: Conectar una impresora ESC/POS a un puerto USB y encenderla."
-
-#: ../../point_of_sale/overview/setup.rst:45
-msgid ""
-"**Cash drawer**: The cash drawer should be connected to the printer with an "
-"RJ25 cable."
-msgstr ""
-"**Cajón de dinero**: El cajón de dinero debe conectarse a la impresora con "
-"un cable RJ25."
-
-#: ../../point_of_sale/overview/setup.rst:48
-msgid ""
-"**Barcode scanner**: Connect your barcode scanner. In order for your barcode"
-" scanner to be compatible it must behave as a keyboard and must be "
-"configured in **US QWERTY**. It also must end barcodes with an Enter "
-"character (keycode 28). This is most likely the default configuration of "
-"your barcode scanner."
-msgstr ""
-"**Escáner de código de barras**: Conecte el escáner de código de barras. "
-"Para que se escáner sea compatible, debe comportarse como un teclado y debe "
-"ser configurado en **US QWERTY**. También debe poner fin a los códigos de "
-"barras con una tecla ENTER (código clave 28). Esto es más probable en la "
-"configuración por defecto de su escáner."
-
-#: ../../point_of_sale/overview/setup.rst:54
-msgid "**Scale**: Connect your scale and power it on."
-msgstr "**Escala**: Conecte su escala y enciéndala. "
-
-#: ../../point_of_sale/overview/setup.rst:56
-msgid ""
-"**Ethernet**: If you do not wish to use Wi-Fi, plug in the Ethernet cable. "
-"Make sure this will connect the POSBox to the same network as your POS "
-"device."
-msgstr ""
-"**Ethernet**: Si usted no desea utilizar Wi-Fi, conecte el cable Ethernet. "
-"Asegúrese de que esto se vaya a conectar en la caja del terminal del punto "
-"de venta a la misma red que su dispositivo de ventas."
-
-#: ../../point_of_sale/overview/setup.rst:60
-msgid ""
-"**Wi-Fi**: The current version of the POSBox has Wi-Fi built in. Make sure "
-"not to plug in an Ethernet cable, because all Wi-Fi functionality will be "
-"bypassed when a wired network connection is available."
-msgstr ""
-
-#: ../../point_of_sale/overview/setup.rst:66
-msgid "Power the POSBox"
-msgstr "Encender la Caja PdV"
-
-#: ../../point_of_sale/overview/setup.rst:68
-msgid ""
-"Plug the power adapter into the POSBox, a bright red status led should light"
-" up."
-msgstr ""
-"Enchufe el adaptador de corriente en la Caja PdV, un estado de LED color "
-"rojo brillante debe encenderse."
-
-#: ../../point_of_sale/overview/setup.rst:72
-msgid "Make sure the POSBox is ready"
-msgstr "Asegúrese que la Caja PdV está lista."
-
-#: ../../point_of_sale/overview/setup.rst:74
-msgid ""
-"Once powered, The POSBox needs a while to boot. Once the POSBox is ready, it"
-" should print a status receipt with its IP address. Also the status LED, "
-"just next to the red power LED, should be permanently lit green."
-msgstr ""
-"Una vez encendida, la Terminal de Punto de Venta necesita tiempo para "
-"arrancar. Una vez que la Terminal del Punto de Venta está lista, debería de "
-"imprimir un recibo del estatus con la dirección de IP. Después del estatus "
-"LED, justo después de prender  el botón rojo, deberá permanecer en luz "
-"verde."
-
-#: ../../point_of_sale/overview/setup.rst:80
-#: ../../point_of_sale/overview/setup.rst:292
-msgid "Setup the Point of Sale"
-msgstr "Configurar el Punto de Venta"
-
-#: ../../point_of_sale/overview/setup.rst:82
-msgid ""
-"To setup the POSBox in the Point of Sale go to :menuselection:`Point of Sale"
-" --> Configuration --> Point of Sale` and select your Point of Sale. Scroll "
-"down to the ``PoSBox / Hardware Proxy`` section and activate the options for"
-" the hardware you want to use through the POSBox. Specifying the IP of the "
-"POSBox is recommended (it is printed on the receipt that gets printed after "
-"booting up the POSBox). When the IP is not specified the Point of Sale will "
-"attempt to find it on the local network."
-msgstr ""
-
-#: ../../point_of_sale/overview/setup.rst:91
-msgid ""
-"If you are running multiple Point of Sale on the same POSBox, make sure that"
-" only one of them has Remote Scanning/Barcode Scanner activated."
-msgstr ""
-
-#: ../../point_of_sale/overview/setup.rst:94
-msgid ""
-"It might be a good idea to make sure the POSBox IP never changes in your "
-"network. Refer to your router documentation on how to achieve this."
-msgstr ""
-"Podría ser buena idea asegurarse que la terminal del Punto de Venta nunca "
-"cambie de su red. Consulte la documentación de su router para lograr esto."
-
-#: ../../point_of_sale/overview/setup.rst:99
-msgid "Launch the Point of Sale"
-msgstr "Inicia el Punto de Venta"
-
-#: ../../point_of_sale/overview/setup.rst:101
-msgid ""
-"If you didn't specify the POSBox's IP address in the configuration, the POS "
-"will need some time to perform a network scan to find the POSBox. This is "
-"only done once."
-msgstr ""
-"Si no especifica la dirección de IP de la Terminal del Punto de Venta en la "
-"configuración, la Terminal necesita ejecutar el escanear de redes para "
-"encontrar la de la Terminal. Esto sólo se ejecutará una únicamente vez."
-
-#: ../../point_of_sale/overview/setup.rst:105
-msgid ""
-"The Point of Sale is now connected to the POSBox and your hardware should be"
-" ready to use."
-msgstr ""
-"El punto de venta ahora es conectado con el POSBox y tu disco duro debe "
-"estar listo para usarse."
-
-#: ../../point_of_sale/overview/setup.rst:109
-msgid "Wi-Fi configuration"
-msgstr "Configuración Wi-Fi"
-
-#: ../../point_of_sale/overview/setup.rst:111
-msgid ""
-"The most recent version of the POSBox has Wi-Fi built in. If you're using an"
-" older version you'll need a Linux compatible USB Wi-Fi adapter. Most "
-"commercially available Wi-Fi adapters are Linux compatible. Officially "
-"supported are Wi-Fi adapters with a Ralink 5370 chipset."
-msgstr ""
-
-#: ../../point_of_sale/overview/setup.rst:117
-msgid ""
-"Make sure not to plug in an Ethernet cable, as all Wi-Fi related "
-"functionality will be disabled when a wired network connection is available."
-msgstr ""
-"Asegúrese de no conectar un cable Ethernet, ya que todas las funciones "
-"relacionadas con el Wi-Fi se desactivarán cuando una conexión de red por "
-"cable esté disponible."
-
-#: ../../point_of_sale/overview/setup.rst:121
-msgid ""
-"When the POSBox boots with a Wi-Fi adapter it will start its own Wi-Fi "
-"Access Point called \"Posbox\" you can connect to. The receipt that gets "
-"printed when the POSBox starts will reflect this. In order to make the "
-"POSBox connect to an already existing Wi-Fi network, go to the homepage of "
-"the POSBox (indicated on the receipt) and go to the Wi-Fi configuration "
-"page. On there you can choose a network to connect to. Note that we only "
-"support open and WPA(2)-PSK networks. When connecting to a WPA-secured "
-"network, fill in the password field. The POSBox will attempt to connect to "
-"the specified network and will print a new POSBox status receipt after it "
-"has connected."
-msgstr ""
-"Cuando arranca la Terminal de Punto con un adaptador Wi-Fi se iniciará su "
-"propio punto de acceso de Wi-Fi llamado \"Terminal\" para poder conectarse. "
-"El recibo que se imprime cuando la Terminal comienza reflejará esto. con el "
-"fin de hacer que la Terminal del Punto de Venta se conecte a una red Wi-Fi "
-"existente, vaya a la página de inicio de la Terminal de Punto de Venta "
-"(indicada en el recibo) y vaya a la página de configuración de Wi-Fi. Por "
-"allí se puede elegir una red para conectarse. Tenga en cuenta que sólo se da"
-" soporte (2) redes -PSK abiertos y WPA. Cuando se conecta a una red WPA "
-"asegurada, rellene el campo de contraseña. La Terminal del Punto de Venta "
-"intentará conectarse a la red especificada y se imprimirá un nuevo recibo "
-"del estado de la Terminal del Punto de Venta después de que se haya "
-"conectado."
-
-#: ../../point_of_sale/overview/setup.rst:132
-msgid ""
-"If you plan on permanently setting up the POSBox with Wi-Fi, you can use the"
-" \"persistent\" checkbox on the Wi-Fi configuration page when connecting to "
-"a network. This will make the network choice persist across reboots. This "
-"means that instead of starting up its own \"Posbox\" network it will always "
-"attempt to connect to the specified network after it boots."
-msgstr ""
-"Si planea establecer permanentemente la Terminal del Punto de Venta con Wi-"
-"Fi, puede utilizar la opción \"persistente\" en la página de configuración "
-"de Wi-Fi cuando se conecta a una red. Esto hará que la elección de la red "
-"persiste en los reinicios. Esto significa que en lugar de poner en marcha su"
-" propia red \"Terminal\" que siempre tratará de conectarse a la red "
-"especificada después de que se inicie."
-
-#: ../../point_of_sale/overview/setup.rst:139
-msgid ""
-"When the POSBox fails to connect to a network it will fall back to starting "
-"it's own \"Posbox\" Access Point. If connection is lost with a Wi-Fi network"
-" after connecting to it, the POSBox will attempt to re-establish connection "
-"automatically."
-msgstr ""
-"Cuando la Terminal de Punto de Venta no se puede conectar a una red caerá de"
-" nuevo a iniciar su propio Punto de Acceso \"Terminal\". Si se pierde la "
-"conexión con una red Wi-Fi después de conectarse a ella, la Terminal de "
-"Punto de Venta intentará restablecer la conexión automáticamente."
-
-#: ../../point_of_sale/overview/setup.rst:145
-msgid "Multi-POS Configuration"
-msgstr "Configuración Multi-PdV"
-
-#: ../../point_of_sale/overview/setup.rst:147
-msgid ""
-"The advised way to setup a multi Point of Sale shop is to have one POSBox "
-"per Point of Sale. In this case it is mandatory to manually specify the IP "
-"address of each POSBox in each Point of Sale. You must also configure your "
-"network to make sure the POSBox's IP addresses don't change. Please refer to"
-" your router documentation."
-msgstr ""
-"La forma aconsejada de configurar un Punto de Venta de múltiples tiendas es "
-"tener una Terminal por cada Punto de Venta. En este caso, es obligatorio "
-"especificar manualmente la dirección IP de cada Terminal en cada Punto de "
-"Venta. También se debe configurar la red para asegurarse de que las "
-"direcciones de IP de la Terminal no cambien. Por favor, consulte la "
-"documentación del router."
-
-#: ../../point_of_sale/overview/setup.rst:154
-msgid "POSBoxless Guide (advanced)"
-msgstr "Guía de Caja chica PdV (avanzado)"
-
-#: ../../point_of_sale/overview/setup.rst:158
-msgid ""
-"If you are running your Point of Sale on a Debian-based Linux distribution, "
-"you do not need the POSBox as you can run its software locally. However the "
-"installation process is not foolproof. You'll need at least to know how to "
-"install and run Odoo. You may also run into issues specific to your "
-"distribution or to your particular setup and hardware configuration."
-msgstr ""
-"Si usted está usando su Punto de Venta en una distribución de Linux basada "
-"en Debian, no es necesario que la Terminal del Punto de Venta como se puede "
-"ejecutar desde su software a nivel local. Sin embargo el proceso de "
-"instalación no es infalible. Usted necesitará por lo menos para saber cómo "
-"instalar y ejecutar Odoo. También es posible que tenga problemas específicos"
-" de su distribución o de su configuración particular y configuración de "
-"hardware."
-
-#: ../../point_of_sale/overview/setup.rst:165
-msgid ""
-"Drivers for the various types of supported hardware are provided as Odoo "
-"modules. In fact, the POSBox runs an instance of Odoo that the Point of Sale"
-" communicates with. The instance of Odoo running on the POSBox is very "
-"different from a 'real' Odoo instance however. It does not handle *any* "
-"business data (eg. POS orders), but only serves as a gateway between the "
-"Point of Sale and the hardware."
-msgstr ""
-"Los drivers de diferentes tipos de soporte para el hardware son provistos "
-"como los módulos de Odoo. De hecho, la Terminal del Punto de Venta ejecuta "
-"una instancia de Odoo para que se comunique con el Punto de Venta. La "
-"instancia de Odoo se ejecuta en la Terminal del Punto de Venta, sin embargo,"
-" es muy diferente a una instancia \"real\" de Odoo. No maneja *cualquier* "
-"dato de negocio (por ejemplo las órdenes de punto de venta), pero sólo sirve"
-" como puerta de enlace entre el punto de venta y el hardware."
-
-#: ../../point_of_sale/overview/setup.rst:172
-msgid ""
-"The goal of this section will be to set up a local Odoo instance that "
-"behaves like the Odoo instance running on the POSBox."
-msgstr ""
-
-#: ../../point_of_sale/overview/setup.rst:176
-msgid "Image building process"
-msgstr "Proceso de creación de imagen"
-
-#: ../../point_of_sale/overview/setup.rst:178
-msgid ""
-"We generate the official POSBox images using the scripts in "
-"https://github.com/odoo/odoo/tree/11.0/addons/point_of_sale/tools/posbox. "
-"More specifically, we run `posbox_create_image.sh "
-"<https://github.com/odoo/odoo/blob/11.0/addons/point_of_sale/tools/posbox/posbox_create_image.sh>`_."
-" This builds an image called ``posbox.img``, which we zip and upload to "
-"`nightly.odoo.com <https://nightly.odoo.com>`_ for users to download."
-msgstr ""
-
-#: ../../point_of_sale/overview/setup.rst:186
-msgid ""
-"The scripts in this directory might be useful as a reference if you get "
-"stuck or want more detail about something."
-msgstr ""
-"Las secuencias de comandos en este directorio podrían ser útiles como "
-"referencia si te quedas atascado o desean más detalles acerca de algo."
-
-#: ../../point_of_sale/overview/setup.rst:190
-msgid "Summary of the image creation process"
-msgstr "Resumen del proceso de creación de la imagen"
-
-#: ../../point_of_sale/overview/setup.rst:192
-msgid ""
-"The image creation process starts by downloading the latest `Raspbian "
-"<https://www.raspbian.org/>`_ image. It then locally mounts this Raspbian "
-"image and copies over some files and scripts that will make the Raspbian "
-"image turn itself into a POSBox when it boots. These scripts will update "
-"Raspbian, remove non-essential packages and install required packages. In "
-"order to boot Raspbian we use qemu, which is capable of providing ARM "
-"emulation. After this, the emulated Raspbian OS will shut itself down. We "
-"then once again locally mount the image, remove the scripts that were used "
-"to initialize the image at boot and we copy over some extra configuration "
-"files. The resulting image is then ready to be tested and used."
-msgstr ""
-"El proceso de creación de imagen comienza descargando la última `imagen "
-"Raspbian <https://www.raspbian.org/>`_ . A continuación, se monta localmente"
-" esta imagen Raspbian y copias sobre algunos archivos y secuencias de "
-"comandos que harán que la imagen Raspbian se convierta en una Terminal de "
-"Punto de Venta cuando arranque. Estos scripts actualizarán Raspbian, "
-"eliminarán paquetes no esenciales e instalarán los paquetes necesarios. Con "
-"el fin de arrancar Raspbian usamos qemu, que es capaz de proporcionar la "
-"emulación ARM. Después de esto, el sistema operativo Raspbian emulado se "
-"apagará. A continuación, una vez más a nivel local se monta la imagen, "
-"eliminan los guiones que fueron utilizados para inicializar la imagen en el "
-"arranque y copiamos sobre algunos archivos de configuración adicionales. La "
-"imagen resultante está entonces lista para ser probada y utilizada."
-
-#: ../../point_of_sale/overview/setup.rst:207
-msgid "A Debian-based Linux distribution (Debian, Ubuntu, Mint, etc.)"
-msgstr "Una distribución Linux basada en Debian (Debian, Ubuntu, Mint, etc.)"
-
-#: ../../point_of_sale/overview/setup.rst:208
-msgid "A running Odoo instance you connect to load the Point of Sale"
-msgstr ""
-
-#: ../../point_of_sale/overview/setup.rst:209
-msgid ""
-"You must uninstall any ESC/POS printer driver as it will conflict with "
-"Odoo's built-in driver"
-msgstr ""
-"Debe desinstalar cualquier controlador de impresora ESC/POS, ya que entrará "
-"en conflicto con controlador integrado de Odoo"
-
-#: ../../point_of_sale/overview/setup.rst:216
-msgid "Extra dependencies"
-msgstr "Dependencias extra"
-
-#: ../../point_of_sale/overview/setup.rst:218
-msgid ""
-"Because Odoo runs on Python 2, you need to check which version of pip you "
-"need to use."
-msgstr ""
-"Porque Odoo corre en Python 2, usted necesita revisar qué versión de PIP es "
-"necesario utilizar."
-
-#: ../../point_of_sale/overview/setup.rst:221
-msgid "``# pip --version``"
-msgstr "``# pip --version``"
-
-#: ../../point_of_sale/overview/setup.rst:223
-#: ../../point_of_sale/overview/setup.rst:229
-msgid "If it returns something like::"
-msgstr "Si esto devuelve algo como esto:"
-
-#: ../../point_of_sale/overview/setup.rst:227
-msgid "You need to try pip2 instead."
-msgstr "Necesita probar pip2 en su lugar."
-
-#: ../../point_of_sale/overview/setup.rst:233
-msgid "You can use pip."
-msgstr "Puede utilizar pip."
-
-#: ../../point_of_sale/overview/setup.rst:235
-msgid "The driver modules requires the installation of new python modules:"
-msgstr ""
-"Los módulos de los controladores requieren la instalación de nuevos módulos "
-"de Python:"
-
-#: ../../point_of_sale/overview/setup.rst:237
-msgid "``# pip install pyserial``"
-msgstr "``# pip install pyserial``"
-
-#: ../../point_of_sale/overview/setup.rst:239
-msgid "``# pip install pyusb==1.0.0b1``"
-msgstr "``# pip install pyusb==1.0.0b1``"
-
-#: ../../point_of_sale/overview/setup.rst:241
-msgid "``# pip install qrcode``"
-msgstr "``# pip install qrcode``"
-
-#: ../../point_of_sale/overview/setup.rst:244
-msgid "Access Rights"
-msgstr "Permisos de acceso"
-
-#: ../../point_of_sale/overview/setup.rst:246
-msgid ""
-"The drivers need raw access to the printer and barcode scanner devices. "
-"Doing so requires a bit system administration. First we are going to create "
-"a group that has access to USB devices"
-msgstr ""
-"Los drivers deben tener acceso en bruto a los dispositivos de escáner de la "
-"impresora y de los códigos de barras. Para ello se requiere un sistema de "
-"administración de bits. En primer lugar vamos a crear un grupo que tiene "
-"acceso de los dispositivos USB."
-
-#: ../../point_of_sale/overview/setup.rst:250
-msgid "``# groupadd usbusers``"
-msgstr "``# groupadd usbusers``"
-
-#: ../../point_of_sale/overview/setup.rst:252
-msgid "Then we add the user who will run the OpenERP server to ``usbusers``"
-msgstr ""
-"Luego añadimos el usuario que va a ejecutar el servidor OpenERP a "
-"``usbusers``"
-
-#: ../../point_of_sale/overview/setup.rst:254
-msgid "``# usermod -a -G usbusers USERNAME``"
-msgstr ""
-
-#: ../../point_of_sale/overview/setup.rst:256
-msgid ""
-"Then we need to create a udev rule that will automatically allow members of "
-"``usbusers`` to access raw USB devices. To do so create a file called "
-"``99-usbusers.rules`` in the ``/etc/udev/rules.d/`` directory with the "
-"following content::"
-msgstr ""
-
-#: ../../point_of_sale/overview/setup.rst:264
-msgid "Then you need to reboot your machine."
-msgstr "Luego debe reiniciar su máquina."
-
-#: ../../point_of_sale/overview/setup.rst:267
-msgid "Start the local Odoo instance"
-msgstr "Comenzar la instancia local de Odoo"
-
-#: ../../point_of_sale/overview/setup.rst:269
-msgid "We must launch the Odoo server with the correct settings"
-msgstr "Debe iniciar el servidor Odoo con las configuraciones correctas"
-
-#: ../../point_of_sale/overview/setup.rst:271
-msgid ""
-"``$ ./odoo.py "
-"--load=web,hw_proxy,hw_posbox_homepage,hw_posbox_upgrade,hw_scale,hw_scanner,hw_escpos``"
-msgstr ""
-
-#: ../../point_of_sale/overview/setup.rst:274
-msgid "Test the instance"
-msgstr "Probar la instancia"
-
-#: ../../point_of_sale/overview/setup.rst:276
-msgid ""
-"Plug all your hardware to your machine's USB ports, and go to "
-"``http://localhost:8069/hw_proxy/status`` refresh the page a few times and "
-"see if all your devices are indicated as *Connected*. Possible source of "
-"errors are: The paths on the distribution differ from the paths expected by "
-"the drivers, another process has grabbed exclusive access to the devices, "
-"the udev rules do not apply or a superseded by others."
-msgstr ""
-"Conecte todo el hardware a los puertos USB de su máquina, y vaya a la "
-"``http://localhost:8069/hw_proxy/status`` actualice la página un par de "
-"veces y vea si todos los dispositivos están indicados como *Conectado*. Una "
-"posible fuente de errores son: Los caminos de la distribución difieren de "
-"las trayectorias esperadas por los pilotos, otro proceso ha acaparado acceso"
-" exclusivo a los dispositivos, no se aplican las reglas de udev o sustituida"
-" por otros."
-
-#: ../../point_of_sale/overview/setup.rst:284
-msgid "Automatically start Odoo"
-msgstr "Iniciar automáticamente Odoo"
-
-#: ../../point_of_sale/overview/setup.rst:286
-msgid ""
-"You must now make sure that this Odoo install is automatically started after"
-" boot. There are various ways to do so, and how to do it depends on your "
-"particular setup. Using the init system provided by your distribution is "
-"probably the easiest way to accomplish this."
-msgstr ""
-"Ahora debe asegurarse de que la instalación de Odoo se inicie "
-"automáticamente después del arranque. Hay varias maneras de hacerlo, y la "
-"forma de hacerlo depende de su configuración particular. Usando el sistema "
-"de inicio recibido por su distribución es probablemente la forma más fácil "
-"de lograr esto."
-
-#: ../../point_of_sale/overview/setup.rst:294
-msgid ""
-"The IP address field in the POS configuration must be either ``127.0.0.1`` "
-"or ``localhost`` if you're running the created Odoo server on the machine "
-"that you'll use as the Point of Sale device. You can also leave it empty."
-msgstr ""
-"El campo de la dirección IP en la configuración de la Terminal del Punto de "
-"Venta debe ser ``127.0.0.1`` o ``localhost`` si se está ejecutando el "
-"servidor de Odoo en la máquina que va a utilizar como el Punto de Venta del "
-"dispositivo. También puede dejarlo vacío."
-
-#: ../../point_of_sale/overview/setup.rst:300
-msgid "POSBox Technical Documentation"
-msgstr "Documentación Técnica de la Caja PdV"
-
-#: ../../point_of_sale/overview/setup.rst:303
-msgid "Technical Overview"
-msgstr "Información técnica general"
-
-#: ../../point_of_sale/overview/setup.rst:306
-msgid "The POSBox Hardware"
-msgstr "El hardware de la Caja PdV"
-
-#: ../../point_of_sale/overview/setup.rst:308
-msgid ""
-"The POSBox's Hardware is based on a `Raspberry Pi 2 "
-"<https://www.raspberrypi.org/products/raspberry-pi-2-model-b/>`_, a popular "
-"single-board computer. The Raspberry Pi 2 is powered with a 2A micro-usb "
-"power adapter. 2A is needed to give enough power to the barcode scanners. "
-"The Software is installed on a 8Gb Class 10 or Higher SD Card. All this "
-"hardware is easily available worldwide from independent vendors."
-msgstr ""
-"El Hardware de la Terminal del Punto de Venta se basa en una `Raspberry Pi 2"
-" <https://www.raspberrypi.org/products/raspberry-pi-2-model-b/>`_, una "
-"computadora de placa popular. El Raspberry Pi 2 se alimenta con un adaptador"
-" de corriente micro-usb 2A. Se necesita 2A para dar suficiente energía para "
-"los escáneres de códigos de barras. El software se instala en una tarjeta de"
-" 8 GB Clase 10 o superior SD. Todo este hardware es fácilmente disponible a "
-"nivel mundial de los proveedores independientes."
-
-#: ../../point_of_sale/overview/setup.rst:317
-msgid "Compatible Peripherals"
-msgstr "Perisféricos compatibles"
-
-#: ../../point_of_sale/overview/setup.rst:319
-msgid ""
-"Officially supported hardware is listed on the `POS Hardware page "
-"<https://www.odoo.com/page/pos-ipad-android-hardware>`_."
-msgstr ""
-"El hardware con soporte oficial está listado en `POS Hardware page "
-"<https://www.odoo.com/page/pos-ipad-android-hardware>`_."
-
-#: ../../point_of_sale/overview/setup.rst:323
-msgid "The POSBox Software"
-msgstr "El software de la Caja PdV"
-
-#: ../../point_of_sale/overview/setup.rst:325
-msgid ""
-"The POSBox runs a heavily modified Raspbian Linux installation, a Debian "
-"derivative for the Raspberry Pi. It also runs a barebones installation of "
-"Odoo which provides the webserver and the drivers. The hardware drivers are "
-"implemented as Odoo modules. Those modules are all prefixed with ``hw_*`` "
-"and they are the only modules that are running on the POSBox. Odoo is only "
-"used for the framework it provides. No business data is processed or stored "
-"on the POSBox. The Odoo instance is a shallow git clone of the ``8.0`` "
-"branch."
-msgstr ""
-"La Terminal del Punto de Venta ejecuta una instalación Raspbian Linux muy "
-"modificada, un derivado de Debian para el Raspberry Pi. También se ejecuta "
-"una instalación sencilla de Odoo que proporciona el servidor web y los "
-"controladores. Los controladores de hardware se implementan como módulos de "
-"Odoo. Esos módulos tienen el prefijo ``hw_* `` y ellos son los únicos "
-"módulos que se ejecutan en la Terminal del Punto de Venta. Odoo sólo se "
-"utiliza para el marco que proporciona. No hay datos de negocio que se "
-"procesen o almacenen en la Terminal del Punto de Venta. La instancia Odoo es"
-" un git clone superficial de la rama ``8.0``."
-
-#: ../../point_of_sale/overview/setup.rst:334
-msgid ""
-"The root partition on the POSBox is mounted read-only, ensuring that we "
-"don't wear out the SD card by writing to it too much. It also ensures that "
-"the filesystem cannot be corrupted by cutting the power to the POSBox. Linux"
-" applications expect to be able to write to certain directories though. So "
-"we provide a ramdisk for /etc and /var (Raspbian automatically provides one "
-"for /tmp). These ramdisks are setup by ``setup_ramdisks.sh``, which we run "
-"before all other init scripts by running it in ``/etc/init.d/rcS``. The "
-"ramdisks are named /etc_ram and /var_ram respectively. Most data from /etc "
-"and /var is copied to these tmpfs ramdisks. In order to restrict the size of"
-" the ramdisks, we do not copy over certain things to them (eg. apt related "
-"data). We then bind mount them over the original directories. So when an "
-"application writes to /etc/foo/bar it's actually writing to "
-"/etc_ram/foo/bar. We also bind mount / to /root_bypass_ramdisks to be able "
-"to get to the real /etc and /var during development."
-msgstr ""
-"La partición raíz en la Terminal del Punto de Venta está montada de sólo "
-"lectura, asegurando que no llevamos a cabo la tarjeta SD escribiendo a "
-"demasiado. También asegura que el sistema de archivos no puede ser "
-"corrompido por el corte de la alimentación a la Terminal. Aplicaciones Linux"
-" esperan poder escribir en ciertos directorios embargo. Así que le ofrecemos"
-" un ramdisk para /etc y /var (Raspbian proporciona automáticamente una para "
-"/tmp). Estos discos ram son configurados por ``setup_ramdisks.sh``, que se "
-"corre antes de todos los demás scripts de inicio ejecutándolo en "
-"``/etc/init.d/rcS``. Los discos ram son nombrados /etc_ram y /var_ram "
-"respectivamente. La mayoría de los datos de /etc y /var se copia en estos "
-"TMPFS ramdisks. Con el fin de limitar el tamaño de los discos ram, que no "
-"copiamos sobre ciertas cosas a ellos (por ejemplo, los datos relacionados). "
-"Entonces nos atamos montarlos en los directorios originales. Así que cuando "
-"una aplicación escribe en /etc /foo /bar en realidad está escribiendo a "
-"/etc_ram /foo /bar. También nos atamos de subir / a /root_bypass_ramdisks "
-"para poder llegar a la verdadera /etc y /var durante el desarrollo."
-
-#: ../../point_of_sale/overview/setup.rst:350
-msgid "Logs of the running Odoo server can be found at:"
-msgstr "Registros de los servidores Odoo funcionando se pueden encontrar en:"
-
-#: ../../point_of_sale/overview/setup.rst:352
-msgid "``/var/log/odoo/odoo.log``"
-msgstr "``/var/log/odoo/odoo.log``"
-
-#: ../../point_of_sale/overview/setup.rst:354
-msgid ""
-"Various POSBox related scripts (eg. wifi-related scripts) running on the "
-"POSBox will log to /var/log/syslog and those messages are tagged with "
-"``posbox_*``."
-msgstr ""
-"Varios scripts de la Terminal relacionados (por ejemplo scripts relacionados"
-" de wi-fi) que se ejecutan en la Terminal, se registrarán en /var/log/syslog"
-" y estos mensajes serán etiquetados con ``terminal_*``."
-
-#: ../../point_of_sale/overview/setup.rst:359
-msgid "Accessing the POSBox"
-msgstr "Accediendo a la Caja PdV"
-
-#: ../../point_of_sale/overview/setup.rst:362
-msgid "Local Access"
-msgstr "Acceso local"
-
-#: ../../point_of_sale/overview/setup.rst:364
-msgid ""
-"If you plug a QWERTY USB keyboard into one of the POSBox's USB ports, and if"
-" you connect a computer monitor to the *HDMI* port of the POSBox, you can "
-"use it as a small GNU/Linux computer and perform various administration "
-"tasks, like viewing some logs."
-msgstr ""
-"Si conecta un teclado QWERTY USB en uno de los puertos USB de la Terminal, y"
-" si se conecta un monitor de la computadora al puerto *HDMI* de la Terminal,"
-" se puede utilizar como un pequeño ordenador GNU/Linux y realizará diversas "
-"tareas de administración, como vistas de algunos registros."
-
-#: ../../point_of_sale/overview/setup.rst:369
-msgid "The POSBox will automatically log in as root on the default tty."
-msgstr ""
-"La Terminal del Punto de Venta se conectará automáticamente como root en la "
-"bandeja predeterminada. "
-
-#: ../../point_of_sale/overview/setup.rst:372
-msgid "Remote Access"
-msgstr "Acceso remoto"
-
-#: ../../point_of_sale/overview/setup.rst:374
-msgid ""
-"If you have the POSBox's IP address and an SSH client you can access the "
-"POSBox's system remotely. The login credentials are ``pi``/``raspberry``."
-msgstr ""
-"Si usted tiene la direcicón IP de la Terminal de Punto de Venta y un cliente"
-" SSH puede acceder al sistema de la Terminal de manera remoto. Las "
-"credenciales de inicio de sesión son `pi``/``raspberry``."
-
-#: ../../point_of_sale/overview/setup.rst:379
-msgid "Updating The POSBox Software"
-msgstr "Actualizando el software de la Caja PdV"
-
-#: ../../point_of_sale/overview/setup.rst:381
-msgid ""
-"Only upgrade the POSBox if you experience problems or want to use newly "
-"implemented features."
-msgstr ""
-"Sólo actualizar la Terminal de Punto de Venta si tiene problemas o desea "
-"utilizar las funciones de reciente aplicación."
-
-#: ../../point_of_sale/overview/setup.rst:384
-msgid ""
-"The best way to update the POSBox software is to download a new version of "
-"the image and flash the SD-Card with it. This operation is described in "
-"detail in `this tutorial <http://elinux.org/RPi_Easy_SD_Card_Setup>`_, just "
-"replace the standard Raspberry Pi image with the latest one found at `the "
-"official POSBox image page <http://nightly.odoo.com/master/posbox/>`_. This "
-"method of upgrading will ensure that you're running the latest version of "
-"the POSBox software."
-msgstr ""
-"La mejor manera de actualizar el software de la Terminal, es descargar una "
-"nueva versión de la imagen y el flash de la tarjeta SD con él. Esta "
-"operación se describe en detalle en `este tutorial "
-"<http://elinux.org/RPi_Easy_SD_Card_Setup>`_, basta con sustituir la imagen "
-"Raspberry Pi de serie con la última que se encuentra en `la página oficial "
-"de la imagen de la Terminal <http://nightly.odoo.com/master/posbox/>`_. Este"
-" método de actualización se asegurará de que se está ejecutando la última "
-"versión del software de la Terminal del Punto de Venta."
-
-#: ../../point_of_sale/overview/setup.rst:393
-msgid ""
-"The second way of upgrading is through the built in upgrade interface that "
-"can be reached through the POSBox homepage. The nice thing about upgrading "
-"like this is that you don't have to flash a new image. This upgrade method "
-"is limited to what it can do however. It can not eg. update installed "
-"configuration files (like eg. /etc/hostapd.conf). It can only upgrade:"
-msgstr ""
-"La segunda forma de la actualización es a través de la construirla en la "
-"interfaz de actualización que se puede llegar a través de la página de "
-"inicio de la Terminal. Lo bueno acerca de la actualización de esta manera es"
-" que usted no tiene que hacer una nueva imagen. Este método de actualización"
-" se limita a lo que puede hacer, sin embargo. No puede, por ejemplo "
-"configurar archivos de la actualización instalada (como por ejemplo "
-"/etc/hostapd.conf). Sólo se puede actualizar:"
-
-#: ../../point_of_sale/overview/setup.rst:400
-msgid "The internal Odoo application"
-msgstr "La aplicación Odoo interna"
-
-#: ../../point_of_sale/overview/setup.rst:401
-msgid ""
-"Scripts in the folder "
-"``odoo/addons/point_of_sale/tools/posbox/configuration/``"
-msgstr ""
-"Scripts en la carpeta "
-"``odoo/addons/point_of_sale/tools/posbox/configuration/``"
-
-#: ../../point_of_sale/overview/setup.rst:403
-msgid "When in doubt, always use the first method of upgrading."
-msgstr "En caso de duda, utilice siempre el primer método de actualización."
-
-#: ../../point_of_sale/overview/setup.rst:406
-msgid "Troubleshoot"
-msgstr "Solución de problemas"
-
-#: ../../point_of_sale/overview/setup.rst:409
-msgid "The POS cannot connect to the POSBox"
-msgstr "El PdV no se puede conectar a la Caja PdV"
-
-#: ../../point_of_sale/overview/setup.rst:411
-msgid ""
-"The easiest way to make sure the POSBox is properly set-up is to turn it on "
-"with the printer plugged in as it will print a receipt indicating any error "
-"if encountered or the POSBox's IP address in case of success. If no receipt "
-"is printed, check the following steps:"
-msgstr ""
-"La forma más fácil de asegurarse de que la Terminal del Punto de Venta está "
-"puesta en el punto adecuado, es encendiendo la impresora para imprimir un "
-"recibo que indicará cualquier error si se encuentra o la dirección IP de la "
-"Terminal del Punto de Venta en caso de haber tenido éxito. Si el recibo no "
-"se imprime, compruebe los siguientes pasos:"
-
-#: ../../point_of_sale/overview/setup.rst:415
-msgid ""
-"Make sure the POSBox is powered on, indicated by a brightly lit red status "
-"LED."
-msgstr ""
-"Asegúrese de que la Terminal del Punto de Venta esté encendida, lo indicará "
-"una luz brillante roja."
-
-#: ../../point_of_sale/overview/setup.rst:417
-msgid ""
-"Make sure the POSBox is ready, this is indicated by a brightly lit green "
-"status LED just next to the red power status LED. The POSBox should be ready"
-" ~2 minutes after it is started."
-msgstr ""
-"Asegúrese de que la Terminal del Punto de Venta este lista, esto lo indicará"
-" una luz brillante verde justo después de la luz de encendido roja. La "
-"Terminal del Punto de Venta deberá estar lista después de ~2 minutos de "
-"haber sido encendida."
-
-#: ../../point_of_sale/overview/setup.rst:420
-msgid ""
-"Make sure the POSBox is connected to the same network as your POS device. "
-"Both the device and the POSBox should be visible in the list of connected "
-"devices on your network router."
-msgstr ""
-"Asegúrese que la Terminal del Punto de Venta esté conectada a la misma red "
-"en la que se encuentra su Terminal. Tanto el dispositivo y la Terminal deben"
-" ser visibles en la lista de dispositivos conectados a su router de red."
-
-#: ../../point_of_sale/overview/setup.rst:423
-msgid ""
-"Make sure that your LAN is set up with DHCP, and gives IP addresses in the "
-"range 192.168.0.X, 192.168.1.X, 10.0.0.X. If you cannot setup your LAN that "
-"way, you must manually set up your POSBox's IP address."
-msgstr ""
-
-#: ../../point_of_sale/overview/setup.rst:427
-msgid ""
-"If you have specified the POSBox's IP address in the configuration, make "
-"sure it correspond to the printed on the POSBox's status receipt."
-msgstr ""
-"Si ha especificado la dirección IP de la Terminal en la configuración, "
-"asegúrese de que corresponda a la impresa en el recibo del estado de la "
-"Terminal de Punto de Venta."
-
-#: ../../point_of_sale/overview/setup.rst:430
-msgid "Make sure that the POS is not loaded over HTTPS."
-msgstr "Asegúrese que el PdV no está cargado sobre HTTPS."
-
-#: ../../point_of_sale/overview/setup.rst:431
-msgid ""
-"A bug in Firefox's HTTP implementation prevents the autodiscovery from "
-"working reliably. When using Firefox you should manually set up the POSBox's"
-" IP address in the POS configuration."
-msgstr ""
-"Un error en la aplicación HTTP de Firefox impide la detección automática "
-"para trabajar de forma fiable. Al utilizar Firefox usted debe configurar "
-"manualmente la dirección IP de la Terminal del Punto de Venta en la "
-"configuración de la Terminal."
-
-#: ../../point_of_sale/overview/setup.rst:436
-msgid "The Barcode Scanner is not working"
-msgstr "El escáner de código de barra no está funcionando"
-
-#: ../../point_of_sale/overview/setup.rst:438
-msgid ""
-"The barcode scanner must be configured in US QWERTY and emit an Enter after "
-"each barcode. This is the default configuration of most barcode readers. "
-"Refer to the barcode reader documentation for more information."
-msgstr ""
-"El escáner de código de barras se debe configurar en los Estados Unidos "
-"QWERTY y emite un Enter después de cada código de barras. Esta es la "
-"configuración por defecto de la mayoría de los lectores de códigos de "
-"barras. Consulte la documentación del lector de código de barras para "
-"obtener más información."
-
-#: ../../point_of_sale/overview/setup.rst:442
-msgid ""
-"The POSBox needs a 2A power supply to work with some barcode scanners. If "
-"you are not using the provided power supply, make sure the one you use has "
-"enough power."
-msgstr ""
-"La Terminal del Punto de Venta necesita una fuente de alimentación 2A para "
-"trabajar con algunos escáneres de códigos de barras. Si usted no está "
-"utilizando la fuente de alimentación suministrada, asegúrese de que la que "
-"utiliza cuente con el poder suficiente."
-
-#: ../../point_of_sale/overview/setup.rst:445
-msgid ""
-"Some barcode scanners will need more than 2A and will not work, or will work"
-" unreliably, even with the provided power supply. In those case you can plug"
-" the barcode scanner in a self-powered USB hub."
-msgstr ""
-"Algunos escáneres de códigos de barras necesitarán más de 2A y no "
-"funcionarán, o funcionan poco fiable, incluso con la fuente de alimentación "
-"proporcionada. En estos casos usted puede conectar el escáner de código de "
-"barras en un concentrador USB con alimentación propia."
-
-#: ../../point_of_sale/overview/setup.rst:448
-msgid ""
-"Some poorly built barcode scanners do not advertise themselves as barcode "
-"scanners but as a usb keyboard instead, and will not be recognized by the "
-"POSBox."
-msgstr ""
-"Algunos escáneres de códigos de barras mal construidas no se anuncian como "
-"escáneres de código de barras, sino como un teclado USB en su lugar, y estos"
-" no serán reconocidos por la terminal del punto de venta."
-
-#: ../../point_of_sale/overview/setup.rst:453
-msgid "The Barcode Scanner is not working reliably"
-msgstr "El escáner de código de barra no está funcionando de manera segura"
-
-#: ../../point_of_sale/overview/setup.rst:455
-msgid ""
-"Make sure that no more than one device with 'Scan via Proxy'/'Barcode "
-"Scanner' enabled are connected to the POSBox at the same time."
-msgstr ""
-"Asegúrese de que no más de un dispositivo habilitado de 'Escaner de "
-"proximidad'/'Escaner de código de barras'  esté conectado a la terminal del "
-"punto de venta al mismo tiempo."
-
-#: ../../point_of_sale/overview/setup.rst:460
-msgid "Printing the receipt takes too much time"
-msgstr "Impresión del recibo tarda demasiado tiempo"
-
-#: ../../point_of_sale/overview/setup.rst:462
-msgid ""
-"A small delay before the first print is expected, as the POSBox will do some"
-" preprocessing to speed up the next printings. If you suffer delays "
-"afterwards it is most likely due to poor network connection between the POS "
-"and the POSBox."
-msgstr ""
-"Se espera que un pequeño retraso antes de la primera impresión, ya que la "
-"terminal del punto de venta hará algún procesamiento previo para acelerar "
-"las próximas ediciones. Si usted sufre retrasos después es muy probable que "
-"sea debido a una mala conexión de red entre el punto de venta y la terminal."
-
-#: ../../point_of_sale/overview/setup.rst:468
-msgid "Some characters are not correctly printed on the receipt"
-msgstr "Algunos caracteres no se imprimen correctamente en el recibo"
-
-#: ../../point_of_sale/overview/setup.rst:470
-msgid ""
-"The POSBox does not support all languages and characters. It currently "
-"supports Latin and Cyrillic based scripts, with basic Japanese support."
-msgstr ""
-"La Terminal del Punto de Venta no es compatible con todos los idiomas y "
-"caracteres. Actualmente soporta scripts basados en los latinos y cirílicos, "
-"con el apoyo del japonés básico."
-
-#: ../../point_of_sale/overview/setup.rst:475
-msgid "The printer is offline"
-msgstr "La impresora está fuera de línea"
-
-#: ../../point_of_sale/overview/setup.rst:477
-msgid ""
-"Make sure the printer is connected, powered, has enough paper and has its "
-"lid closed, and is not reporting an error. If the error persists, please "
-"contact support."
-msgstr ""
-"Asegúrese de que la impresora esté conectada, funcionando, debe de tener "
-"suficiente papel y tener su tapa cerrada, y que no informe error. Si el "
-"error persiste, póngase en contacto con soporte."
-
-#: ../../point_of_sale/overview/setup.rst:482
-msgid "The cashdrawer does not open"
-msgstr "El cajón de dinero no abre"
-
-#: ../../point_of_sale/overview/setup.rst:484
-msgid ""
-"The cashdrawer should be connected to the printer and should be activated in"
-" the POS configuration."
-msgstr ""
-"El cajón de dinero debe estar conectado a la impresora y se debe activar en "
-"la configuración de la terminal."
-
-#: ../../point_of_sale/overview/setup.rst:488
-msgid "Credits"
-msgstr "Créditos"
-
-#: ../../point_of_sale/overview/setup.rst:489
-msgid ""
-"The POSBox project was developed by Frédéric van der Essen with the kind "
-"help of Gary Malherbe, Fabien Meghazi, Nicolas Wisniewsky, Dimitri Del "
-"Marmol, Joren Van Onder and Antony Lesuisse."
-msgstr ""
-"El proyecto de la Terminal del Punto de Venta fue desarrollado por Frédéric "
-"van der Essen con un poco de ayuda de Gary Malherbe, Fabien Meghazi, Nicolas"
-" Wisniewsky, Dimitri Del Marmol, Joren Van Onder y Antony Lesuisse."
-
-#: ../../point_of_sale/overview/setup.rst:493
-msgid ""
-"This development would not have been possible without the Indiegogo campaign"
-" and those who contributed to it. Special thanks goes to the partners who "
-"backed the campaign with founding partner bundles:"
-msgstr ""
-"Este desarrollo no habría sido posible sin la campaña de Indiegogo y los que"
-" han contribuido a ello. Especial agradecimiento a los socios que apoyaron "
-"la campaña con la fundación de paquetes asociados:"
-
-#: ../../point_of_sale/overview/setup.rst:497
-msgid "Camptocamp"
-msgstr "Camptocamp"
-
-#: ../../point_of_sale/overview/setup.rst:498
-msgid "BHC"
-msgstr "BHC"
-
-#: ../../point_of_sale/overview/setup.rst:499
-msgid "openBig"
-msgstr "openBig"
-
-#: ../../point_of_sale/overview/setup.rst:500
-msgid "Eeezee-IT"
-msgstr "Eeezee-IT"
-
-#: ../../point_of_sale/overview/setup.rst:501
-msgid "Solarsis LDA"
-msgstr "Solarsis LDA"
-
-#: ../../point_of_sale/overview/setup.rst:502
-msgid "ACSONE"
-msgstr "ACSONE"
-
-#: ../../point_of_sale/overview/setup.rst:503
-msgid "Vauxoo"
-msgstr "Vauxoo"
-
-#: ../../point_of_sale/overview/setup.rst:504
-msgid "Ekomurz"
-msgstr "Ekomurz"
-
-#: ../../point_of_sale/overview/setup.rst:505
-msgid "Datalp"
-msgstr "Datalp"
-
-#: ../../point_of_sale/overview/setup.rst:506
-msgid "Dao Systems"
-msgstr "Dao Systems"
-
-#: ../../point_of_sale/overview/setup.rst:507
-msgid "Eggs Solutions"
-msgstr "Eggs Solutions"
-
-#: ../../point_of_sale/overview/setup.rst:508
-msgid "OpusVL"
-msgstr "OpusVL"
-
-#: ../../point_of_sale/overview/setup.rst:510
-msgid ""
-"And also the partners who've backed the development with the Founding POSBox"
-" Bundle:"
-msgstr ""
-"Y también a los socios que han respaldado el desarrollo con la fundación de "
-"la Terminal Bundle:"
-
-#: ../../point_of_sale/overview/setup.rst:513
-msgid "Willow IT"
-msgstr "Willow IT"
-
-#: ../../point_of_sale/overview/setup.rst:514
-msgid "E\\. Akhalwaya & Sons"
-msgstr "E\\. Akhalwaya & Sons"
-
-#: ../../point_of_sale/overview/setup.rst:515
-msgid "Multibase"
-msgstr "Multibase"
-
-#: ../../point_of_sale/overview/setup.rst:516
-msgid "Mindesa"
-msgstr "Mindesa"
-
-#: ../../point_of_sale/overview/setup.rst:517
-msgid "bpso.biz"
-msgstr "bpso.biz"
-
-#: ../../point_of_sale/overview/setup.rst:518
-msgid "Shine IT."
-msgstr "Shine IT."
-
 #: ../../point_of_sale/overview/start.rst:3
 msgid "Getting started with Odoo Point of Sale"
 msgstr "Primeros pasos con el Punto de Venta de Odoo"
@@ -1954,6 +843,12 @@ msgstr ""
 msgid "It's done, you have now closed your first PoS session."
 msgstr ""
 
+#: ../../point_of_sale/overview/start.rst:133
+msgid ""
+"To connect the PoS to hardware with an Odoo IoT Box, please see the section "
+":doc:`../../../iot/connect` and :doc:`../../../iot/pos`"
+msgstr ""
+
 #: ../../point_of_sale/restaurant.rst:3
 msgid "Advanced Restaurant Features"
 msgstr "Características Avanzadas de Restaurantes"
@@ -2019,7 +914,7 @@ msgstr ""
 
 #: ../../point_of_sale/restaurant/kitchen_printing.rst:16
 msgid ""
-"Under the PosBox / Hardware Proxy category, you will find *Order Printers*."
+"Under the IoT Box / Hardware Proxy category, you will find *Order Printers*."
 msgstr ""
 
 #: ../../point_of_sale/restaurant/kitchen_printing.rst:19
@@ -2311,7 +1206,7 @@ msgstr ""
 
 #: ../../point_of_sale/shop/cash_control.rst:24
 msgid ""
-"When clicking on *->Opening/Closing Values* you will be able to create those"
+"When clicking on **Opening/Closing Values** you will be able to create those"
 " values."
 msgstr ""
 
diff --git a/locale/es/LC_MESSAGES/practical.po b/locale/es/LC_MESSAGES/practical.po
index 3fc586237..70b86d710 100644
--- a/locale/es/LC_MESSAGES/practical.po
+++ b/locale/es/LC_MESSAGES/practical.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2015-TODAY, Odoo S.A.
-# This file is distributed under the same license as the Odoo Business package.
+# This file is distributed under the same license as the Odoo package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 10.0\n"
+"Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-07 09:30+0200\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Pablo Rojas <rojaspablo88@gmail.com>, 2017\n"
+"Last-Translator: Pablo Rojas <rojaspablo88@gmail.com>, 2018\n"
 "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/locale/es/LC_MESSAGES/project.po b/locale/es/LC_MESSAGES/project.po
index 870022ee7..8c60cb7a3 100644
--- a/locale/es/LC_MESSAGES/project.po
+++ b/locale/es/LC_MESSAGES/project.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-26 12:01+0200\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Alejandro Kutulas <alk@odoo.com>, 2018\n"
+"Last-Translator: Antonio Trueba, 2018\n"
 "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -197,10 +197,6 @@ msgstr ""
 " clic en el botón de página web en la esquina superior derecha y confirmando"
 " que en el parte delantera de la página web."
 
-#: ../../project/advanced/feedback.rst:111
-msgid ":doc:`claim_issue`"
-msgstr ":doc:`claim_issue`"
-
 #: ../../project/advanced/so_to_task.rst:3
 msgid "How to create tasks from sales orders?"
 msgstr "¿Cómo crear tareas desde órdenes de ventas?"
diff --git a/locale/es/LC_MESSAGES/purchase.po b/locale/es/LC_MESSAGES/purchase.po
index 930c1cd43..baa52c6e9 100644
--- a/locale/es/LC_MESSAGES/purchase.po
+++ b/locale/es/LC_MESSAGES/purchase.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2015-TODAY, Odoo S.A.
-# This file is distributed under the same license as the Odoo Business package.
+# This file is distributed under the same license as the Odoo package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 10.0\n"
+"Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-22 15:27+0100\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Alejandro Kutulas <alk@odoo.com>, 2018\n"
+"Last-Translator: Fairuoz Hussein Naranjo <l92hunaf@gmail.com>, 2018\n"
 "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,433 +22,6 @@ msgstr ""
 msgid "Purchase"
 msgstr "Compra"
 
-#: ../../purchase/overview.rst:3
-#: ../../purchase/replenishment/flows/dropshipping.rst:6
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:6
-#: ../../purchase/replenishment/flows/warning_triggering.rst:6
-#: ../../purchase/replenishment/multicompany/setup.rst:6
-msgid "Overview"
-msgstr "Información general"
-
-#: ../../purchase/overview/process.rst:3
-msgid "Process Overview"
-msgstr "Información general del Proceso"
-
-#: ../../purchase/overview/process/difference.rst:3
-msgid "Request for Quotation, Purchase Tender or Purchase Order?"
-msgstr "¿Solicitud de Cotización, Compra por Licitación u Orden de Compra?"
-
-#: ../../purchase/overview/process/difference.rst:5
-msgid ""
-"Although they are intimately related, Requests for Quotation, Purchase "
-"Tenders and Purchase Orders are not the same."
-msgstr ""
-"A pesar de que están íntimamente relacionados, las solicitudes de "
-"cotización, las ofertas de compra y órdenes de compra no son las mismas."
-
-#: ../../purchase/overview/process/difference.rst:8
-msgid ""
-"A **Request for Quotation** (RfQ) is used when you plan to purchase some "
-"products and you would like to receive a quote for those products. In Odoo, "
-"the Request for Quotation is used to send your list of desired products to "
-"your supplier. Once your supplier has answered your request, you can choose "
-"to go ahead with the offer and purchase or to turn down the offer."
-msgstr ""
-"Una **Solicitud de Cotización** (RFQ) se utiliza cuando se va a comprar "
-"algunos productos y le gustaría recibir un presupuesto para esos productos. "
-"En Odoo, la solicitud de cotización se utiliza para enviar la lista de "
-"productos deseados a su proveedor. Una vez que el proveedor ha respondido a "
-"su solicitud, puede optar por seguir adelante con la oferta y la compra o "
-"para rechazar la oferta."
-
-#: ../../purchase/overview/process/difference.rst:15
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:5
-msgid ""
-"A **Purchase Tender** (PT), also known as Call for Bids, is used to drive "
-"competition between several suppliers in order to get the best offer for a "
-"list of products. In comparison to the RfQ, a Purchase Tender is sent to "
-"multiple suppliers, stating each are competing with one another, and that "
-"the best offer will win. The main interest is that it usually leads to "
-"better offers."
-msgstr ""
-"Una **Propuesta de Compra** (PT), también conocida como Convocatoria, se "
-"utiliza para impulsar la competencia entre varios proveedores con el fin de "
-"obtener la mejor oferta para una lista de productos. En comparación con los "
-"RfQ, una propuesta de compra se envía a múltiples proveedores, indicando si "
-"cada uno compiten entre sí, y cual es la mejor oferta para ganar. El interés"
-" principal, por lo general conduce a mejores ofertas."
-
-#: ../../purchase/overview/process/difference.rst:22
-msgid ""
-"The **Purchase Order** (PO) is the actual order that you place to the "
-"supplier that you chose, either through a RfQ, a Purchase Tender, or simply "
-"when you already know which supplier to order from."
-msgstr ""
-"Las **Órdenes de Compra** (PO) son órdenes actuales que colocan al proveedor"
-" que se haya elegido, ya sea a través de un RfQ, una solicitud de compra o "
-"simplemente cuando usted ya conoce qué proveedor está en la orden."
-
-#: ../../purchase/overview/process/difference.rst:27
-msgid "When to use?"
-msgstr "¿Cuándo utilizar?"
-
-#: ../../purchase/overview/process/difference.rst:29
-msgid ""
-"A **RfQ** is interesting when you have never purchased the products with "
-"that supplier before and therefore don't know their price. It is also useful"
-" if you want to challenge your suppliers once you have a well-established "
-"relationship with them. You can also use it to assess the cost of a project "
-"and see if it makes it feasible."
-msgstr ""
-"Un **RfQ** es interesante cuando usted no ha comprado antes productos con "
-"ese proveedor, y por lo tanto no sabe su precio. También es útil si se "
-"quiere desafiar a sus proveedores una vez que se tenga una relación bien "
-"establecida con ellos. También se puede utilizar para evaluar el costo de un"
-" proyecto y ver si se hace factible."
-
-#: ../../purchase/overview/process/difference.rst:35
-msgid ""
-"A **Purchase Tender** is used for public offers that require an open "
-"offering from several suppliers. It is also useful when you need to make a "
-"one-off order for a product and you would like to get the best offer, no "
-"matter which supplier it is. It may be used when your supplier has not been "
-"up to your standards and you would like to either push them to deliver a "
-"better service, or find a replacement in their competitors."
-msgstr ""
-"Una **Propuesta de Compra** se utiliza para las ofertas públicas que "
-"requieren una oferta abierta de varios proveedores. También es útil cuando "
-"se necesita para hacer una orden de una sola vez para un producto y desea "
-"obtener la mejor oferta, no importa qué proveedor sea. Se puede utilizar "
-"cuando el proveedor no ha llegado hasta sus estándares y le gustaría "
-"empujarlos para ofrecer un mejor servicio, o encontrar un reemplazo en sus "
-"competidores."
-
-#: ../../purchase/overview/process/difference.rst:43
-msgid "When not to use?"
-msgstr "¿Cuándo no utilizar?"
-
-#: ../../purchase/overview/process/difference.rst:45
-msgid ""
-"**RfQ**\\ s become unnecessary once you have established your favorite "
-"supplier for each item, and will only increase the delay in the delivery of "
-"your items. In that case, the process will be simpler by starting straight "
-"from a Purchase Order."
-msgstr ""
-"**RfQ**\\ se vuelven innecesarias una vez que se haya establecido el "
-"proveedor preferido de cada artículo, y sólo aumentará el retraso en la "
-"entrega de sus artículos. En ese caso, el proceso será más sencillo "
-"partiendo directamente de una Orden de Compra."
-
-#: ../../purchase/overview/process/difference.rst:50
-msgid ""
-"**Purchase Tenders** are a long and tedious process that will likely take "
-"more than several weeks in the best cases. If you need a quick delivery, "
-"this is not the way to go. Also, if you have a well-established relationship"
-" with one supplier, think twice before you initiate a PT with them as it "
-"might tear the relationship and finally lead to less interesting deals."
-msgstr ""
-"**Propuestas de compras** son un proceso largo y tedioso que es probable que"
-" tome varias semanas, en el mejor de los casos. Si necesita una entrega "
-"rápida, este no es el camino a seguir. Además, si usted tiene una relación "
-"bien establecida con un proveedor, piense dos veces antes de iniciar un PT "
-"con ellos, ya que podría romper la relación y, finalmente, dar lugar a "
-"ofertas menos interesantes."
-
-#: ../../purchase/overview/process/difference.rst:58
-#: ../../purchase/replenishment/flows/compute_date.rst:139
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:39
-msgid "Example"
-msgstr "Ejemplo"
-
-#: ../../purchase/overview/process/difference.rst:60
-msgid ""
-"My company builds wooden furniture. For the new series of table we are "
-"designing, we need some screws, metal frames and rubber protections."
-msgstr ""
-"Mi empresa construye muebles de madera. Para la nueva serie de mesas que "
-"estamos diseñando, necesitamos algunos tornillos, marcos metálicos y "
-"protecciones de goma."
-
-#: ../../purchase/overview/process/difference.rst:63
-msgid ""
-"I create a Request for Quotation in Odoo with those products to my usual "
-"supplier, and send it by email. He answers back with an offer. However, I am"
-" not convinced by the offer, and I want to see if anyone can give a better "
-"one."
-msgstr ""
-"Puedo crear una Solicitud de Cotización en Odoo con estos productos a mi "
-"proveedor habitual, y enviarlo por correo electrónico. Él responde con una "
-"oferta. Sin embargo, no estoy convencido por la oferta, y quiero ver si "
-"alguien puede dar una mejor."
-
-#: ../../purchase/overview/process/difference.rst:68
-msgid ""
-"I decide to push competition a bit and set up a Purchase Tender, that Odoo "
-"will send to a list of suppliers I specified. Out of the 8 offers I receive,"
-" one gets my attention and I decide to go ahead with that one."
-msgstr ""
-"Decido empujar la competencia un poco y configurar una Propuesta de Compras,"
-" que Odoo enviará a una lista de proveedores con las características "
-"especificas. De las 8 ofertas que recibo, uno tiene mi atención y decide "
-"seguir adelante con eso."
-
-#: ../../purchase/overview/process/difference.rst:72
-msgid ""
-"I confirm the order to the supplier by creating a Purchase Order from the "
-"PT, and Odoo automatically asks delivery of the items to the supplier."
-msgstr ""
-"Confirmo el pedido al proveedor mediante la creación de una Orden de Compra "
-"del PT, y me pregunta Odoo automáticamente la entrega de los artículos con "
-"el proveedor."
-
-#: ../../purchase/overview/process/difference.rst:77
-#: ../../purchase/purchases/master/suppliers.rst:16
-#: ../../purchase/purchases/master/uom.rst:22
-#: ../../purchase/purchases/rfq/3_way_matching.rst:18
-#: ../../purchase/purchases/rfq/analyze.rst:24
-#: ../../purchase/purchases/rfq/bills.rst:31
-#: ../../purchase/purchases/rfq/create.rst:16
-#: ../../purchase/purchases/rfq/reception.rst:14
-#: ../../purchase/purchases/tender/partial_purchase.rst:14
-#: ../../purchase/replenishment/flows/dropshipping.rst:13
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:58
-#: ../../purchase/replenishment/flows/warning_triggering.rst:21
-msgid "Configuration"
-msgstr "Configuración"
-
-#: ../../purchase/overview/process/difference.rst:79
-msgid ""
-"If you want to know how to create a **Purchase Order**, read the "
-"documentation on :doc:`from_po_to_invoice`"
-msgstr ""
-"Si desea conocer acerca de cómo crear una **Orden de Compra**, lea el "
-"documento :doc:`from_po_to_invoice`"
-
-#: ../../purchase/overview/process/difference.rst:82
-msgid ""
-"If you want to know how to create a **RfQ**, read the documentation on "
-":doc:`../../purchases/rfq/create`"
-msgstr ""
-"Si desea conocer acerca de cómo crear un **RfQ**, lea el documento "
-":doc:`../purchases/rfq/create`"
-
-#: ../../purchase/overview/process/difference.rst:85
-msgid ""
-"If you want to know how to create a **Purchase Tender**, read the "
-"documentation on :doc:`../../purchases/tender/manage_multiple_offers`"
-msgstr ""
-"Si desea conocer acerca de cómo crear una **Propuesta de Compra**, lea el "
-"documento :doc:`../purchases/tender/manage_multiple_offers`"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:3
-msgid "From purchase order to invoice and receptions"
-msgstr "De Orden de Compra a Factura y Recepciones"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:5
-msgid ""
-"For most of your everyday purchases, chances are you already know where to "
-"purchase and at what price. For these cases, a simple Purchase Order (PO) "
-"will allow you to handle the whole process."
-msgstr ""
-"Para la mayoría de sus compras diarias, lo más probable es que ya sabes "
-"dónde comprar y a qué precio. Para estos casos, una Orden de Compra sencilla"
-" (PO) le permitirá manejar todo el proceso."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:9
-msgid ""
-"In Odoo, a purchase order can be created as is, but can also be the result "
-"of a Request for Quotation or of a Purchase Tender. Therefore, every "
-"purchase made in Odoo has a PO."
-msgstr ""
-" En Odoo, la orden de compra puede creada como es, pero también puede ser "
-"resultado de una Solicitud de Cotización o Licitaciones. Por lo tanto, cada "
-"compra hecha con Odoo tiene una Orden de Compra."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:13
-msgid ""
-"The PO will generate an invoice, and depending on the contract with your "
-"supplier, you will be required to pay the invoice before or after delivery."
-msgstr ""
-"La Orden de Compra generará una factura, y dependiendo del contrato con el "
-"proveedor, usted tendrá que pagar la factura antes o después del envío. "
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:18
-msgid "Install the Purchase Management application"
-msgstr "Instale el módulo de Gestión de Compras"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:20
-msgid ""
-"From the **Apps** application, search and install the **Purchase "
-"Management** application."
-msgstr ""
-"Desde el módulo de **Aplicaciones**, buscar e instalar el módulo de "
-"**Gestión de Compras**."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:27
-msgid "Creating a Purchase Order"
-msgstr "Creando un Pedido de Compra"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:29
-msgid ""
-"In the **Purchases** app, open the **Purchase** menu and click on **Purchase"
-" Orders**."
-msgstr ""
-"En el módulo de **Compras**, abrir el menú de **Compras** y hacer clic en "
-"**Órdenes de Compras**."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:32
-msgid "In the **Purchase Orders** window, click on **Create**."
-msgstr "En la ventana de las **Órdenes de Compras**, hacer clic en **Crear**."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:37
-msgid ""
-"From the new window, insert the **Vendor** and type in the **Order Date**."
-msgstr ""
-"Desde la nueva ventana, insertar un **Proveedor** y el tipo en la **Fecha de"
-" Orden**."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:40
-msgid "In the **Products** section, click on **Add an item**."
-msgstr ""
-"En la sección de **Productos**, hacer clic en **Agregar un elemento**."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:45
-msgid "Select your product from the list and add a description if necessary."
-msgstr ""
-"Seleccionar el productos desde la lista y añadir la descripción si es "
-"necesaria."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:47
-msgid "The **Scheduled Date** menu corresponds to the expected delivery date."
-msgstr "El menú **Programar Citas** corresponde a las citas previstas."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:49
-msgid ""
-"Type in the quantity which you wish to purchase, then click on **Save** and "
-"on **Confirm Order**."
-msgstr ""
-"El tipo de cantidad que se desea para la compra, después hacer clic en "
-"**Guardar** y en **Confirmar la Orden**."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:53
-msgid ""
-"If you wish to go through the complete flow and create a **Request for "
-"Quotation** for this order, refer to the document on "
-":doc:`../../purchases/rfq/create`"
-msgstr ""
-"Si desea pasar por el flujo completo y crear una **Solicitud de Cotización**"
-" para este fin, vaya a la documentación en :doc:`../../purchases/rfq/create`"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:57
-msgid ""
-"As you can see, the status of the PO has switched to ``Purchase Order``."
-msgstr ""
-"Como puede ver, el estatus de la PO ha cambiado a ``Orden de Compra``."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:63
-msgid "Registering invoice, payments and receiving products"
-msgstr "Registrar las facturas, pagos y recibos de productos"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:65
-msgid ""
-"Depending on the contract you have with your supplier, you can either pay "
-"for the purchase upon delivery of the goods, or get the goods delivered "
-"after payment."
-msgstr ""
-"Dependiendo del contrato que tiene con su proveedor, usted puede pagar ya "
-"sea a la entrega de las mercancías, o hasta que los bienes sean entregados "
-"después del pago."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:70
-msgid "Payment upon or after reception"
-msgstr "Pagar a la recepción o después de ella"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:72
-msgid "Still from your purchase order, click on **Receive Products**."
-msgstr "Aún desde su orden de compra, haga clic en **Recibir Productos**."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:74
-msgid ""
-"In the next page, check that the number of products received corresponds to "
-"the number ordered, then manually enter the delivered quantity and click on "
-"**Validate**."
-msgstr ""
-"En la página siguiente, revisar que el número de productos recibidos "
-"corresponda con el número ordenado, a continuación introduzca manualmente la"
-" cantidad entregada y haga clic en **Validar**."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:81
-msgid ""
-"Go back to the PO. In the PO, a **Shipment** and an **Invoice** button have "
-"appeared."
-msgstr ""
-"Regresando a la PO. En la Orden de Compra, en **Envío** y en el botón de "
-"**Factura** que aparece. "
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:87
-msgid ""
-"Click on the **Invoices** button, then click on **Validate**. The invoice is"
-" now registered in the system. Click on **Register Payment**, insert the "
-"detail of the payment, and click on **Validate**."
-msgstr ""
-"Haga clic en el botón de **Facturas**, después hacer clic en **Validar**. La"
-" factura ahora está registrada en el sistema. Haga clic en **Registro de "
-"Pago**, inserte el detalle de pago, y haga clic en **Validar**."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:94
-#: ../../purchase/overview/process/from_po_to_invoice.rst:124
-msgid ""
-"Your products are now ready for picking and storage, and the invoice is "
-"marked as paid."
-msgstr ""
-"Sus productos están listos para la recolección y el almacenamiento, y la "
-"factura es marcada como pagada."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:98
-msgid "Upfront payment"
-msgstr "Pago por adelantado"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:100
-msgid ""
-"From the **Purchase Order** page, open the **Invoices** tab, then click on "
-"**Create**."
-msgstr ""
-"Desde la página de **Orden de Compra**, abra la tabla de **Facturas**, "
-"después de clic en **Crear**."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:103
-msgid ""
-"In the next page, click on **Validate**. The invoice is now registered in "
-"the system. Click on **Register Payment**, insert the detail of the payment,"
-" and click on **Validate**."
-msgstr ""
-"En la siguiente página, de clic en **Validar**. Las facturas ahora están "
-"registradas en el sistema. Hacer clic en **Registro de Pagos**, inserte el "
-"detalle de los pagos, y haga clic en **Validar**."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:110
-msgid ""
-"Go back to the PO. In the PO, a **Shipment** tab and an **Invoice** tab have"
-" appeared."
-msgstr ""
-"Vaya a la PO. En la Orden de Compra, en la tabla de **Envíos** y en la tabla"
-" de **Facturas** aparecerá."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:116
-msgid ""
-"Click on **Receive Products**, then in the new page, click on **Validate**."
-msgstr ""
-"Haga clic en **Productos Recibidos**, después en la nueva página, haga clic "
-"en **Validar**."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:121
-msgid ""
-"A window will appear, asking if you wish to process every item at once. "
-"Click on **Apply**."
-msgstr ""
-"Una ventana aparecerá, preguntando si desea procesar cada artículo a la vez."
-" Clic en **Aplicar**."
-
 #: ../../purchase/purchases.rst:3
 msgid "Purchases"
 msgstr "Compras"
@@ -458,469 +31,92 @@ msgid "Master Data"
 msgstr "Datos principales"
 
 #: ../../purchase/purchases/master/import.rst:3
-msgid "How to import supplier pricelists?"
-msgstr "¿Cómo importar la lista de precios de clientes?"
+msgid "Import vendors pricelists"
+msgstr ""
 
-#: ../../purchase/purchases/master/import.rst:6
-msgid "Introduction"
-msgstr "Introducción"
-
-#: ../../purchase/purchases/master/import.rst:8
+#: ../../purchase/purchases/master/import.rst:5
 msgid ""
-"Big companies use to import supplier pricelists day to day. Indeed, prices "
-"are always changing and you need to get price up to date to deal with a high"
-" number of products."
+"It is key for companies to be able to import vendors pricelists to stay up "
+"to date on products pricing."
 msgstr ""
-"Las grandes empresas utilizan para importar listas de precios de proveedores"
-" día a día. De hecho, los precios siempre están cambiando y lo que necesita "
-"para conseguir precio al día para hacer frente a un gran número de "
-"productos."
 
-#: ../../purchase/purchases/master/import.rst:12
+#: ../../purchase/purchases/master/import.rst:9
+#: ../../purchase/purchases/master/uom.rst:22
+#: ../../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/create.rst:13
+#: ../../purchase/purchases/rfq/lock_orders.rst:9
+#: ../../purchase/purchases/rfq/reception.rst:14
+#: ../../purchase/purchases/rfq/warning.rst:14
+#: ../../purchase/purchases/tender/blanket_orders.rst:10
+#: ../../purchase/purchases/tender/call_for_tender.rst:9
+#: ../../purchase/replenishment/flows/dropshipping.rst:13
+msgid "Configuration"
+msgstr "Configuración"
+
+#: ../../purchase/purchases/master/import.rst:11
 msgid ""
-"To manage supplier prices on product form, read this document "
-"(:doc:`suppliers`). Here we will show you how to import customer prices."
+"For this feature to work, go to :menuselection:`Purchases --> Configuration "
+"--> Settings` and tick the box in front of \"Vendor Pricelists\"."
 msgstr ""
-"Para gestionar los precios de proveedores en forma de productos, es "
-"necesario leer el documento (:doc:`suppliers`). En el se mostrará la manera "
-"de importar precios de los clientes. "
 
-#: ../../purchase/purchases/master/import.rst:16
-msgid "Required configuration"
-msgstr "Configuración requerida"
-
-#: ../../purchase/purchases/master/import.rst:18
-msgid "In purchase settings, you have 2 options:"
-msgstr "En la configuración de compra, tiene 2 opciones:"
-
-#: ../../purchase/purchases/master/import.rst:20
-msgid "Manage vendor price on the product form"
-msgstr "Administrar el precio proveedor en el formulario de producto"
-
-#: ../../purchase/purchases/master/import.rst:22
-msgid "Allow using and importing vendor pricelists"
-msgstr "Permitir usar e importar tarifas de proveedor"
-
-#: ../../purchase/purchases/master/import.rst:24
-msgid "Here we are selecting: **Allow using and importing vendor pricelists**"
+#: ../../purchase/purchases/master/import.rst:15
+msgid "Don't forget to save your settings in the top left corner."
 msgstr ""
-"Aquí estamos seleccionando: **Permitir usar e importar la lista de precios "
-"de vendedor**"
 
-#: ../../purchase/purchases/master/import.rst:30
-msgid "Import vendor pricelists"
-msgstr "Importar la lista de precios de vendedor"
+#: ../../purchase/purchases/master/import.rst:21
+msgid "Import a pricelist"
+msgstr ""
 
-#: ../../purchase/purchases/master/import.rst:32
+#: ../../purchase/purchases/master/import.rst:23
+msgid "To import go to :menuselection:`Purchase --> Vendor Pricelists`"
+msgstr ""
+
+#: ../../purchase/purchases/master/import.rst:25
 msgid ""
-"There are 2 scenarios: import the vendor pricelist for the first time, or "
-"update an existing vendor pricelist. In both scenarios, we assume your "
-"product list and vendor list is updated and you want to import the price "
-"list of vendors for a given product."
+"Load your file, then you can check if everything is correct before clicking "
+"import."
 msgstr ""
-"Hay 2 escenarios: importar la lista de precios del proveedor, por primera "
-"vez, o actualizar una lista de precios de proveedor ya existente. En ambos "
-"escenarios, se supone que su lista de productos y lista de proveedores se "
-"actualiza y que desea importar la lista de precios de los proveedores para "
-"un producto determinado."
 
-#: ../../purchase/purchases/master/import.rst:40
+#: ../../purchase/purchases/master/import.rst:28
+msgid "See below a template of the columns used."
+msgstr ""
+
+#: ../../purchase/purchases/master/import.rst:33
 msgid ""
-"To import a list from a document, the best pratice is to export first to get"
-" an example of data formating and a proper header to reimport."
+"`Template download "
+"<https://docs.google.com/spreadsheets/d/1N8c_eejLV_8NhYMGCfZau_oGCnRkUIT9nwdX7n0shhY/edit#gid=964193981>`__"
 msgstr ""
-"Para importar una lista de un documento, la mejor práctica es exportar "
-"primero para obtener un ejemplo de formato de datos y una cabecera adecuada "
-"para volver a importar."
-
-#: ../../purchase/purchases/master/import.rst:50
-msgid "Import the list for the first time"
-msgstr "Importar la lista por primera vez"
-
-#: ../../purchase/purchases/master/import.rst:53
-msgid "Prepare the document"
-msgstr "Preparar el documento"
-
-#: ../../purchase/purchases/master/import.rst:55
-msgid ""
-"In :menuselection:`Purchase --> Purchase --> Supplier Pricelists`, export a "
-"template of document to get import/export compatible and get the right "
-"format to import in mass. Create manually a data and export it "
-"(:menuselection:`select --> Action --> Export`)"
-msgstr ""
-"En :menuselection:`Compras --> Compras --> Precios de proveedores`, exportar"
-" una plantilla de documento para obtener compatibles de "
-"importación/exportación y obtener el formato adecuado para importar en masa."
-" Crear manualmente una de datos y exportarla (:menuselection:`seleccionar "
-"--> Acción --> Exportar`)"
-
-#: ../../purchase/purchases/master/import.rst:63
-msgid "Here is the list of fields you can import:"
-msgstr "Aquí está la lista de campos que puede importar:"
-
-#: ../../purchase/purchases/master/import.rst:66
-msgid "**Header of the document to import (csv, xls)**"
-msgstr "**Cabecera del documento a importar (csv, xls)**"
-
-#: ../../purchase/purchases/master/import.rst:66
-msgid "**Meaning and how to get it**"
-msgstr "**Significado y cómo obtenerlo**"
-
-#: ../../purchase/purchases/master/import.rst:66
-msgid "**Example**"
-msgstr "**Ejemplo**"
-
-#: ../../purchase/purchases/master/import.rst:68
-msgid "name_id"
-msgstr "name_id"
-
-#: ../../purchase/purchases/master/import.rst:68
-msgid "Vendor ID -> export supplier list to get it"
-msgstr ""
-"Identificación del Vendedor -> exportar lista de proveedores para conseguir"
-
-#: ../../purchase/purchases/master/import.rst:68
-msgid "\\_\\_export\\_\\_.res\\_partner\\_12"
-msgstr "\\_\\_export\\_\\_.res\\_partner\\_12"
-
-#: ../../purchase/purchases/master/import.rst:70
-msgid "product_code"
-msgstr "product_code"
-
-#: ../../purchase/purchases/master/import.rst:70
-msgid "Vendor product Code -> free text"
-msgstr "Código de producto del Proveedor -> texto libre"
-
-#: ../../purchase/purchases/master/import.rst:70
-msgid "569874"
-msgstr "569874"
-
-#: ../../purchase/purchases/master/import.rst:72
-msgid "price"
-msgstr "Precio"
-
-#: ../../purchase/purchases/master/import.rst:72
-msgid "Vendor Price -> free text"
-msgstr "Precio de Proveedor -> texto libre"
-
-#: ../../purchase/purchases/master/import.rst:72
-msgid "1500"
-msgstr "1500"
-
-#: ../../purchase/purchases/master/import.rst:74
-msgid "product_tmpl_id.id"
-msgstr "product_tmpl_id.id"
-
-#: ../../purchase/purchases/master/import.rst:74
-msgid "Product Template ID -> export you product list to get it"
-msgstr ""
-"Plantilla de Identificador de Productos -> exportar lista de proveedores "
-"para conseguir"
-
-#: ../../purchase/purchases/master/import.rst:74
-msgid "\\_\\_export\\_\\_.product_template_13"
-msgstr "\\_\\_export\\_\\_.product_template_13"
-
-#: ../../purchase/purchases/master/import.rst:76
-msgid "currency_id.id"
-msgstr "currency_id.id"
-
-#: ../../purchase/purchases/master/import.rst:76
-msgid "Currency -> to get it export the currency list"
-msgstr "Moneda -> exportar lista de monedas a conseguir"
-
-#: ../../purchase/purchases/master/import.rst:78
-msgid "date_end"
-msgstr "date_end"
-
-#: ../../purchase/purchases/master/import.rst:78
-msgid "End date of the price validity"
-msgstr "Fecha fin de la validez del precio"
-
-#: ../../purchase/purchases/master/import.rst:78
-msgid "2015-10-22"
-msgstr "22-10-2015"
-
-#: ../../purchase/purchases/master/import.rst:80
-msgid "min_qty"
-msgstr "min_qty"
-
-#: ../../purchase/purchases/master/import.rst:80
-msgid "Minimal quantity to purchase from this vendor"
-msgstr "Cantidad mínima para la compra de este proveedor"
-
-#: ../../purchase/purchases/master/import.rst:80
-msgid "2"
-msgstr "2"
-
-#: ../../purchase/purchases/master/import.rst:82
-msgid "product_id.id"
-msgstr "product_id.id"
-
-#: ../../purchase/purchases/master/import.rst:82
-msgid "Product Variante name -> export your variant list to get it"
-msgstr ""
-"Nombre de la Variante del Producto -> exportar la lista de variantes a "
-"conseguir"
-
-#: ../../purchase/purchases/master/import.rst:82
-msgid "\\_\\_export\\_\\_.product\\_13"
-msgstr "\\_\\_export\\_\\_.product\\_13"
-
-#: ../../purchase/purchases/master/import.rst:84
-msgid "date_start"
-msgstr "date_start"
-
-#: ../../purchase/purchases/master/import.rst:84
-msgid "Start date of price validity"
-msgstr "Fecha inicio de la validez del precio"
-
-#: ../../purchase/purchases/master/import.rst:84
-msgid "2015-12-31"
-msgstr "31-12-2015"
-
-#: ../../purchase/purchases/master/import.rst:87
-msgid "You obtain a document which can be imported, fill in your vendor pices"
-msgstr ""
-"Usted obtendrá un documento el cual podrá importar, lo puede encontrar en "
-"los precios de proveedores"
-
-#: ../../purchase/purchases/master/import.rst:92
-msgid ""
-"Import this document in Odoo. Click on **Import** in the list view and "
-"upload your document. You can validate and check error. Once the system "
-"tells you everything is ok, you can import the list."
-msgstr ""
-"Para importar este documento en Odoo. Haga clic en la lista de **Importar** "
-"de la vista y añada el documento. Usted puede validar y corregir los "
-"errores. Una vez realizado el sistema le informa que todo esta bien, usted "
-"podrá importar la lista. "
-
-#: ../../purchase/purchases/master/import.rst:102
-msgid ""
-"After the import, the **Vendors** section in **Inventory** tab of the "
-"product form is filled in."
-msgstr ""
-"Después de importar, en la sección de **Proveedores** en el **Inventario** "
-"vaya a la tabla de formulario de productos para seleccionarla. "
-
-#: ../../purchase/purchases/master/import.rst:106
-msgid "Update the vendor pricelist"
-msgstr "Actualizar la lista de precios de vendedor"
-
-#: ../../purchase/purchases/master/import.rst:108
-msgid ""
-"When the pricelist of your suppliers change, it is necessary to update "
-"existing prices."
-msgstr ""
-"Cuando la lista de precios de sus proveedores cambie, es necesario "
-"actualizar los precios existentes. "
-
-#: ../../purchase/purchases/master/import.rst:111
-msgid ""
-"Follow the procedure of the first scenario in order to export existing data "
-"from :menuselection:`Purchases --> Purchase --> Vendor Pricelist`. Select "
-"everything, and export from the **Action** menu."
-msgstr ""
-"Siga el procedimiento de le primer escenario en orden para exportar la base "
-"de datos existente desde el :menuselection:`Compras --> Compras --> Precios "
-"de lista de Proveedores`. Seleccione todo, y después en exportar desde el "
-"menú **Acción**."
-
-#: ../../purchase/purchases/master/import.rst:115
-msgid ""
-"Change price, end date, add a line, change a supplier, ... and then reimport"
-" in Odoo. Thanks to the ID, the list will be updated. Either the id is "
-"recognized and the line is updated or the ID is not known by Odoo and it "
-"will create a new pricelist line."
-msgstr ""
-"Cambie el precio, la fecha final, añada líneas, cambie de proveedor, ... y "
-"después vuelva a reimportar en Odoo. Gracias a la Identificación, la lista "
-"se volverá a actualizar. O bien la identificación es reconocida y la línea "
-"se actualiza o la identificación no es conocida por Odoo y se creará una "
-"nueva línea listado de precios. "
-
-#: ../../purchase/purchases/master/import.rst:120
-msgid ""
-"After the import, the **Vendors** section in **Inventory** tab of the "
-"product form is updated."
-msgstr ""
-"Después de importar, en la sección de **Proveedores** en **Inventario** en "
-"la tabla del formulario de productos será la actualización. "
 
 #: ../../purchase/purchases/master/suppliers.rst:3
-msgid "How to set several suppliers on a product?"
-msgstr "¿Cómo agregar varios proveedores en un producto?"
+msgid "Set multiple vendors on a product"
+msgstr ""
 
 #: ../../purchase/purchases/master/suppliers.rst:5
 msgid ""
-"Keeping track of your vendors can be a real burden in day-to-day business "
-"life. Prices can change and you might have several suppliers for one "
-"product. With Odoo you have the possibility to directly link vendors with "
-"the corresponding product and specify prices automatically the first time "
-"you purchase them."
+"If you find yourself with the need to buy from multiple vendors for one "
+"product, Odoo can let you directly link them with a single product."
+msgstr ""
+
+#: ../../purchase/purchases/master/suppliers.rst:9
+msgid "Add vendors in a product"
 msgstr ""
-"Hacer un seguimiento de los proveedores puede ser una carga real en la vida "
-"empresarial del día a día. Los precios pueden cambiar y es posible que tenga"
-" varios proveedores para un producto. Con Odoo usted tiene la posibilidad de"
-" vincular directamente los proveedores con el producto correspondiente y "
-"especifique los precios automáticamente la primera vez que los compre."
 
 #: ../../purchase/purchases/master/suppliers.rst:11
 msgid ""
-"We will take the following example: We need to buy ``5 t-shirts``. We found "
-"a **Vendor**; called ``Bob&Jerry's`` and we want to issue a request for "
-"quotation."
+"To use this feature, go to :menuselection:`Purchases --> Products`, then "
+"select a product."
 msgstr ""
-"Vamos a tomar el siguiente ejemplo: Necesitamos comprar ``5 t-shirts``. "
-"Encontramos un **Proveedor**; su nombre es ``Bob & Jerry's`` y queremos "
-"emitir una solicitud de cotización."
 
-#: ../../purchase/purchases/master/suppliers.rst:19
-msgid "Install the purchase module"
-msgstr "Instalación del módulo de compras"
-
-#: ../../purchase/purchases/master/suppliers.rst:21
+#: ../../purchase/purchases/master/suppliers.rst:14
 msgid ""
-"The first step to set your suppliers on your products is to install the "
-"purchase module. Go into your **App** module and install the **Purchase** "
-"module."
+"From there you can add existing vendors to your product or create a new one "
+"on the fly."
 msgstr ""
-"El primer paso para configurar los proveedores en los productos es instalar "
-"el módulo de compras. Vaya al módulo de **Aplicaciones** e instale el módulo"
-" de **Compras**."
 
-#: ../../purchase/purchases/master/suppliers.rst:29
-msgid ""
-"By installing the purchase module, the inventory and invoicing module will "
-"be installed as well."
-msgstr ""
-"Después de instalar el módulo de compras, los módulos de inventario y de "
-"facturación se instalarán también."
-
-#: ../../purchase/purchases/master/suppliers.rst:33
-msgid "Create a Vendor"
-msgstr "Crear un Proveedor"
-
-#: ../../purchase/purchases/master/suppliers.rst:35
-msgid ""
-"The second step is to create a vendor. In this case we'll create the vendor "
-"``Bob&Jerry's``. Enter the purchase module, select :menuselection:`Purchase "
-"--> Vendors` and create a new vendor."
-msgstr ""
-"El segundo paso es crear un proveedor. En este caso crearemos el proveedor "
-"``Bob&Jerry's``. Al entrar al módulo de compras, seleccione "
-":menuselection:`Compras --> Proveedores` y crear un nuevo proveedor."
-
-#: ../../purchase/purchases/master/suppliers.rst:39
-msgid ""
-"You can choose if the contact is a company or a person, fill in basic "
-"information such as address, phone, email,..."
-msgstr ""
-"Usted puede elegir si el contacto es como compañía o una persona, llenar la "
-"información básica como dirección, teléfono, correo electrónico,..."
-
-#: ../../purchase/purchases/master/suppliers.rst:42
-msgid ""
-"If you did not create the contact from the purchase module you will need to "
-"go in the **Sales and Purchases** tab as well and indicate that the contact "
-"is a **Vendor** (see picture below). If the contact is created from the "
-"purchase module this box will be ticked automatically."
-msgstr ""
-"Si usted no ha creado el contacto desde el módulo de compras, tendrá que ir "
-"a la sección de **Ventas y Compras** también e indicar si el contacto es un "
-"**Proveedor** (ver la imagen de abajo). Si el contacto fue creado desde el "
-"módulo de compras este apartado se marcará automáticamente."
-
-#: ../../purchase/purchases/master/suppliers.rst:51
-msgid "Create a product"
-msgstr "Crear un producto"
-
-#: ../../purchase/purchases/master/suppliers.rst:53
-msgid ""
-"Next we can create the product we want to buy. We don't know the price of "
-"the t-shirt yet because we still need to issue our **Request for "
-"Quotation**."
-msgstr ""
-"Después podemos crear el producto que deseemos comprar. Nosotros no sabes el"
-" precio de la playera todavía, porque para es tenemos que emitir su "
-"**Solicitud de Cotización**."
-
-#: ../../purchase/purchases/master/suppliers.rst:57
-msgid ""
-"To create a product enter your purchase module select "
-":menuselection:`Purchase --> Products` and create a new product."
-msgstr ""
-"Para crear un producto entre al módulo de compras seleccione "
-":menuselection:`Compras --> Productos` y crea el nuevo producto."
-
-#: ../../purchase/purchases/master/suppliers.rst:60
-msgid ""
-"We will call our product ``T-shirt`` and specify that the product can be "
-"sold and purchased."
-msgstr ""
-"Podemos nombrar nuestro producto ``Playera`` y especificar que el producto "
-"puede ser vendido y comprado. "
-
-#: ../../purchase/purchases/master/suppliers.rst:67
-msgid "Add Vendors to the product"
-msgstr "Añadir Proveedores a los productos"
-
-#: ../../purchase/purchases/master/suppliers.rst:69
-msgid ""
-"The next action is to add vendors to the product. There are two ways to "
-"handle this. If you issue a purchase order for the first time Odoo will "
-"automatically link the vendor and its price to the product. You can also add"
-" vendors manually"
-msgstr ""
-"La siguiente acción es agregar proveedores al producto. Hay dos maneras de "
-"manejar esto. Si emite una orden de compra por primera vez, Odoo enlazará "
-"automáticamente el proveedor y el precio al producto. También se puede "
-"agregar manualmente a los proveedores."
-
-#: ../../purchase/purchases/master/suppliers.rst:75
-msgid "By issuing a first Purchase Order to new vendor"
-msgstr ""
-"Mediante la emisión de una primera orden de compra para el nuevo proveedor"
-
-#: ../../purchase/purchases/master/suppliers.rst:77
-msgid ""
-"When issuing a purchase order for the first time to a vendor, he will "
-"automatically be linked to the product by Odoo. For our example let's say "
-"that we issue a first purchase order to ``Bob&Jerry's`` for ``5 t-shirts`` "
-"at ``12.35 euros / piece``."
-msgstr ""
-"Cuando se ha emitido la orden de compra por primera vez al proveedor, la "
-"cual será automáticamente vinculada al producto por Odoo. Por ejemplo, "
-"digamos que emitimos una primera orden de compra a ``Bob&Jerry's`` por ``5 "
-"playeras`` a ``12.35 euros por pieza``."
-
-#: ../../purchase/purchases/master/suppliers.rst:82
-msgid ""
-"First create your purchase order with the correct product and supplier (see "
-"picture below, or the documentation page :doc:`../rfq/create` for more "
-"information)"
-msgstr ""
-"Primero, al crear su orden de compra con el producto y proveedor correcto "
-"(ver la imagen de abajo, o ir a la página de documentación "
-":doc:`../rfq/create` para más información)"
-
-#: ../../purchase/purchases/master/suppliers.rst:89
-msgid ""
-"When we save and validate the purchase order the vendor will automatically "
-"be added to the product's vendors list. To check this enter the purchase "
-"module, select :menuselection:`Purchase --> Products` and select our T-shirt"
-" product. By opening the **Inventory** tab we notice that our vendor and its"
-" price has automatically been added."
-msgstr ""
-"Cuando guardamos y validamos la orden de compra al proveedor se agregará "
-"automáticamente a la lista de los proveedores del producto. Para comprobar "
-"esto entre en el módulo de compras y seleccione :menuselection:`Compras --> "
-"Productos` y seleccione nuestro producto playera. Al abrir la pestaña de "
-"**Inventario** nos damos cuenta de que nuestro proveedor y su precio de "
-"forma automática se ha añadido."
-
-#: ../../purchase/purchases/master/suppliers.rst:98
+#: ../../purchase/purchases/master/suppliers.rst:17
 msgid ""
 "Note that every first time the product is purchased from a new vendor, Odoo "
 "will automatically link the contact and price with the product."
@@ -929,37 +125,26 @@ msgstr ""
 "proveedor nuevo, Odoo enlazará automáticamente el contacto y el precio con "
 "el producto."
 
-#: ../../purchase/purchases/master/suppliers.rst:103
-msgid "By adding manually"
-msgstr "Al añadir manualmente"
-
-#: ../../purchase/purchases/master/suppliers.rst:105
-msgid ""
-"We can of course also add vendors and vendors information manually. On the "
-"same page than previously, simply click on **Edit** and click the **Add an "
-"item** button."
+#: ../../purchase/purchases/master/suppliers.rst:24
+msgid "Add price & quantity as well as a validity period"
 msgstr ""
-"Podemos, por supuesto, agregar la información de los proveedores de manera "
-"manual. Desde la misma página que antes, simplemente haga clic en **Editar**"
-" y haga clic en el botón **Agregar un elemento**."
 
-#: ../../purchase/purchases/master/suppliers.rst:112
+#: ../../purchase/purchases/master/suppliers.rst:26
 msgid ""
-"When adding a new **Vendor** you are also able to add extra information such"
-" as the vendor product name or code, the validity of the price and the "
-"eventual minimum quantity required. These informations can be added and "
-"modified for existing vendors by simply clicking on the vendors line."
+"When you're adding a vendor to a product, you're able to add the vendor "
+"product name & code as well as set the minimal quantity, price and validity "
+"period."
+msgstr ""
+
+#: ../../purchase/purchases/master/suppliers.rst:34
+msgid ""
+"This Odoo feature also works with variants of your products, such as one "
+"t-shirt in different sizes!"
 msgstr ""
-"Cuando agregamos un nuevo **Proveedor**, también se debe de agregar un poco "
-"de información extra como es el nombre del proveedor del producto o el "
-"código, la validación del precio y la cantidad mínima requerida "
-"eventualmente. Estas informaciones se pueden agregar y modificar para los "
-"proveedores existentes simplemente haciendo clic en la línea de los "
-"proveedores."
 
 #: ../../purchase/purchases/master/uom.rst:3
-msgid "How to purchase in different unit of measures than sales?"
-msgstr "¿Cómo comprar en diferentes unidades de medidas que las ventas?"
+msgid "Purchase in different unit of measures than sales"
+msgstr ""
 
 #: ../../purchase/purchases/master/uom.rst:5
 msgid ""
@@ -1202,96 +387,65 @@ msgstr ""
 "**rollo** como Unidad de Medida Adquirida en la forma del producto. "
 
 #: ../../purchase/purchases/rfq.rst:3
-msgid "Request for Quotations"
-msgstr "Solicitud de Cotización"
+msgid "Request for Quotation and Purchase Orders"
+msgstr ""
 
 #: ../../purchase/purchases/rfq/3_way_matching.rst:3
-msgid "How to determine if a vendor bill should be paid (3-way matching)"
+msgid "Determine when to pay a vendor bill with 3-way matching"
 msgstr ""
-"Como determinar si la factura de un vendedor debe ser pagada (matching de 3 "
-"maneras)"
 
 #: ../../purchase/purchases/rfq/3_way_matching.rst:5
 msgid ""
 "In some industries, you may receive a bill from a vendor before receiving "
-"the ordered products. However, the bill should maybe not be paid until the "
-"products have actually been received."
+"the ordered products. However, you might not want to pay it until the "
+"products have been received."
 msgstr ""
-"En algunas industrias, puedes recibir una factura de un vendedor antes de "
-"recibir los productos ordenados. Sin embargo, la factura puede que no sea "
-"pagada hasta que los productos sean recibidos."
 
 #: ../../purchase/purchases/rfq/3_way_matching.rst:9
 msgid ""
-"To define whether the vendor bill should be paid or not, you can use what is"
-" called the **3-way matching**. It refers to the comparison of the "
-"information appearing on the Purchase Order, the Vendor Bill and the "
-"Receipt."
+"To define whether the vendor bill should be paid or not, you can use what we"
+" call *3-way matching*. It refers to the comparaison of the information "
+"appearing on the *Purchase Order*, the *Vendor Bill* and the *Receipt*."
 msgstr ""
-"Para definir si la factura del vendedor debe ser pagada o no, puedes usar lo"
-" que se llama la **3-way matching**. Se refiere a la comparación de la "
-"información que aparece en la orden de compra, la factura del vendedor y el "
-"recibo. "
 
 #: ../../purchase/purchases/rfq/3_way_matching.rst:14
 msgid ""
-"The 3-way matching helps you to avoid paying incorrect or fraudulent vendor "
+"The 3-way matching helps you avoid paying incorrect or fraudulent vendor "
 "bills."
 msgstr ""
-"La 3-way matching te ayuda a evitar pagar facturas incorrectas o vendedores "
-"fraudulentos"
 
 #: ../../purchase/purchases/rfq/3_way_matching.rst:20
 msgid ""
-"Go in :menuselection:`Purchase --> Configuration --> Settings` and activate "
-"the 3-way matching."
+"For this feature to work, go to :menuselection:`Purchases --> Configuration "
+"--> Settings` and activate the *3-way matching* feature"
 msgstr ""
-"Anda a :menúselección:`Compra --> Configuración --> Ajustes` y activa la "
-"3-way matching."
 
-#: ../../purchase/purchases/rfq/3_way_matching.rst:30
-msgid "Should I pay this vendor bill?"
-msgstr "¿Debo pagar esta factura del vendedor?"
+#: ../../purchase/purchases/rfq/3_way_matching.rst:27
+msgid "Should I pay the vendor bill?"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/3_way_matching.rst:29
+msgid ""
+"With the feature activated you will have a new *Should be paid* line appear "
+"on the vendor bill under the *Other info* tab."
+msgstr ""
 
 #: ../../purchase/purchases/rfq/3_way_matching.rst:32
 msgid ""
-"Once this setting has been activated, a new information appears on the "
-"vendor bill, defining whether the bill should be paid or not. There are "
-"three possible values:"
+"That way Odoo let's you easily know if you should pay the vendor bill or "
+"not."
 msgstr ""
-"Una vez que estos ajustes sean activados, una nueva información aparecerá en"
-" la factura del vendedor, definiendo si es que la factura debe ser pagada o "
-"no. Hay tres posibles valores:"
 
-#: ../../purchase/purchases/rfq/3_way_matching.rst:36
-msgid "*Use case 1*: I have received the ordered products."
-msgstr "*Usa caso 1*: He recibido los productos ordenados."
-
-#: ../../purchase/purchases/rfq/3_way_matching.rst:43
-msgid "*Use case 2*: I have not received the ordered products."
-msgstr "*Usa caso 2*: No he recibido los productos ordenados."
-
-#: ../../purchase/purchases/rfq/3_way_matching.rst:50
-msgid ""
-"*Use case 3*: the quantities do not match across the Purchase Order, Vendor "
-"Bill and Receipt."
-msgstr ""
-"*Usa caso 3*: Las cantidades no coinciden en la orden de venta, factura de "
-"vendedor y recibo. "
-
-#: ../../purchase/purchases/rfq/3_way_matching.rst:59
+#: ../../purchase/purchases/rfq/3_way_matching.rst:39
 msgid ""
 "The status is defined automatically by Odoo. However, if you want to define "
-"this status manually, you can tick the box *Force Status* and then you will "
-"be able to set manually whether the vendor bill should be paid or not."
+"this status manually, you can tick the box Force Status and then you will be"
+" able to set manually whether the vendor bill should be paid or not."
 msgstr ""
-"El status es definido automáticamente por Odoo. Sin embargo, si quieres "
-"definir el status manualmente, puedes marcar *Force Status* y luego podrás "
-"fijar manualmente si es que la factura del vendedor debe ser pagada o no."
 
 #: ../../purchase/purchases/rfq/analyze.rst:3
-msgid "How to analyze the performance of my vendors?"
-msgstr "¿Cómo analizar la actuación de mis vendedores?"
+msgid "Analyze the performance of my vendors"
+msgstr ""
 
 #: ../../purchase/purchases/rfq/analyze.rst:5
 msgid ""
@@ -1334,7 +488,6 @@ msgstr ""
 "pronosticar y planificar sus futuros pedidos."
 
 #: ../../purchase/purchases/rfq/analyze.rst:27
-#: ../../purchase/purchases/tender/partial_purchase.rst:17
 msgid "Install the Purchase Management module"
 msgstr "Instalación el módulo de Gestión de Compras"
 
@@ -1353,25 +506,18 @@ msgstr "Expedir algunas órdenes de compra"
 #: ../../purchase/purchases/rfq/analyze.rst:38
 msgid ""
 "Of course, in order to analyze your vendors' performance, you need to issue "
-"some **Request For Quotations** (RfQ) and confirm some **Purchase Orders**. "
-"If you want to know how to generate a purchase order, please read the "
-"documentation :doc:`../../overview/process/from_po_to_invoice`."
+"some **Request For Quotations** (RfQ) and confirm some **Purchase Orders**."
 msgstr ""
-"Por supuesto, con el fin de analizar el rendimiento de sus proveedores, "
-"usted necesita emitir una **Solicitud para Citas** (RfQ) y la confirmación "
-"de las **Órdenes de Compra**. Si usted quiere saber como se genera una orden"
-" de compra, por favor lea la documentación "
-":doc:`../../overview/process/from_po_to_invoice`."
 
-#: ../../purchase/purchases/rfq/analyze.rst:44
+#: ../../purchase/purchases/rfq/analyze.rst:43
 msgid "Analyzing your vendors"
 msgstr "Analizando sus vendedores"
 
-#: ../../purchase/purchases/rfq/analyze.rst:47
+#: ../../purchase/purchases/rfq/analyze.rst:46
 msgid "Generate flexible reports"
 msgstr "Generar reportes flexibles"
 
-#: ../../purchase/purchases/rfq/analyze.rst:49
+#: ../../purchase/purchases/rfq/analyze.rst:48
 msgid ""
 "You have access to your vendors' performances on the Reports menu. By "
 "default, the report groups all your purchase orders on a pivot table by "
@@ -1389,7 +535,7 @@ msgstr ""
 "agregar una gran cantidad de datos adicionales para su informe haciendo clic"
 " en el icono de **Medidas**."
 
-#: ../../purchase/purchases/rfq/analyze.rst:60
+#: ../../purchase/purchases/rfq/analyze.rst:59
 msgid ""
 "By clicking on the **+** and **-** icons, you can drill up and down your "
 "report in order to change the way your information is displayed. For "
@@ -1403,7 +549,7 @@ msgstr ""
 "de este mes, solo necesito hacer un click en el  icono **+** en el eje "
 "vertical y luego hacer click en el producto. "
 
-#: ../../purchase/purchases/rfq/analyze.rst:67
+#: ../../purchase/purchases/rfq/analyze.rst:66
 msgid ""
 "Depending on the data you want to highlight, you may need to display your "
 "reports in a more visual view. You can transform your report in just a click"
@@ -1417,7 +563,7 @@ msgstr ""
 "**Gráfico de Barras** y ** Gráfico de líneas**: Estas vistas son accesibles "
 "a través de los iconos resaltados en la pantalla de abajo ."
 
-#: ../../purchase/purchases/rfq/analyze.rst:77
+#: ../../purchase/purchases/rfq/analyze.rst:76
 msgid ""
 "On the contrary to the pivot table, a graph can only be computed with one "
 "dependent and one independent measure."
@@ -1425,11 +571,11 @@ msgstr ""
 "Por el contrario a la tabla dinámica, un gráfico que sólo puede ser "
 "calculado con un dependiente y una medida independiente."
 
-#: ../../purchase/purchases/rfq/analyze.rst:81
+#: ../../purchase/purchases/rfq/analyze.rst:80
 msgid "Customize reports"
 msgstr "Personalizar reportes"
 
-#: ../../purchase/purchases/rfq/analyze.rst:83
+#: ../../purchase/purchases/rfq/analyze.rst:82
 msgid ""
 "You can easily customize your purchase reports depending on your needs. To "
 "do so, use the **Advanced search view** located in the right hand side of "
@@ -1450,7 +596,7 @@ msgstr ""
 "los informes. Observe que puede filtrar y agrupar por cualquier campo "
 "existente, haciendo que su personalización sea muy flexible y potente."
 
-#: ../../purchase/purchases/rfq/analyze.rst:97
+#: ../../purchase/purchases/rfq/analyze.rst:96
 msgid ""
 "You can save and reuse any customized filter by clicking on **Favorites** "
 "from the **Advanced search view** and then on **Save current search**. The "
@@ -1461,73 +607,52 @@ msgstr ""
 "**Guardar Búsqueda Actual**. Entonces el filtro guardado será accesible "
 "desde el menú de **Favoritos**."
 
-#: ../../purchase/purchases/rfq/analyze.rst:103
-#: ../../purchase/purchases/rfq/create.rst:76
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:86
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:81
-#: ../../purchase/purchases/tender/partial_purchase.rst:77
-msgid ":doc:`../../overview/process/from_po_to_invoice`"
-msgstr ":doc:`../../overview/process/from_po_to_invoice`"
-
 #: ../../purchase/purchases/rfq/approvals.rst:3
-msgid "How to setup two levels of approval for purchase orders?"
+msgid "Request managers approval for expensive orders"
 msgstr ""
-"¿Cómo configurar dos niveles de aprobación para las órdenes de compra?"
 
-#: ../../purchase/purchases/rfq/approvals.rst:6
-msgid "Two level approval setup"
-msgstr "Configuración de la aprobación de los dos niveles"
-
-#: ../../purchase/purchases/rfq/approvals.rst:8
+#: ../../purchase/purchases/rfq/approvals.rst:5
 msgid ""
-"Double validation on purchases forces a validation when the purchased amount"
-" exceeds a certain limit."
+"In case of expensive purchases you may want a manager approval to validate "
+"the orders, Odoo let's you easily set that up."
 msgstr ""
-"Doble validación en las formas de compra a validar cuando el monto de la "
-"compra excede cierto límite."
 
 #: ../../purchase/purchases/rfq/approvals.rst:11
 msgid ""
-"Install **Purchase Management** module and then go to **General Settings** "
-"to configure the company data."
+"For this feature to work, go to :menuselection:`Purchases --> Configuration "
+"--> Settings` and activate the *Order Approval* feature. From there you can "
+"also set the minimum amount required to activate this feature."
 msgstr ""
-"Instalación del módulo de **Gestión de Compras** y después ir a **Ajustes "
-"Generales** para configuración los datos de la empresa."
 
-#: ../../purchase/purchases/rfq/approvals.rst:17
+#: ../../purchase/purchases/rfq/approvals.rst:20
+msgid "Create a new Request for Quotation"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/approvals.rst:22
 msgid ""
-"Set here the amount limit for second approval and set approval from manager "
-"side."
+"While working on a new RfQ, if the order is made by a user and not a manager"
+" and the amount of the order is above the minimum amount you specified, a "
+"new *To Approve* status will be introduced in the process."
 msgstr ""
-"Establezca aquí el límite de cantidad para la segunda aprobación y obtenga "
-"la aprobación del lado del gerente."
 
-#: ../../purchase/purchases/rfq/approvals.rst:21
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:47
-msgid "Process"
-msgstr "Procesar"
+#: ../../purchase/purchases/rfq/approvals.rst:31
+msgid "Approve the order"
+msgstr ""
 
-#: ../../purchase/purchases/rfq/approvals.rst:23
+#: ../../purchase/purchases/rfq/approvals.rst:33
 msgid ""
-"Logged as a purchase user, create a purchase order for more than the amount "
-"set above, and confirm it. The purchase order is set in a state **To "
-"Approve**"
+"If you are a purchase manager, you can now go to the purchase order and "
+"approve the order if everything is alright with it. Giving you full control "
+"of what your users can or can't do."
 msgstr ""
-"Se registra como un usuario de compra, hay que crear una orden de compra por"
-" más de la cantidad fijada anteriormente, y confirmarla. La orden de compra "
-"se encuentra en un estado **Para Aprobar**"
 
-#: ../../purchase/purchases/rfq/approvals.rst:29
-msgid "The manager gets the order to approve and validates the final order."
-msgstr "El gerente obtiene la orden para aprobar y validar la orden final."
-
-#: ../../purchase/purchases/rfq/approvals.rst:34
+#: ../../purchase/purchases/rfq/approvals.rst:37
 msgid "Once approved, the purchase order follows the normal process."
 msgstr "Una vez aprobada, la orden de compra sigue el proceso normal."
 
 #: ../../purchase/purchases/rfq/bills.rst:3
-msgid "How to control supplier bills?"
-msgstr "¿Cómo controlar las cuentas de proveedores?"
+msgid "Control supplier bills"
+msgstr ""
 
 #: ../../purchase/purchases/rfq/bills.rst:5
 msgid ""
@@ -1972,8 +1097,8 @@ msgstr ""
 " factura se vinculará a todas las órdenes de compra correspondientes."
 
 #: ../../purchase/purchases/rfq/cancel.rst:3
-msgid "How to cancel a purchase order?"
-msgstr "¿Cómo cancelar una orden de compra?"
+msgid "Cancel a purchase order"
+msgstr ""
 
 #: ../../purchase/purchases/rfq/cancel.rst:5
 msgid ""
@@ -2017,22 +1142,14 @@ msgstr ""
 "confirmada"
 
 #: ../../purchase/purchases/rfq/cancel.rst:25
-msgid ""
-"To learn more about the purchase order process, read the documentation page "
-":doc:`../../overview/process/from_po_to_invoice`"
-msgstr ""
-"Para conocer más acerca del proceso de órdenes de compras, lea el siguiente "
-"documento :doc:`../../overview/process/from_po_to_invoice`"
-
-#: ../../purchase/purchases/rfq/cancel.rst:30
 msgid "Cancel your Purchase Order"
 msgstr "Cancelar su Orden de Compra"
 
-#: ../../purchase/purchases/rfq/cancel.rst:33
+#: ../../purchase/purchases/rfq/cancel.rst:28
 msgid "Use case 1 : you didn't receive your goods yet"
 msgstr "Caso de uso 1: Aún no se recibe ningún bien."
 
-#: ../../purchase/purchases/rfq/cancel.rst:35
+#: ../../purchase/purchases/rfq/cancel.rst:30
 msgid ""
 "If you confirmed your purchase order and did not received your goods yet, "
 "you can simply cancel the PO it by clicking the cancel button."
@@ -2041,7 +1158,7 @@ msgstr ""
 "mercancía, sólo tiene que cancelar el pedido haciendo clic en el botón de "
 "cancelar."
 
-#: ../../purchase/purchases/rfq/cancel.rst:41
+#: ../../purchase/purchases/rfq/cancel.rst:36
 msgid ""
 "Odoo will automatically cancel the outstanding shipments related to this PO "
 "and the status bar will switch from **Purchase order** to **Cancelled**."
@@ -2050,11 +1167,11 @@ msgstr ""
 "orden de compra y la barra de estado cambiará de **Orden de Compra** a "
 "**Cancelado**. "
 
-#: ../../purchase/purchases/rfq/cancel.rst:48
+#: ../../purchase/purchases/rfq/cancel.rst:43
 msgid "Use case 2 : partially delivered goods"
 msgstr "Use el caso 2 : si la mercancía está parcialmente entregada"
 
-#: ../../purchase/purchases/rfq/cancel.rst:50
+#: ../../purchase/purchases/rfq/cancel.rst:45
 msgid ""
 "In this case, **2** of the **3 iPad Mini** arrived before you needed to "
 "cancel the PO."
@@ -2062,11 +1179,11 @@ msgstr ""
 "En el caso, **2** de las **3 Ipad Mini** llegaron antes de lo necesario para"
 " cancelar la orden de compra. "
 
-#: ../../purchase/purchases/rfq/cancel.rst:54
+#: ../../purchase/purchases/rfq/cancel.rst:49
 msgid "Register good received and cancel backorder"
 msgstr "Registrar la mercancía recibida y cancelar los pedidos pendientes"
 
-#: ../../purchase/purchases/rfq/cancel.rst:56
+#: ../../purchase/purchases/rfq/cancel.rst:51
 msgid ""
 "The first thing to do will be to register the goods received and to cancel "
 "the arrival of the **third iPad Mini** that is still supposed to be shipped."
@@ -2079,11 +1196,11 @@ msgstr ""
 "para el iPad mini*, manualmente hay que cambiar las cantidades recibidas en "
 "virtud de la Columna **Hecho**."
 
-#: ../../purchase/purchases/rfq/cancel.rst:66
+#: ../../purchase/purchases/rfq/cancel.rst:61
 msgid "To learn more, see :doc:`reception`"
 msgstr "Para conocer más, vea :doc:`reception`"
 
-#: ../../purchase/purchases/rfq/cancel.rst:68
+#: ../../purchase/purchases/rfq/cancel.rst:63
 msgid ""
 "When clicking on **Validate**, Odoo will warn you that you have processed "
 "less products than the initial demand (2 instead of 3 in our case) and will "
@@ -2093,7 +1210,7 @@ msgstr ""
 "productos que la demanda inicial (2 en lugar de 3, en nuestro caso) y le "
 "pedirá permiso para crear un pedido pendiente."
 
-#: ../../purchase/purchases/rfq/cancel.rst:75
+#: ../../purchase/purchases/rfq/cancel.rst:70
 msgid ""
 "Click on **No backorder** to cancel the supply of the remaining product. You"
 " will notice than the quantity to receive has been changed accordingly and, "
@@ -2104,11 +1221,11 @@ msgstr ""
 "modificado en consecuencia y, por lo tanto, el estado de entrega ha cambiado"
 " a **Hecho**."
 
-#: ../../purchase/purchases/rfq/cancel.rst:83
+#: ../../purchase/purchases/rfq/cancel.rst:78
 msgid "Create reverse transfer"
 msgstr "Crear transferencia inversa"
 
-#: ../../purchase/purchases/rfq/cancel.rst:85
+#: ../../purchase/purchases/rfq/cancel.rst:80
 msgid ""
 "Now, you need to return the iPad Minis that you have received to your vendor"
 " location. To do so, click on the **Reverse** button from the same document."
@@ -2121,7 +1238,7 @@ msgstr ""
 "cantidad a devolver y la ubicación correspondiente y haga clic en "
 "**Devolver**."
 
-#: ../../purchase/purchases/rfq/cancel.rst:93
+#: ../../purchase/purchases/rfq/cancel.rst:88
 msgid ""
 "Process the return shipment and control that the stock move is from your "
 "stock to your vendor location."
@@ -2129,7 +1246,7 @@ msgstr ""
 "Procesar la devolución y controla que la acción del movimiento del almacén "
 "sea de la ubicación del proveedor."
 
-#: ../../purchase/purchases/rfq/cancel.rst:99
+#: ../../purchase/purchases/rfq/cancel.rst:94
 msgid ""
 "When the reverse transfer is done, the status of your purchase order will be"
 " automatically set to done, meaning that your PO has been completely "
@@ -2139,18 +1256,18 @@ msgstr ""
 "será ajustará a hecho automáticamente, lo que significa que la orden de "
 "compra ha sido completamente cancelada. "
 
-#: ../../purchase/purchases/rfq/cancel.rst:104
-#: ../../purchase/purchases/rfq/reception.rst:120
+#: ../../purchase/purchases/rfq/cancel.rst:99
+#: ../../purchase/purchases/rfq/reception.rst:116
 msgid ":doc:`bills`"
 msgstr ":doc:`bills`"
 
-#: ../../purchase/purchases/rfq/cancel.rst:105
+#: ../../purchase/purchases/rfq/cancel.rst:100
 msgid ":doc:`reception`"
 msgstr ":doc:`reception`"
 
 #: ../../purchase/purchases/rfq/create.rst:3
-msgid "How to create a Request for Quotation?"
-msgstr "¿Cómo crear una Solicitud de Cotizaciones?"
+msgid "Create a Request for Quotation"
+msgstr ""
 
 #: ../../purchase/purchases/rfq/create.rst:5
 msgid ""
@@ -2167,19 +1284,11 @@ msgstr ""
 "solicitud, puede optar por seguir adelante con la oferta y la compra o "
 "rechazar la oferta."
 
-#: ../../purchase/purchases/rfq/create.rst:12
-msgid ""
-"For more information on best uses, please read the chapter "
-":doc:`../../overview/process/difference`"
-msgstr ""
-"Para obtener más información sobre el mejor uso, por favor lea el capítulo "
-":doc:`../../overview/difference`"
-
-#: ../../purchase/purchases/rfq/create.rst:19
+#: ../../purchase/purchases/rfq/create.rst:16
 msgid "Creating a Request for Quotation"
 msgstr "Creando una Solicitud de Cotización"
 
-#: ../../purchase/purchases/rfq/create.rst:21
+#: ../../purchase/purchases/rfq/create.rst:18
 msgid ""
 "In the Purchases module, open :menuselection:`Purchase --> Requests for "
 "Quotation` and click on **Create**."
@@ -2187,7 +1296,7 @@ msgstr ""
 "En el módulo de Compras, abra el menú :menuselection:`Compras --> Solicitud "
 "de Cotización` y haga clic en **Crear**."
 
-#: ../../purchase/purchases/rfq/create.rst:27
+#: ../../purchase/purchases/rfq/create.rst:24
 msgid ""
 "Select your supplier in the **Vendor** menu, or create it on-the-fly by "
 "clicking on **Create and Edit**. In the **Order Date** field, select the "
@@ -2197,98 +1306,11 @@ msgstr ""
 " marcha, haga clic en **Crear y Editar**. En el campo **Fecha de pedido**, "
 "seleccione la fecha en la que desea continuar con el orden real."
 
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid "Shipment"
-msgstr "Envío"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid "Incoming Shipments"
-msgstr "Envíos a recibir"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid "Vendor Reference"
-msgstr "Referencia de proveedor"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid ""
-"Reference of the sales order or bid sent by the vendor. It's used to do the "
-"matching when you receive the products as this reference is usually written "
-"on the delivery order sent by your vendor."
-msgstr ""
-"Referencia del pedido de venta o la oferta enviada por el proveedor. Se "
-"utiliza para hacer la correspondencia cuando usted recibe los productos, "
-"esta referencia se suele escribir en la orden de entrega enviado por el "
-"proveedor."
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid "Order Date"
-msgstr "Fecha de pedido"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid ""
-"Depicts the date where the Quotation should be validated and converted into "
-"a purchase order."
-msgstr ""
-"Representa la fecha en que la cotización debe ser validada y se convierte en"
-" una orden de compra."
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid "Source Document"
-msgstr "Documento origen"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid ""
-"Reference of the document that generated this purchase order request (e.g. a"
-" sales order)"
-msgstr ""
-"Referencia del documento que generó esta solicitud de pedido de compra (por "
-"ejemplo, un pedido de cliente)"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid "Deliver To"
-msgstr "Entregar a"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid "This will determine operation type of incoming shipment"
-msgstr "Esto determinará el tipo de operación del envío entrante"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid "Drop Ship Address"
-msgstr "Dirección Drop Ship"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid ""
-"Put an address if you want to deliver directly from the vendor to the "
-"customer. Otherwise, keep empty to deliver to your own company."
-msgstr ""
-"Ponga una dirección si desea entregar directamente desde el proveedor al "
-"cliente. De lo contrario, mantenga vacía para entregar a su propia compañía."
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid "Destination Location Type"
-msgstr "Tipo de ubicación de destino"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid "Technical field used to display the Drop Ship Address"
-msgstr "Campo técnico utilizado para mostrar la dirección de envió directo"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid "Incoterm"
-msgstr "Incoterm"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid ""
-"International Commercial Terms are a series of predefined commercial terms "
-"used in international transactions."
-msgstr ""
-"Los términos de comercio internacional son una serie de condiciones "
-"comerciales usadas en las transacciones internacionales."
-
-#: ../../purchase/purchases/rfq/create.rst:35
+#: ../../purchase/purchases/rfq/create.rst:32
 msgid "View *Request for Quotation* in our Online Demonstration"
 msgstr "Vista de la *Solicitud de Cotización* en la demostración en línea"
 
-#: ../../purchase/purchases/rfq/create.rst:37
+#: ../../purchase/purchases/rfq/create.rst:34
 msgid ""
 "In **Products**, click on Add an item. Select the product you wish to order "
 "in the **Product** menu. Specify the **Quantity** by inserting the number "
@@ -2310,7 +1332,7 @@ msgstr ""
 "correo electrónico sea especifica para este proveedor o introduzca uno "
 "nuevo)."
 
-#: ../../purchase/purchases/rfq/create.rst:51
+#: ../../purchase/purchases/rfq/create.rst:48
 msgid ""
 "After having clicked on **Send**, you will notice that the RFQ's status will"
 " switch from **Draft** to **RFQ Sent**."
@@ -2318,7 +1340,7 @@ msgstr ""
 "Después de haber hecho clic en **Enviar**, usted se dará cuenta de que el "
 "estado de la petición de oferta pasará de **Borrador** a **RFQ enviados**."
 
-#: ../../purchase/purchases/rfq/create.rst:57
+#: ../../purchase/purchases/rfq/create.rst:54
 msgid ""
 "Once your supplier has replied with an offer, update the RfQ by clicking on "
 "**Edit** to fit the quotation (prices, taxes, expected delivery lead time, "
@@ -2329,7 +1351,7 @@ msgstr ""
 " impuestos, plazo de entrega previsto, condiciones de pago, etc.), a "
 "continuación, haga clic en **Guardar** para emitir una Orden de Compra."
 
-#: ../../purchase/purchases/rfq/create.rst:62
+#: ../../purchase/purchases/rfq/create.rst:59
 msgid ""
 "To proceed with the order, click on **Confirm Order** to send the order to "
 "the supplier. The RfQ's status will switch to **Purchase Order**."
@@ -2337,7 +1359,7 @@ msgstr ""
 "Para continuar con la orden, haga clic en **Confirmar Orden** para enviar el"
 " pedido al proveedor. El estado del RfQ cambiará a **Orden de Compra**."
 
-#: ../../purchase/purchases/rfq/create.rst:68
+#: ../../purchase/purchases/rfq/create.rst:65
 msgid ""
 "The status of the RfQ will change to PURCHASE ORDER. Tabs in the upper right"
 " corner of the order will show 1 Shipment and 0 Invoice."
@@ -2345,9 +1367,100 @@ msgstr ""
 "El estado de la RfQ cambiará a la ORDEN DE COMPRA. En la esquina superior "
 "derecha de la orden se mostrarán 1 Envío y 0 Facturas."
 
+#: ../../purchase/purchases/rfq/dropshipping.rst:3
+msgid "Dropship products"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/dropshipping.rst:5
+msgid ""
+"Dropshipping is a method in which the vendor does not keep products in stock"
+" but instead transfers the products directly from the supplier to the "
+"customer."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/dropshipping.rst:10
+msgid ""
+"You need the *Sales*, *Inventory* and *Purchases* modules for this feature "
+"to work."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/dropshipping.rst:14
+msgid "Activate the dropshipping feature"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/dropshipping.rst:16
+msgid ""
+"Go to :menuselection:`Purchases --> Configuration --> Settings` and select "
+"*Dropshipping*."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/dropshipping.rst:22
+msgid ""
+"A new route *Dropshipping* has been created. You can go on a product and "
+"tick the dropshipping route. You also need to define to which vendor you "
+"will buy the product. Now, each time this product will be sold, it will be "
+"drop shipped."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/dropshipping.rst:30
+msgid ""
+"If you don't always dropship that product, you can go to "
+":menuselection:`Sales --> Configuration --> Settings` and tick the box in "
+"front of *Order-Specific Routes*."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/dropshipping.rst:37
+msgid ""
+"When you create a quotation or sales order, you can now decide, order line "
+"per order line, which products should be drop shipped by selecting the "
+"dropship route on the SO line."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/dropshipping.rst:45
+msgid "Drop ship a product"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/dropshipping.rst:47
+msgid ""
+"Once a sale order with products to dropship is confirmed, a request for "
+"quotation is generated by Odoo to buy the product to the vendor. If you "
+"confirm that request for quotation into a purchase order, it will create a "
+"transfer from your vendor directly to your customer. The products doesn't go"
+" through your own stock."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/lock_orders.rst:3
+msgid "Lock a purchase order"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/lock_orders.rst:5
+msgid ""
+"Once an order is confirmed, you can lock it preventing any further editing."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/lock_orders.rst:11
+msgid ""
+"For this feature to work, go to :menuselection:`Purchases --> Configuration "
+"--> Settings` and activate the *Lock Confirmed Orders* feature"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/lock_orders.rst:19
+msgid "Lock an order"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/lock_orders.rst:21
+msgid ""
+"While working on a purchase order, when you confirm it, you can then lock "
+"the order preventing any further modification on the document."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/lock_orders.rst:28
+msgid "You can unlock the document if you need to make additional changes"
+msgstr ""
+
 #: ../../purchase/purchases/rfq/reception.rst:3
-msgid "How to control product received? (entirely & partially)"
-msgstr "¿Cómo controlar un producto recibido? (total y/o parcialmente)"
+msgid "Control product received (entirely & partially)"
+msgstr ""
 
 #: ../../purchase/purchases/rfq/reception.rst:5
 msgid ""
@@ -2455,18 +1568,10 @@ msgstr ""
 " su orden de venta)."
 
 #: ../../purchase/purchases/rfq/reception.rst:67
-msgid ""
-"See the documentation page :doc:`../../overview/process/from_po_to_invoice` "
-"for a full overview of the purchase process."
-msgstr ""
-"Vea la documentación :doc:`../../overview/process/from_po_to_invoice` para "
-"un completo esquema del proceso de compras.  "
-
-#: ../../purchase/purchases/rfq/reception.rst:71
 msgid "Receive Products"
 msgstr "Recibir productos"
 
-#: ../../purchase/purchases/rfq/reception.rst:73
+#: ../../purchase/purchases/rfq/reception.rst:69
 msgid ""
 "If you purchased physical goods (stockable or consumable products), you can "
 "receive the products from the **Inventory** application. From the "
@@ -2478,7 +1583,7 @@ msgstr ""
 "**Inventario**, debería ver un botón **X para Recibir**, en el cuadro de la "
 "recepción de la bodega correspondiente."
 
-#: ../../purchase/purchases/rfq/reception.rst:81
+#: ../../purchase/purchases/rfq/reception.rst:77
 msgid ""
 "Click on this button and you access a list of all awaiting orders for this "
 "warehouse."
@@ -2486,7 +1591,7 @@ msgstr ""
 "Haz click en este botón y accede a una lista de todos los pedidos en espera "
 "para este almacén."
 
-#: ../../purchase/purchases/rfq/reception.rst:87
+#: ../../purchase/purchases/rfq/reception.rst:83
 msgid ""
 "If you have a lot of awaiting orders, you can use the filter bar to search "
 "on the **Vendor** (also called **Partner** in Odoo), the product or the "
@@ -2500,7 +1605,7 @@ msgstr ""
 "orden de compra. Puede abrir el documento que coincida con el almacén de "
 "entrega recibido y procesar todas las líneas dentro de ella."
 
-#: ../../purchase/purchases/rfq/reception.rst:96
+#: ../../purchase/purchases/rfq/reception.rst:92
 msgid ""
 "You may validate the whole document at once by clicking on the **Validate** "
 "button or you can control all products, one by one, by manually change the "
@@ -2513,7 +1618,7 @@ msgstr ""
 "Cuando una línea es de color verde, significa que la cantidad recibida "
 "coincida con lo que se esperaba."
 
-#: ../../purchase/purchases/rfq/reception.rst:103
+#: ../../purchase/purchases/rfq/reception.rst:99
 msgid ""
 "If you work with lots or serial numbers, you can not set the processed "
 "quantity, but you have to provide all the lots or serial numbers to record "
@@ -2523,7 +1628,7 @@ msgstr ""
 "cantidad procesada, pero usted tiene que proporcionar todos los lotes o "
 "números de serie para registrar la cantidad recibida."
 
-#: ../../purchase/purchases/rfq/reception.rst:107
+#: ../../purchase/purchases/rfq/reception.rst:103
 msgid ""
 "When you validate the reception, if you have received less products than the"
 " initial demand, Odoo will ask youthe permission to create a backorder."
@@ -2531,7 +1636,7 @@ msgstr ""
 "Al validar la recepción, si ha recibido menos productos que la demanda "
 "inicial, Odoo le pedirá permiso para crear un pedido pendiente. "
 
-#: ../../purchase/purchases/rfq/reception.rst:114
+#: ../../purchase/purchases/rfq/reception.rst:110
 msgid ""
 "If you plan to receive the remaining product in the future, select **Create "
 "Backorder**. Odoo will create a new documents for the awaiting products. If "
@@ -2541,439 +1646,221 @@ msgstr ""
 " Pendiente**. Odoo creará un nuevo documento para los productos en espera. "
 "Si escoge **Sin Pedido Pendiente**, el pedido se considerará cumplido."
 
-#: ../../purchase/purchases/rfq/reception.rst:121
+#: ../../purchase/purchases/rfq/reception.rst:117
 msgid ":doc:`cancel`"
 msgstr ":doc:`cancel`"
 
+#: ../../purchase/purchases/rfq/warning.rst:3
+msgid "Raise warnings on purchase orders"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/warning.rst:5
+msgid ""
+"The *Warnings* feature allows you to raise warnings or blocking messages on "
+"purchase orders based on a vendor or a product."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/warning.rst:8
+msgid ""
+"For example, if you often have a problem with a vendor, you might want to "
+"raise a warning when purchasing from that vendor. If a product is about to "
+"be discontinued, you may want to raise a blocking message on the purchase "
+"order."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/warning.rst:16
+msgid ""
+"For this feature to work, go to :menuselection:`Purchases --> Configuration "
+"--> Settings` and activate the *Warnings* feature."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/warning.rst:24
+msgid "Add a warning on a vendor"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/warning.rst:26
+msgid ""
+"When you activate the feature, you get a new option under the *Internal "
+"Notes* tab on vendors. You can decide to write a simple warning or a "
+"blocking message."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/warning.rst:34
+msgid "Add a warning on a product"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/warning.rst:36
+msgid ""
+"When you activate the feature, you get a new option under the *Purchase* tab"
+" on the product page where you can add a warning or a blocking message."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/warning.rst:44
+msgid "Trying to buy with warnings or blocking messages"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/warning.rst:46
+msgid ""
+"If you try to validate a *Purchase Order* from a vendor or with a product "
+"with a warning, a message will be raised. You can ignore it by clicking ok."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/warning.rst:53
+msgid "However, if it is a blocking message, you can not ignore it."
+msgstr ""
+
 #: ../../purchase/purchases/tender.rst:3
-msgid "Purchase Tenders"
-msgstr "Licitaciones de compra"
+msgid "Purchase Agreements"
+msgstr "Acuerdos de compra"
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:3
-msgid "How to manage Blanket Orders"
-msgstr "Como administrar ordenes blanket."
-
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:5
-msgid ""
-"A **Blanket Order** is a contract between you (the customer) and your "
-"supplier. It is used to negotiate a discounted price. The supplier is "
-"benefited by the economies of scale inherent in a large order. You are "
-"benefited by being allowed to take multiple smaller deliveries over a period"
-" of time, at a lower price, without paying for the large order immediately. "
-"Each small periodic delivery is called a release or call-off."
+#: ../../purchase/purchases/tender/blanket_orders.rst:3
+msgid "Manage Blanket Orders"
 msgstr ""
-"Una **Blanket Order** es un contrato entre tu (el cliente) y tu proveedor "
-"específico. Es usado para negociar un precio descontado. El proveedor es "
-"beneficiado por las economias de escala inherentes en una orden larga. Te "
-"beneficias al tener la posibilidad de tomar hartas ordenes pequeñas en un "
-"periodo de tiempo, a un precio menor, sin tener que pagar la orden de "
-"inmediato. Cada entrega pequeña se llama lanzamiento o cancelación."
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:12
+#: ../../purchase/purchases/tender/blanket_orders.rst:5
 msgid ""
-"As the blanket order is a contract, it will have some prearranged "
-"conditions. These usually include:"
+"A Blanket Order is a purchase order which a customer places with its "
+"supplier to allow multiple delivery dates over a period of time, often "
+"negotiated to take advantage of predetermined pricing."
 msgstr ""
-"Como la orden blanket es un contrato, tendrá algunas condiciones pre "
-"arregladas. Estas usualmente incluyen:"
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:15
-msgid "Total quantity of each product to be delivered"
-msgstr "Cantidad total de cada producto a entregar"
-
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:17
+#: ../../purchase/purchases/tender/blanket_orders.rst:12
 msgid ""
-"Completion deadline, by which you must take delivery of the total quantity"
+"For this feature to work, go to :menuselection:`Purchases --> Configuration "
+"--> Settings` and activate the *Purchase Agreements* feature"
 msgstr ""
-"Fecha de completación, para la cual debes tomar entrega de la cantidad total"
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:19
-msgid "Unit price for each product"
-msgstr "Precio unitario para cada producto"
-
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:21
-msgid "Delivery lead time in days for each release"
-msgstr "Plaso de entrega en días para cada lanzamiento"
-
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:24
-msgid "Activate the Purchase Agreements"
-msgstr "Activa los acuerdos de compra"
-
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:26
-msgid ""
-"The Blanket Order function is provided by the Purchase Agreements feature. "
-"By default, the Purchase Agreements is not activated. To be able to use "
-"blanket orders, you must first activate the option."
+#: ../../purchase/purchases/tender/blanket_orders.rst:20
+msgid "Start a Blanket Order"
 msgstr ""
-"La función orden blanket es entregada por la característica Acuerdo de "
-"Compra. Por defecto, el acuerdo de compra no es activado. Para usar blanket "
-"orders, tienes que primero activar la opción."
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:30
+#: ../../purchase/purchases/tender/blanket_orders.rst:22
+#: ../../purchase/purchases/tender/call_for_tender.rst:21
 msgid ""
-"In the Purchases module, open the Configuration menu and click on Settings. "
-"In the **Orders** section, locate the **Purchase Agreements** and tick the "
-"box, then click on **Save**."
-msgstr ""
-"En el módulo de compra, abre el menú configuración y haz clic en Ajustes. En"
-" la sección **Ordenes**, localiza el **Acuerdo de compra** y marca la caja, "
-"luego haz clic en **Guardar**."
-
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:38
-msgid "Create a Blanket Order"
-msgstr "Crea una Blanket Order"
-
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:40
-msgid ""
-"To create a new blanket order, open :menuselection:`Purchase --> Purchase "
+"To use this feature go to :menuselection:`Purchases --> Purchase "
 "Agreements`."
 msgstr ""
-"Para crear una orden blanket, abre :menuselección:`Compra --> Acuerdo de "
-"Compra`."
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:45
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:39
+#: ../../purchase/purchases/tender/blanket_orders.rst:24
 msgid ""
-"In the Purchase Agreements window, click on **Create**. A new Purchase "
-"Agreement window opens."
+"Once you are creating the purchase agreement, access the *Agreement Type* "
+"drop down menu and select *Blanket Order*."
 msgstr ""
-"En la ventana de acuerdo de compra, haz clic en **Crea**. Un nuevo Acuerdo "
-"de Compra se abrirá."
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:48
-msgid "In the **Agreement Type** field, choose Blanket Order."
-msgstr "En el campo **Tipo de Acuerdo**, elige orden blanket."
-
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:50
-msgid "Choose the **Vendor** with whom you will make the agreement."
-msgstr "Elige el **Vendedor** con el que harás el acuerdo."
-
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:52
-msgid "Set the **Agreement Deadline** as per the conditions of the agreement."
-msgstr ""
-"Fija la **Fecha límite del Acuerdo** como en las condiciones del acuerdo."
-
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:54
-msgid "Set the **Ordering Date** to the starting date of the contract."
-msgstr "Fija la **Fecha de Orden** a la fecha de partida del contrato."
-
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:56
+#: ../../purchase/purchases/tender/blanket_orders.rst:30
 msgid ""
-"Leave the **Delivery Date** empty because we will have different delivery "
-"dates with each release."
+"You can then create your new blanket order, select your vendor, the "
+"product(s), agreement deadline, ordering date and delivery date."
 msgstr ""
-"Deja la **Fecha de Entrega** vacía porque tendremos distintas fechas de "
-"entrega con cada lanzamiento."
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:59
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:52
+#: ../../purchase/purchases/tender/blanket_orders.rst:33
 msgid ""
-"In the **Products** section, click on **Add an item**. Select products in "
-"the Product list, then insert **Quantity**. You can add as many products as "
-"you wish."
+"When you are satisfied with your purchase agreement, confirm it. Its status "
+"will change from*Draft* to *Ongoing* and a new *RFQs/Orders* will appear in "
+"the top right corner of the document."
 msgstr ""
-"En la sección **Productos**, haz clic en **Agrega un Item**. Selecciona "
-"productos en Lista de Productos, luego ingresa **Cantidad**. Puedes agregar "
-"cuantos productos quieras."
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:66
-msgid "Click on **Confirm**."
-msgstr "Clic en **Confirmar**."
+#: ../../purchase/purchases/tender/blanket_orders.rst:41
+msgid "RFQ from the Blanket Order"
+msgstr ""
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:68
+#: ../../purchase/purchases/tender/blanket_orders.rst:43
 msgid ""
-"Now click on the button **New Quotation**. A RfQ is created for this vendor,"
-" with the products chosen on the PT. Repeat this operation for each release."
+"From your blanket order you can create a new quotation, Odoo will auto-fill "
+"the document with the product(s) from your blanket order, you only have to "
+"choose the quantity and confirm the order."
 msgstr ""
-"Ahora haz clic en el botón **Nuevo Presupuesto**. Un RfQ es creado para este"
-" vendedor, con los productos elegidos en el PT. Repite esta operación para "
-"cada lanzamiento."
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:71
+#: ../../purchase/purchases/tender/blanket_orders.rst:47
 msgid ""
-"Be careful to change the **Quantity** field on the RFQ.  By default, the RFQ"
-" quantity will be for the entire remaining quantity. Your individual "
-"releases should be for some smaller quantity."
+"When you will go back on the blanket order, you will see how many quantities"
+" you have already ordered from your blanket order."
 msgstr ""
-"Ten cuidado al cambiar la **Cantidad** campo en el RFQ. Por defecto, la "
-"cantidad RFQ será por la cantidad total restante. Tus lanzamientos "
-"individuales deben ser para algunas cantidades más pequeñas."
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:78
+#: ../../purchase/purchases/tender/blanket_orders.rst:51
+msgid "Vendors prices on your product"
+msgstr ""
+
+#: ../../purchase/purchases/tender/blanket_orders.rst:53
 msgid ""
-"When all of the releases (purchase orders) have been delivered and paid, you"
-" can click on **Validate** and **Done**."
+"When a blanket order is validated, a new vendor line is added in your "
+"product. You can see which one are linked to a blanket order and give "
+"priority to the ones you want with the arrows on the left of the vendor "
+"name."
 msgstr ""
-"Cuando todos los lanzamientos (ordenes de compra) han sido entregados y "
-"pagados, puedes hacer clic en  **Validar** y **Hecho**."
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:81
+#: ../../purchase/purchases/tender/blanket_orders.rst:58
 msgid ""
-"View `Purchase Agreements "
-"<https://demo.odoo.com/?module=purchase_requisition.action_purchase_requisition>`__"
-" in our Online Demonstration."
+"Thanks to this, a blanket order can be used for automated replenishment "
+"(using *reordering rules* or *made to order* configuration)."
 msgstr ""
-"Ve `Acuerdo de Compra "
-"<https://demo.odoo.com/?module=purchase_requisition.action_purchase_requisition>`__"
-" en nuestra Demostración Online."
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:88
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:83
-msgid ":doc:`../../overview/process/difference`"
-msgstr ":doc:`../../overview/process/difference`"
-
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:3
-msgid "How to manage Purchase Tenders"
-msgstr "Como administrar Licitaaciones de Compra"
-
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:12
+#: ../../purchase/purchases/tender/blanket_orders.rst:65
 msgid ""
-"For more information on best uses, please read the chapter `Request for "
-"Quotation, Purchase Tender or Purchase Order? "
-"<https://www.odoo.com/documentation/user/11.0/purchase/overview/process/difference.html>`__"
+"You can also create a *Request for Quotation* from the classic RFQ Menu and "
+"link them with an existing *Blanket Order*"
 msgstr ""
-"Para más información en mejores usos, por favor lee el capítulo `Request for"
-" Quotation, Purchase Tender or Purchase Order? "
-"<https://www.odoo.com/documentation/user/11.0/purchase/overview/process/difference.html>`__"
 
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:17
-msgid "Activate the Purchase Tender function"
-msgstr "Activa la función de Licitación de Compra"
+#: ../../purchase/purchases/tender/call_for_tender.rst:3
+msgid "Manage Call for Tender"
+msgstr ""
 
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:19
+#: ../../purchase/purchases/tender/call_for_tender.rst:5
 msgid ""
-"By default, the Purchase Tender is not activated. To be able to use PTs, you"
-" must first activate the option."
+"A Call for Tender is a special procedure to request offers from multiple "
+"vendors to obtain the most interesting price."
 msgstr ""
-"Por defecto, la Solicitud de Compra no está activada. Para poder utilizar "
-"los PT, primero debe activar la opción."
 
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:22
+#: ../../purchase/purchases/tender/call_for_tender.rst:11
 msgid ""
-"In the Purchases module, open the Configuration menu and click on Settings. "
-"In the Purchase Order section, locate the **Calls for Tenders** and tick the"
-" box Allow using call for tenders... (advanced), then click on **Apply**."
+"For this feature to work, go to :menuselection:`Purchases --> Configuration "
+"--> Settings` and activate the *Purchase Agreements* feature."
 msgstr ""
-"En el módulo de Compras, abre el menú Configuración y haz clic en Ajustes. "
-"En la sección orden de compra, localiza la **Llamadas para Licitaciones** y "
-"marca la caja Permitir usando llamada para licitaciones... (avanzado), luego"
-" haz clic en **Aplicar**."
 
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:31
-msgid "Create a Purchase Tender"
-msgstr "Crea una Licitación de Compra"
+#: ../../purchase/purchases/tender/call_for_tender.rst:19
+msgid "Create a Call for Tender"
+msgstr ""
 
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:33
+#: ../../purchase/purchases/tender/call_for_tender.rst:23
 msgid ""
-"To create a new Purchase Tender, open :menuselection:`Purchase --> Purchase "
-"Agreements (PA)`."
+"Create a new purchase agreement, access the *Agreement Type* drop down menu "
+"and select *Call for Tender*."
 msgstr ""
-"Para crear una nueva Licitación de Compra, abre :menuselection:`Purchase -->"
-" Purchase Agreements (PA)`."
 
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:42
-msgid "In the **Agreement Type** field, choose Purchase Tender."
-msgstr "En el campo **Tipo Acuerdo**, elige Licitación Compra."
-
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:44
+#: ../../purchase/purchases/tender/call_for_tender.rst:26
 msgid ""
-"The **Agreement Deadline** field tells the vendors when to have their offers"
-" submitted."
+"When you are satisfied with your purchase agreement, confirm it will move "
+"from *Draft* to *Confirmed* and a new *RFQs/Orders* appeared in the top "
+"right corner of the document."
 msgstr ""
-"El campo **Fecha límite de Acuerdo** le dice al vendedor cuando tener sus "
-"ofertas entregadas."
 
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:46
+#: ../../purchase/purchases/tender/call_for_tender.rst:34
+msgid "Request new quotations from the Call for Tender"
+msgstr ""
+
+#: ../../purchase/purchases/tender/call_for_tender.rst:36
 msgid ""
-"The **Ordering Date** field tells the vendors when we will submit a purchase"
-" order to the chosen vendor."
+"From the Call for Tender, Odoo will auto-fill the RFQ with the product(s) "
+"from your Call for Tender."
 msgstr ""
-"El campo **Fecha de Orden** le dice al vendedor cuando enviarémos una orden "
-"de compra al vendedor elegido."
 
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:48
+#: ../../purchase/purchases/tender/call_for_tender.rst:40
+msgid "Select the best offer"
+msgstr ""
+
+#: ../../purchase/purchases/tender/call_for_tender.rst:42
 msgid ""
-"The **Delivery Date** field tells the vendors when the product will have to "
-"be delivered."
+"The various RFQs and orders linked to the Call for Tenders will be under the"
+" *RFQs/Orders* button where you can select and confirm the best offer."
 msgstr ""
-"El campo **Fecha de Entrega** le dice al vendedor cuando el producto tiene "
-"que ser entregado."
 
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:50
-msgid "You do not have to define a **Vendor**."
-msgstr "No tienes que definir un **Vendedor**."
-
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:59
-msgid "Click on **Confirm Call**."
-msgstr "Clic en **Confirmar llamada**."
-
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:61
-msgid ""
-"Now click on the button **New Quotation**. A RfQ is created with the "
-"products chosen on the PT. Choose a **Vendor** and send the RfQ to the "
-"vendor. Repeat this operation for each vendor."
+#: ../../purchase/purchases/tender/call_for_tender.rst:50
+msgid "Close the Call for Tender"
 msgstr ""
-"Ahora haz clic en el botón **Nuevo Presupuesto**. Un RfQ es creado con los "
-"productos elegidos en el PT. Elige un **Vendedor** y envía el RfQ al "
-"vendedor. Repite esta operación para cada vendedor."
 
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:68
-msgid "Once all the RfQs are sent, you can click on **Validate** on the PT."
+#: ../../purchase/purchases/tender/call_for_tender.rst:52
+msgid "Once you're done with your *Call for Tender* don't forget to close it."
 msgstr ""
-"Una vez que todos los RfQs sean enviados, puedes hacer clic en **Validar** "
-"en el PT."
-
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:70
-msgid ""
-"The vendors will send their offers, you can update the RfQs accordingly. "
-"Then, choose the ones you want to accept by clicking on **Confirm Order** on"
-" the RfQs and **Cancel** the others."
-msgstr ""
-"Los vendedores enviarán sus ofertas, puedes actualizar los RfQs de acuerdo a"
-" esto. Luego, elige los que deseas aceptar cliqueando en **Confirmar Orden**"
-"  en los RfQs y **Cancela** los otros."
-
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:74
-msgid "You can now click on **Done** on the PT."
-msgstr "Ahora puedes hacer clic en **Hecho** en el PT."
-
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:76
-msgid ""
-"View `Purchase Tenders "
-"<https://demo.odoo.com/?module=purchase_requisition.action_purchase_requisition>`__"
-" in our Online Demonstration."
-msgstr ""
-"Ve `Purchase Tenders "
-"<https://demo.odoo.com/?module=purchase_requisition.action_purchase_requisition>`__"
-" en nuestra demostración en línea."
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:3
-msgid ""
-"How to purchase partially at two vendors for the same purchase tenders?"
-msgstr ""
-"¿Cómo comprar parcialmente a dos proveedores de las mismas ofertas de "
-"compra?"
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:5
-msgid ""
-"For some Purchase Tenders (PT), you might sometimes want to be able to "
-"select only a part of some of the offers you received. In Odoo, this is made"
-" possible through the advanced mode of the **Purchase** module."
-msgstr ""
-"Para algunas Licitaciones de Compra (PT), es posible que a veces se quiera "
-"ser capaz de seleccionar sólo una parte de alguna de las ofertas que se han "
-"recibido. En Odoo, esto es posible a través del modo avanzado del módulo de "
-"**Compras**."
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:10
-msgid ""
-"If you want to know how to handle a simple **Purchase Tender**, read the "
-"document on :doc:`manage_multiple_offers`."
-msgstr ""
-"Si usted quiere saber cómo manejar una sencilla **Licitación de Compra**, "
-"lea el documento en :doc:`manage_multiple_offers`."
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:19
-msgid "From the **Apps** menu, install the **Purchase Management** app."
-msgstr ""
-"Desde el módulo de **Aplicaciones**, instale el módulo de **Gestión de "
-"Compras**."
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:25
-msgid "Activating the Purchase Tender and Purchase Tender advanced mode"
-msgstr ""
-"Activar en las Licitaciones de Compra y el modo avanzado de las Licitaciones"
-" de Compras "
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:27
-msgid ""
-"In order to be able to select elements of an offer, you must activate the "
-"advanced mode."
-msgstr ""
-"Con el fin de ser capaz de seleccionar elementos de una oferta, se debe "
-"activar el modo avanzado."
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:30
-msgid ""
-"To do so, go into the **Purchases** module, open the **Configuration** menu "
-"and click on **Settings**."
-msgstr ""
-"Para hacer eso, vaya al módulo de **Compras**, abra el menú de "
-"**Configuración** y haga clic en **Ajustes**."
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:33
-msgid ""
-"In the **Calls for Tenders** section, tick the option **Allow using call for"
-" tenders to get quotes from multiple suppliers(...)**, and in the **Advanced"
-" Calls for Tenders** section, tick the option **Advanced call for tender "
-"(...)** then click on **Apply**."
-msgstr ""
-"En la sección de **Llamadas a Licitación**, marque la casilla **Permitir "
-"usar llamadas a licitación para recibir cotizaciones de varios "
-"proveedores(...)**, y en la sección **Avanzada de Llamadas a Licitación**, "
-"marqué la opción **Avanzada llamada a licitación (...)** después de clic en "
-"**Aplicar**."
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:42
-msgid "Selecting elements of a RFQ/Bid"
-msgstr "Selección de elementos de una RfQ/Oferta"
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:44
-msgid ""
-"Go to :menuselection:`Purchase --> Purchase Tenders`. Create a purchase "
-"tender containing several products, and follow the usual sequence all the "
-"way to the **Bid Selection** status."
-msgstr ""
-"Vaya al :menuselection:`Compras --> Licitaciones de Compra`. Crear una "
-"licitación d compra que contiene varios productos, y siga la secuencia "
-"habitual hasta el final del estado de la **Selección de Oferta**."
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:49
-msgid ""
-"When you closed the call, click on **Choose Product Lines** to access the "
-"list of products and the bids received for all of them."
-msgstr ""
-"Cuando usted cierra una llamada de licitación, haga clic en **Elegir Línea "
-"de Productos** para acceder a la lista de todos los productos y ofertas "
-"recibidas por ellos. "
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:55
-msgid ""
-"Unroll the list of offers you received for each product, and click on the "
-"*v* symbol (**Confirm order**) next to the offers you wish to proceed with. "
-"The lines for which you've confirmed the order turn blue. When you're "
-"finished, click on **Generate PO** to create a purchase order for each "
-"product and supplier."
-msgstr ""
-"Desenrolle la lista de ofertas que ha recibido para cada producto, y haga "
-"clic en el símbolo *v* (**Confirmar Orden**) al lado de las ofertas con las "
-"que desea proceder. Las líneas para las que usted ha confirmado la orden se "
-"turnó azul. Cuando haya terminado, haga clic en **Generar PO** para crear "
-"una orden de compra para cada producto y proveedor."
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:64
-msgid ""
-"When you come back to you purchase tender, you can see that the status has "
-"switched to **PO Created** and that the **Requests for Quotations** now have"
-" a status of **Purchase Order** or **Cancelled**."
-msgstr ""
-"Cuando vuelvas a la licitación de compra, se puede ver que el estado ha "
-"cambiado a **PO Creado** y que las **Solicitudes de Compras** ahora tienen "
-"un estado de **Orden de Compra** o **Cancelado**."
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:72
-msgid ""
-"From there, follow the documentation "
-":doc:`../../overview/process/from_po_to_invoice` to proceed with the "
-"delivery and invoicing."
-msgstr ""
-"Desde allí, siga con los documentos "
-":doc:`../../overview/process/from_po_to_invoice` para proceder con la "
-"entrega y la facturación. "
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:76
-msgid ":doc:`manage_multiple_offers`"
-msgstr ":doc:`manage_multiple_offers`"
 
 #: ../../purchase/replenishment.rst:3
 msgid "Replenishment"
@@ -2984,287 +1871,152 @@ msgid "Replenishment Flows"
 msgstr "Flujo de reposición"
 
 #: ../../purchase/replenishment/flows/compute_date.rst:3
-msgid "How are the order date and scheduled dates computed?"
-msgstr "¿Cómo se calculan la fecha de la orden y las fechas programadas?"
+msgid "Schedule your receipts and deliveries"
+msgstr ""
 
 #: ../../purchase/replenishment/flows/compute_date.rst:5
 msgid ""
-"Scheduled dates are computed in order to be able to plan deliveries, "
-"receptions and so on. Depending on the habits of your company, Odoo "
-"automatically generates scheduled dates via the scheduler. The Odoo "
-"scheduler computes everything per line, whether it's a manufacturing order, "
-"a delivery order, a sale order, etc. The dates that are computed are "
-"dependent on the different leads times configured in Odoo."
+"To manage your supply chain scheduling, you will need to use Odoo *Lead "
+"Times*."
 msgstr ""
-"Las fechas programadas se calculan con el fin de poder planificar las "
-"entregas, recepciones y así sucesivamente. En función de los hábitos de su "
-"empresa, Odoo genera automáticamente las fechas programadas a través del "
-"planificador. El planificador Odoo computa todo por línea, si se trata de "
-"una orden de fabricación, una orden de entrega, una orden de venta, etc. Las"
-" fechas que se calculan son dependientes de las diferentes derivaciones "
-"tiempos configurados en Odoo."
 
-#: ../../purchase/replenishment/flows/compute_date.rst:13
-msgid "Configuring lead times"
-msgstr "Configurando tiempo de entregas"
+#: ../../purchase/replenishment/flows/compute_date.rst:8
+msgid ""
+"*Lead Times* are the expected times needed to receive, deliver or "
+"manufacture products."
+msgstr ""
+
+#: ../../purchase/replenishment/flows/compute_date.rst:12
+msgid "Configure Lead Times"
+msgstr ""
 
 #: ../../purchase/replenishment/flows/compute_date.rst:15
-msgid ""
-"Configuring **lead times** is an essential move in order to compute "
-"scheduled dates. Lead times are the delays (in term of delivery, "
-"manufacturing, ...) promised to your different partners and/or clients. "
-"Configuration of the different lead times are made as follows:"
+msgid "Vendor Lead Time"
 msgstr ""
-"La configuración de los **tiempos de entrega** es un paso esencial para "
-"calcular fechas programadas. Los plazos de entrega son los retrasos (en "
-"términos de suministro, fabricación, ...) prometieron a sus diferentes "
-"socios y/o clientes. La configuración de los diferentes plazos de entrega "
-"que se realizan de la siguiente manera:"
 
-#: ../../purchase/replenishment/flows/compute_date.rst:21
-msgid "On a product level"
-msgstr "En un nivel de producto"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:24
-msgid "Supplier lead time:"
-msgstr "Tiempo de entrega de Proveedor:"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:26
+#: ../../purchase/replenishment/flows/compute_date.rst:17
 msgid ""
-"The supplier lead time is the time needed for the supplier to deliver your "
-"purchased product. To configure the Supplier lead time select a product "
-"(from the Purchase module, go to :menuselection:`Purchase --> Product`), and"
-" go in the **Inventory** tab. You will have to add a **Vendor** to your "
-"product in order to select a supplier lead time."
+"The vendor lead time is the time needed by your vendor to deliver the "
+"product to you."
 msgstr ""
-"El plazo de ejecución de proveedores es el tiempo necesario para el "
-"proveedor para entregar su producto adquirido. Para configurar el tiempo de "
-"espera del proveedor, hay que seleccionar un producto (desde el módulo de "
-"Compra, vaya a:menuselection:`Compras --> Producto`), e ir a la sección "
-"**Inventario**. Usted tendrá que añadir un **Proveedor** a su producto con "
-"el fin de seleccionar un plazo de ejecución de proveedores."
 
-#: ../../purchase/replenishment/flows/compute_date.rst:36
+#: ../../purchase/replenishment/flows/compute_date.rst:20
 msgid ""
-"It is possible to add more than one vendor per product and thus different "
-"delivery lead times depending on the vendor."
+"To configure your vendor lead times, go to a product page, under the "
+"purchase tab, click on a *Vendor* once there you can change the delivery "
+"lead time for that Vendor & Product."
 msgstr ""
-"Es posible añadir más de un proveedor por producto y por lo tanto diferentes"
-" plazos de entrega dependiendo del mismo."
 
-#: ../../purchase/replenishment/flows/compute_date.rst:39
+#: ../../purchase/replenishment/flows/compute_date.rst:28
+msgid "Customer Lead Time"
+msgstr "Plazo de entrega del cliente"
+
+#: ../../purchase/replenishment/flows/compute_date.rst:30
 msgid ""
-"Once a vendor is selected, click on it to open its form and indicate its "
-"delivery lead time."
+"The customer lead time, on the other hand, is the time you need to deliver "
+"the product to your customer."
 msgstr ""
-"Una vez que se selecciona a un proveedor, haga clic en él para abrir su "
-"forma e indicar su tiempo de entrega."
 
-#: ../../purchase/replenishment/flows/compute_date.rst:46
+#: ../../purchase/replenishment/flows/compute_date.rst:33
 msgid ""
-"In this case security days have no influence, the scheduled delivery days "
-"will be equal to: Date of the purchase order + Delivery Lead Time."
+"To configure your customer lead time open a product and go under the "
+"*Inventory* tab. You can then add how many days you need."
 msgstr ""
-"En este caso, los días de seguridad no tienen influencia, los días de "
-"entrega programados serán iguales a: Fecha de la orden de compra + Tiempo de"
-" Entrega de la Iniciativa."
 
-#: ../../purchase/replenishment/flows/compute_date.rst:50
-msgid "Customer lead time"
-msgstr "Tiempo de espera de los clientes"
+#: ../../purchase/replenishment/flows/compute_date.rst:40
+msgid "Manufacturing lead time"
+msgstr ""
+
+#: ../../purchase/replenishment/flows/compute_date.rst:42
+msgid ""
+"The manufacturing lead time is the time you need to manufacture the product."
+msgstr ""
+
+#: ../../purchase/replenishment/flows/compute_date.rst:45
+msgid ""
+"To configure your manufacturing lead time open a product and go under the "
+"*Inventory* tab. You can then add how many days you need."
+msgstr ""
 
 #: ../../purchase/replenishment/flows/compute_date.rst:52
-msgid ""
-"The customer lead time is the time needed to get your product from your "
-"store/warehouse to your customer. It can be configured for any product. "
-"Simply select a product (from the **Sales** module, go to "
-":menuselection:`Sales --> Product`), and go into the **Sales** tab to "
-"indicate your customer lead time."
+msgid "Configure Security Lead Times"
 msgstr ""
-"El tiempo de espera del cliente es el tiempo necesario para obtener su "
-"producto en la tienda/almacén de su cliente. Se puede configurar para "
-"cualquier producto. Sólo tiene que seleccionar un producto (del módulo de "
-"**Ventas**, vaya a :menuselection:`Ventas --> Producto`), y entre en la "
-"pestaña de **Ventas** para indicar su tiempo de espera de los clientes."
 
-#: ../../purchase/replenishment/flows/compute_date.rst:62
-msgid "On the company level"
-msgstr "En el nivel de la compañía"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:64
+#: ../../purchase/replenishment/flows/compute_date.rst:54
 msgid ""
-"On company level, it is possible to parameter **security days** in order to "
-"cope with eventual delays and to be sure to meet your engagements. The idea "
-"is to subtract **backup** days from the computed scheduled date in case of "
-"delays."
+"Odoo also lets you configure *Security Days* allowing you to cope with "
+"potential delays along the supply chain and make sure you meet your "
+"engagements."
 msgstr ""
-"El nivel de la empresa, es posible el parámetro **días de seguridad** con el"
-" fin de hacer frente a los retrasos eventuales y para estar seguros de "
-"satisfacer sus compromisos. La idea es restar días **de seguridad** del "
-"respaldo desde la fecha prevista calculada en caso de retrasos."
 
-#: ../../purchase/replenishment/flows/compute_date.rst:70
-msgid "Sales Safety days"
-msgstr "Días de Seguridad en Ventas"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:72
+#: ../../purchase/replenishment/flows/compute_date.rst:58
 msgid ""
-"Sales Safety days are **back-up** days to ensure you will be able to deliver"
-" your clients engagements on time. They are margins of errors for delivery "
-"lead times. Security days are the same logic as the early wristwatch, in "
-"order to arrive on time. The idea is to subtract the numbers of security "
-"days from the calculation and thus to compute a scheduled date earlier than "
-"the one you promised to your client. That way you are sure to be able to "
-"keep your commitment."
+"The easiest way is to go to *Settings* from any module and type **Lead "
+"Time** in the search bar. From there, tick each box and configure your "
+"various *Security Lead Time* for your needs."
 msgstr ""
-"**Respaldo** de días de seguridad en las ventas son los días para asegurarse"
-" de que será capaz de ofrecer contratos a sus clientes a tiempo. Ellos son "
-"los márgenes de error de los plazos de entrega. Días de seguridad es la "
-"misma lógica que el principio del reloj de pulsera, con el fin de llegar a "
-"tiempo. La idea es restar el número de días de seguridad del cálculo y por "
-"lo tanto para calcular una fecha programada anterior a la que prometiste a "
-"tu cliente. De esa manera usted está seguro de ser capaz de mantener su "
-"compromiso."
 
-#: ../../purchase/replenishment/flows/compute_date.rst:80
+#: ../../purchase/replenishment/flows/compute_date.rst:65
 msgid ""
-"To set up your security dates, go to the app :menuselection:`Settings --> "
-"General settings`, and click on **Configure your company data**."
+"Alternatively, you can go in the settings of the *Inventory* module and "
+"*Manufacturing* module to configure those settings."
+msgstr ""
+
+#: ../../purchase/replenishment/flows/compute_date.rst:69
+msgid "Lead & security times in a use case"
+msgstr ""
+
+#: ../../purchase/replenishment/flows/compute_date.rst:71
+msgid ""
+"For example you sell a car today (January 1st), that is purchased on order, "
+"and you promise to deliver your customer within 20 days (January 20). Here "
+"is your product’s configuration:"
+msgstr ""
+
+#: ../../purchase/replenishment/flows/compute_date.rst:75
+msgid "Security lead time for sales : 1 day"
+msgstr ""
+
+#: ../../purchase/replenishment/flows/compute_date.rst:77
+msgid "Security lead time for purchase : 1 day"
+msgstr ""
+
+#: ../../purchase/replenishment/flows/compute_date.rst:79
+msgid "Vendor delivery lead time : 9 days"
+msgstr ""
+
+#: ../../purchase/replenishment/flows/compute_date.rst:81
+msgid ""
+"In such a scenario, the scheduler will trigger the following events based on"
+" your configuration."
+msgstr ""
+
+#: ../../purchase/replenishment/flows/compute_date.rst:84
+msgid ""
+"January 19: scheduled delivery date (20th January - 1 day of security lead "
+"time for Sales)"
 msgstr ""
-"Para configurar los días de seguridad, vaya al módulo "
-":menuselection:`Configuración --> Configuraciones Generales`, y haga clic en"
-" **Configurar la base de datos de la compañía**."
 
 #: ../../purchase/replenishment/flows/compute_date.rst:87
-msgid "Go the **Configuration** tab to indicate the number of safety days"
-msgstr ""
-"Vaya a la pestaña de **Configuración** para indicar el número de días de "
-"seguridad."
-
-#: ../../purchase/replenishment/flows/compute_date.rst:93
 msgid ""
-"Note that you can in this menu configure a default **Manufacturing** lead "
-"time."
+"January 18: scheduled receipt date (19th January - 1 day of security lead "
+"time for Purchase)"
 msgstr ""
-"Observe que en este menú puede configurar un valor predeterminado "
-"**Fabricación** tiempo de entrega."
 
-#: ../../purchase/replenishment/flows/compute_date.rst:97
-msgid "Purchase days"
-msgstr "Días de Compra"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:99
-msgid "Purchase days response to the same logic than sales security days."
-msgstr ""
-"Días de compra en respuesta a la misma lógica que los días de seguridad en "
-"ventas."
-
-#: ../../purchase/replenishment/flows/compute_date.rst:101
+#: ../../purchase/replenishment/flows/compute_date.rst:90
 msgid ""
-"They are margins of error for vendor lead times. When the system generates "
-"purchase orders for procuring products, they will be scheduled in order to "
-"cope with unexpected vendor delays. Purchase lead time can be found in the "
-"same menu as the sales safety days (see screenshot above)."
+"January 10: order date = deadline to order from your vendor (19th January - "
+"9 days of vendor lead time)"
 msgstr ""
-"Ellos son los márgenes de error de los plazos de entrega de proveedores. "
-"Cuando el sistema genera órdenes de compra para la adquisición de productos,"
-" que serán programadas con el fin de hacer frente a los retrasos de los "
-"proveedores inesperados. Compra de tiempo de espera se puede encontrar en el"
-" mismo menú que los días de seguridad ventas (ver imagen arriba)."
-
-#: ../../purchase/replenishment/flows/compute_date.rst:108
-msgid "On route level"
-msgstr "En un nivel de ruta"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:110
-msgid ""
-"The internal transfers due to the movement of stocks can also influence the "
-"computed date."
-msgstr ""
-"Las transferencias internas debido al movimiento de lo almacenado también "
-"pueden influir en la fecha calculada."
-
-#: ../../purchase/replenishment/flows/compute_date.rst:113
-msgid ""
-"The delays due to internal transfers can be specified in the **Inventory** "
-"module when creating a new push rule for a new route."
-msgstr ""
-"Los retrasos debido a las transferencias internas se pueden especificar en "
-"el módulo de **Inventario** al crear una nueva regla de inserción para una "
-"nueva ruta."
-
-#: ../../purchase/replenishment/flows/compute_date.rst:117
-msgid ""
-"Read the documentation "
-":doc:`../../../../inventory/routes/concepts/push_rule` to learn more."
-msgstr ""
-"Lea el documento :doc:`../../../../inventory/routes/concepts/push_rule` para"
-" conocer más. "
-
-#: ../../purchase/replenishment/flows/compute_date.rst:125
-msgid "On document level:"
-msgstr "En un nivel de documento:"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:128
-msgid "Requested date"
-msgstr "Fecha solicitada"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:130
-msgid ""
-"Odoo offers the possibility to indicate a requested date by the client "
-"straight on the sale order, under the tab **Other information**. If this "
-"date is earlier than the theoretically computed date, Odoo will "
-"automatically display a warning."
-msgstr ""
-"Odoo ofrece la posibilidad de indicar una fecha solicitada por el cliente "
-"directamente en la orden de venta, en la pestaña **Información adicional**. "
-"Si esta fecha es anterior a la fecha calculada teóricamente, Odoo mostrará "
-"automáticamente una advertencia."
-
-#: ../../purchase/replenishment/flows/compute_date.rst:141
-msgid ""
-"As an example, you may sell a car today (January 1st), that is purchased on "
-"order, and you promise to deliver your customer within 20 days (January 20)."
-" In such a scenario, the scheduler may trigger the following events, based "
-"on your configuration:"
-msgstr ""
-"A modo de ejemplo, puede vender un coche hoy (1 de Enero), que se compra en "
-"la orden, y que prometen entregar a su cliente dentro de los 20 días (20 de "
-"Enero). En tal escenario, el organizador puede provocar los siguientes "
-"eventos, en base a su configuración:"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:146
-msgid "January 19: actual scheduled delivery (1 day of Sales Safety days)"
-msgstr ""
-"19 de Enero: entrega programada real (1 día en los días seguridad en ventas)"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:148
-msgid ""
-"January 18: receive the product from your supplier (1 day of Purchase days)"
-msgstr ""
-"18 de Enero: recibir el producto de su proveedor (1 día en los días de "
-"compra)"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:151
-msgid ""
-"January 10: deadline to order at your supplier (9 days of supplier delivery "
-"lead time)"
-msgstr ""
-"10 de Enero: fecha límite para pedir a su proveedor (9 días del tiempo de "
-"espera en la entrega del proveedor)"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:154
-msgid ""
-"January 8: trigger a purchase request to your purchase team, since the team "
-"needs on average 2 days to find the right supplier and order."
-msgstr ""
-"8 de Enero: desencadenar una solicitud de compra a su equipo de la compra, "
-"ya que el equipo necesita un promedio de 2 días para encontrar el proveedor "
-"adecuado y el orden."
 
 #: ../../purchase/replenishment/flows/dropshipping.rst:3
-msgid "How to setup drop-shipping?"
-msgstr "¿Cómo configurar el envío desde el proveedor?"
+msgid "Setup drop-shipping"
+msgstr ""
+
+#: ../../purchase/replenishment/flows/dropshipping.rst:6
+#: ../../purchase/replenishment/multicompany/setup.rst:6
+msgid "Overview"
+msgstr "Información general"
 
 #: ../../purchase/replenishment/flows/dropshipping.rst:8
 msgid ""
@@ -3329,637 +2081,144 @@ msgstr ""
 " la factura de su producto en **Cantidades pedidos**."
 
 #: ../../purchase/replenishment/flows/purchase_triggering.rst:3
-msgid "How to trigger the purchase of products based on sales?"
-msgstr "¿Cómo desencadenar la compra de productos en base a las ventas?"
+msgid "Trigger purchase of products based on sales (Make to Order)"
+msgstr ""
+
+#: ../../purchase/replenishment/flows/purchase_triggering.rst:5
+msgid ""
+"If you don't keep stock of your products, you may need to trigger purchase "
+"orders on each sale you make."
+msgstr ""
 
 #: ../../purchase/replenishment/flows/purchase_triggering.rst:8
 msgid ""
-"When you work in just-in-time, you don't manage stock so you directly order "
-"the product you need from your vendor."
+"Thanks to being a fully integrated solution, Odoo lets you do that easily in"
+" just one step."
 msgstr ""
-"Cuando se trabaja con el tiempo real, usted no maneja el almacén, de modo "
-"que usted pide directamente el producto que necesita de su proveedor."
 
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:11
-msgid "The usual flow is:"
-msgstr "El flujo más común es:"
+#: ../../purchase/replenishment/flows/purchase_triggering.rst:12
+msgid "Configure the product"
+msgstr ""
 
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:13
-msgid "Create a sale order"
-msgstr "Crear una orden de venta"
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:15
-msgid "Purchase the product"
-msgstr "Comprar el producto"
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:17
-msgid "Receive and pay the bill"
-msgstr "Recibir y pagar la factura"
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:19
-msgid "Deliver your product"
-msgstr "Entregar su producto"
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:21
-msgid "Invoice your customer"
-msgstr "Facturación al cliente"
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:24
-msgid "Product configuration"
-msgstr "Configuración del producto"
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:26
+#: ../../purchase/replenishment/flows/purchase_triggering.rst:14
 msgid ""
-"In the purchases application, open the **Purchase** menu and click on "
-"**Products**. Open the product on which you want to do your purchases based "
-"on sales."
+"Open a product form and, under the inventory tab, tick the routes *Buy* and "
+"*Make To Order*."
 msgstr ""
-"En las aplicaciones de las compras, abrir el menú de **Compras** y hacer "
-"clic en **Productos**. Abra el producto en el que usted quiere hacer sus "
-"compras según las ventas."
 
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:30
+#: ../../purchase/replenishment/flows/purchase_triggering.rst:20
+msgid "Don't forget to also set a vendor under the *Purchase* tab."
+msgstr ""
+
+#: ../../purchase/replenishment/flows/purchase_triggering.rst:23
 msgid ""
-"Next to Routes, tick **Buy** and **Make to order** as a procurement method. "
-"When you are generating sales order, Odoo will automatically reorder the "
-"same quantity through procurement."
+"The *Inventory*, *Sales* and *Purchases* modules have to be installed in "
+"Odoo for this feature to work."
 msgstr ""
-"Al lado del Itinerario, marque **Comprar** y **Realizar pedido** como un "
-"método de adquisición. Cuando usted está generando órdenes de venta, Odoo "
-"reordenará automáticamente la misma cantidad a través de las adquisiciones."
 
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:37
-msgid "Don't forget to set a vendor otherwise the rule won't be triggered."
+#: ../../purchase/replenishment/flows/purchase_triggering.rst:27
+msgid "Create a sales order using Buy & MTO"
 msgstr ""
-"No se olvide de configurar un proveedor, de otro modo la regla no se "
-"activará."
 
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:39
+#: ../../purchase/replenishment/flows/purchase_triggering.rst:29
 msgid ""
-"You can also configure minimum stock rules that will trigger the purchase "
-"orders."
+"Create a new sales order with your product. When you confirm the order, a "
+"delivery order is created with the status *Waiting for another operation*."
 msgstr ""
-"Usted también puede configurar las reglas de los valores mínimos que "
-"activarán las órdenes de compra."
 
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:43
+#: ../../purchase/replenishment/flows/purchase_triggering.rst:33
 msgid ""
-"To know how to configure a minimum stock rule, please read the document "
-":doc:`setup_stock_rule`."
+"A new RfQ will automatically be created in your *Purchases* module. Note "
+"that you can see for which SO this RfQ has been created thanks to the "
+"*Source Document* field, visible on the RfQ."
 msgstr ""
-"Para conocer como configurar las reglas de los valores mínimos, por favor "
-"lea el documento :doc:`setup_stock_rule`."
 
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:50
-msgid "Sale order"
-msgstr "Orden de venta"
+#: ../../purchase/replenishment/flows/purchase_triggering.rst:40
+msgid ""
+"When you confirm the RfQ into a purchase order, a receipt is automatically "
+"created and directly accessible from your purchase order with the use of the"
+" *Shipment* button."
+msgstr ""
+
+#: ../../purchase/replenishment/flows/purchase_triggering.rst:47
+msgid ""
+"You can validate the receipt of your products. When you will go back to the "
+"delivery order, you will see that the products are now ready to be shipped."
+msgstr ""
 
 #: ../../purchase/replenishment/flows/purchase_triggering.rst:52
 msgid ""
-"To create a sale order, go to the **Sales** application, "
-":menuselection:`Sales --> Sales order` and create a new sale order."
+"As long as your RfQ is not confirmed, Odoo will keep adding PO Lines "
+"automatically under it."
 msgstr ""
-"Para crear una orden de compra, vaya al módulo de **Ventas**, "
-":menuselection:`Ventas --> Orden de Ventas` y crea una nueva orden de "
-"ventas."
 
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:58
-msgid ""
-"After confirming it, you will see one **Delivery** associated with this sale"
-" order on the **button** on the top of it."
+#: ../../purchase/replenishment/flows/purchase_triggering.rst:57
+msgid ":doc:`../../../purchase/replenishment/flows/setup_stock_rule`"
 msgstr ""
-"Después de confirmarlo, usted verá una **Entrega** asociada con esta orden "
-"de venta en el **botón** en la parte superior del mismo."
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:64
-msgid ""
-"Click on the **Delivery** button to see the transfer order. The status of "
-"the outgoing shipment is **Waiting Another Operation**. It won't be done "
-"until the purchase order is confirmed and received."
-msgstr ""
-"Haga clic en el botón de **Entrega** para ver la orden de transferencia. El "
-"estado del envío de salida es **Esperando Otra Operación**. No se llevará a "
-"cabo hasta que la orden de compra se confirme y se reciba."
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:69
-msgid "Purchase order"
-msgstr "Orden de Compra"
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:71
-msgid ""
-"The purchase order is automatically created. Go to the **Purchase** "
-"application :menuselection:`Purchase --> Request for Quotation`. The source "
-"document is the sale order that triggered the procurement."
-msgstr ""
-"Las órdenes de compra automáticamente se crearán. Vaya a la aplicación de "
-"**Compras** :menuselection:`Compras --> Licitaciones`. El documento de "
-"origen es la orden de venta que desencadenó la adquisición."
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:79
-msgid ""
-"If you make some more sales that trigger procurements to the same vendor, it"
-" will be added to the existing request for quotation. Once it is confirmed, "
-"the next procurements will create a new request for quotation."
-msgstr ""
-"Si hace algunas ventas de más que desencadenen las compras al mismo "
-"proveedor, se añadirán a la solicitud existente para la cita. Una vez que se"
-" confirme, las siguientes adquisiciones crearán una nueva solicitud de "
-"cotización."
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:85
-msgid "Receipt and delivery"
-msgstr "Recibidos y entregados"
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:87
-msgid ""
-"Go the the **Inventory** application. Click on **# To Receive** on the "
-"**Receipts** tile."
-msgstr ""
-"Vaya al módulo de **Inventarios**. Haga clic en **#Para Recibir** en la "
-"sección de **Entradas**."
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:93
-msgid "Select the receipt from your vendor and **Validate** it."
-msgstr "Seleccione la entrada desde el proveedor y **Validar**."
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:98
-msgid ""
-"Go back to the **Inventory** dashboard. In the delivery order, click on **# "
-"To Do**. The delivery order is now ready to ship."
-msgstr ""
-"Vaya al tablero de **Inventarios**. En la liberación de entrega, haga clic "
-"en **# Para hacer**. La orden de entrega ya está lista para enviar."
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:104
-msgid ""
-"The status of the delivery changed from **Waiting Availability** to "
-"**Available**. Validate the transfer to confirm the delivery."
-msgstr ""
-"El estatus de la entrega cambió de **Espera disponibilidad** a "
-"**Disponible**. Validar la transferencia para confirmar la entrega."
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:111
-msgid ":doc:`setup_stock_rule`"
-msgstr ":doc:`setup_stock_rule`"
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:112
-msgid ":doc:`warning_triggering`"
-msgstr ":doc:`warning_triggering`"
 
 #: ../../purchase/replenishment/flows/setup_stock_rule.rst:3
-msgid "How to setup a minimum stock rule?"
-msgstr "¿Cómo configurar una regla de stock mínimo?"
+msgid "Don’t run out of stock thanks to Reordering Rules"
+msgstr ""
 
 #: ../../purchase/replenishment/flows/setup_stock_rule.rst:5
 msgid ""
-"For some items you hold in stock, it might be useful to have rules making "
-"sure you never run out of stocks (for example, products with a high demand, "
-"or large items requiring a lot of storage space meaning they're harder to "
-"stock)."
+"To make sure you never run out of stock, you might want to define "
+"*Reordering Rules* on products. Thanks to reordering rules, Odoo will help "
+"you to replenish your stock when it reaches a minimum stock level."
 msgstr ""
-"Para algunos artículos considerados en almacenamiento, puede ser útil contar"
-" con reglas para asegurarse de que nunca se quede sin existencias (por "
-"ejemplo, los productos con una alta demanda, o artículos de gran tamaño que "
-"requieren una gran cantidad de espacio de almacenamiento es decir donde es "
-"más difícil el almacenamiento)."
 
 #: ../../purchase/replenishment/flows/setup_stock_rule.rst:10
-msgid ""
-"Odoo allows you to set up rules so that an automatic replenishment for those"
-" items is made, based on minimum stocks available."
+msgid "Set a reordering rule"
 msgstr ""
-"Odoo le permite configurar reglas para que se haga una reposición automática"
-" para esos artículos, en base a las existencias mínimas disponibles."
 
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:14
-msgid "When should I use Reordering Rules?"
-msgstr "¿Cuándo se debe utilizar el reordenar las reglas?"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:16
-msgid ""
-"Reordering Rules work best for items that have a high demand and high flow. "
-"It will relieve you from a lot of work to focus on the rest of your "
-"activities knowing that stocks will always be right."
+#: ../../purchase/replenishment/flows/setup_stock_rule.rst:12
+msgid "Open a stockable product, you'll find the *Reordering Rules* tab."
 msgstr ""
-"Reordenar las reglas funciona mejor para los artículos que tienen una alta "
-"demanda y un alto flujo. Se le exime de un montón de trabajo para centrarse "
-"en el resto de sus actividades a sabiendas de que las acciones siempre "
-"estarán bien."
 
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:20
+#: ../../purchase/replenishment/flows/setup_stock_rule.rst:15
 msgid ""
-"It can also be used when you have limited storage space and you need to keep"
-" large items in stock. In this case, you can keep as little as 1 item in "
-"stock, and have a new one ordered as a stock replenishment as soon as the "
-"item in stock is sold."
+"You can also access all your reordering rules from :menuselection:`Inventory"
+" --> Master Data --> Reordering Rules`."
 msgstr ""
-"También puede ser utilizado cuando se tiene espacio de almacenamiento "
-"limitado y donde se necesita mantener los artículos grandes en "
-"almacenamiento. En este caso, se pueden mantener tan poco como 1 artículo "
-"almacenado, y se tiene una nueva ordenada, como la reposición en el artículo"
-" de la acción se vende."
 
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:26
-msgid "When should I avoid Reordering Rules?"
-msgstr "¿Cuándo debo evitar reordenar las reglas?"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:28
+#: ../../purchase/replenishment/flows/setup_stock_rule.rst:21
 msgid ""
-"If you are offering a new product and don't know yet how fast it will go, "
-"you should handle stocks yourself first, and setup reordering rules only a "
-"few months into the sale to have better forecasts of the demand."
+"Once in the next menu, you can create the reordering rules linked to your "
+"product. From now on, every time this product reaches the minimum quantity "
+"it will replenish your stock to your **maximum quantity**."
 msgstr ""
-"Si usted está ofreciendo un producto nuevo y no sabe aún qué tan rápido se "
-"va a vender, usted debe utilizar primero almacenamiento propio, y la "
-"configuración de la reordenación de reglas sólo unos meses después de la "
-"venta para tener mejores previsiones de la demanda."
 
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:32
+#: ../../purchase/replenishment/flows/setup_stock_rule.rst:29
 msgid ""
-"If you sell items that have a limited lifetime, such as fashion items, "
-"technology items, or products working together with a system that is meant "
-"to evolve, you have to be very well informed on when to stop automated "
-"replenishments, in order to avoid having to sell these items at a price that"
-" will not allow you to break even."
-msgstr ""
-"Si usted vende los artículos que tienen una vida útil limitada, tales como "
-"artículos de moda, artículos de tecnología, o productos de trabajo junto con"
-" un sistema que está destinado a evolucionar, tiene que estar muy bien "
-"informado sobre cuándo dejar las reposiciones automatizadas, con el fin de "
-"evitar tener que vender estos artículos a un precio que no permita el punto "
-"de equilibrio."
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:41
-msgid ""
-"My company sells modern furniture. We sell a set of table and chairs that "
-"are available in 4 seatings and 6 seatings."
-msgstr ""
-"Mi empresa vende muebles modernos. Vendemos un conjunto de mesa y sillas que"
-" están disponibles en 4 asientos y 6 asientos."
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:44
-msgid ""
-"To keep things simple, we stock tables and chairs separately, but sell them "
-"all together to our clients as a kit. In order to make sure we can always "
-"deliver a complete set of table and chairs, I setup a Reordering Rule for "
-"the chairs to make sure I always have at least 10 chairs in stock, but no "
-"more than 20. This way, I can sell up to 5 sets of table at once while "
-"keeping my stock low enough not to eat up all my storage space."
-msgstr ""
-"Para simplificar las cosas, tenemos en almacenamiento mesas y sillas por "
-"separado, pero vendemos a todos nuestros clientes las piezas juntas, como un"
-" conjunto. Con el fin de asegurarse de que siempre se puede ofrecer un "
-"completo conjunto de mesa y sillas, se puede configurar una regla de "
-"Reordenación de las sillas para asegurarse de que siempre se tenga al menos "
-"10 sillas en bodega, pero no más de 20. De esta manera, puedo vender hasta 5"
-" juegos de mesa a la vez, manteniendo mis acciones lo suficientemente bajas "
-"como para no desperdiciar todo mi espacio de almacenamiento."
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:52
-msgid ""
-"The last table I sold was a 4 seatings, and there were 12 chairs left in my "
-"stock. Because the stock in chairs is now only 8 chairs, Odoo will "
-"automatically order 12 new chairs to fill up my stock to the maximum amount."
-msgstr ""
-"La última mesa que vendí era una de 4 asientos, y había 12 sillas que "
-"quedaban almacenadas. Debido a que las acciones de las sillas es ahora de "
-"sólo 8 sillas, Odoo ordenará automáticamente 12 sillas nuevas para llenar mi"
-" bodega a la cantidad máxima."
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:61
-msgid "Set up your product"
-msgstr "Configurar su producto"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:63
-msgid ""
-"In the Purchases module, open the Purchase menu and click on Products. Open "
-"the product to which you would like to add a Reordering Rule (or create a "
-"new one)."
-msgstr ""
-"En el módulo de Compras, abra el menú de Compras y haga clic en Productos. "
-"Abra el producto al que desea agregar una regla de Reordenamiento (o crear "
-"uno nuevo)."
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:67
-msgid "3 conditions for correct reordering rule :"
-msgstr "3 condiciones para la regla de volver a ordenar de manera correcta:"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:69
-msgid ""
-"In :menuselection:`General information --> Product type`, make the product "
-"stockable (as soon as this is done, the icon \"Reordering rule will appear)"
-msgstr ""
-"En :menuselection:`Información General --> Tipo de Productos`, hacer el "
-"almacenamiento del producto (tan pronto como sea posible, aparecerá el icono"
-" de \"Reordenación de regla\")"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:71
-msgid ""
-"In :menuselection:`Inventory --> route`, tick the \"Buy\" box (and untick "
-"the Make To Order box)"
-msgstr ""
-"En :menuselection:`Inventario --> ruta`, marque la casilla \"Comprar\" (y "
-"desmarque la casilla Hacer una Orden)"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:73
-msgid ""
-"Select a vendor (don't forget to put a minimal quantity greater than 0)"
-msgstr ""
-"Seleccionar un vendedor (no olvide poner una cantidad mínima superior a 0)"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:76
-msgid "Create a reordering rule"
-msgstr "Crear una Regla de Reordenamiento"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:78
-msgid "Click on the Reordering Rules tab, click on Create. A new page opens."
-msgstr ""
-"Haga clic en la ficha Reordenar las Reglas, después haga clic en Crear. Se "
-"abrirá una nueva página."
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:83
-msgid ""
-"By default, Reordering Rules in Odoo are named as \"OP/XXXXX\" but you are "
-"free to use any nomenclature. You can modify it via the **Name** field."
-msgstr ""
-"Por defecto, el Reordenamiento de Reglas en Odoo aparecerá con el nombre de "
-"\"OP/XXXXX\", pero usted puede usar cualquier nomenclatura. Usted puede "
-"modificar el archivo mediante **Nombre**."
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:86
-msgid "The **Product** field is the product you are creating the rule for."
-msgstr "El archivo **Producto** se creará mediante la regla hecha."
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:88
-msgid ""
-"Select the warehouse to which the product should be delivered in the "
-"**Warehouse** field."
-msgstr ""
-"Seleccione el almacén donde el producto debe ser entregado en el campo "
-"**Almacén**."
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:91
-msgid ""
-"If you have configured multiple warehouses and location, specify the "
-"location in which the product will be stored in the **Location** field."
-msgstr ""
-"Si ha configurado varios almacenes y ubicación, especifiqué la ubicación en "
-"la que el producto se almacenará en el campo **Ubicación**."
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:96
-msgid ""
-":doc:`../../../inventory/settings/warehouses/difference_warehouse_location`"
-msgstr ""
-":doc:`../../../inventory/settings/warehouses/difference_warehouse_location`"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:102
-msgid ""
-"In the **Minimum Quantity** field, insert the quantity to which the system "
-"will trigger a new order for replenishment."
-msgstr ""
-"En el campo *+Cantidad Mínima**, introduzca la cantidad a la que el sistema "
-"activará un nuevo orden para la reposición."
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:105
-msgid ""
-"In the **Maximum Quantity** field, insert the maximum of items that has to "
-"be stocked. The replenishing order will be based on that quantity to "
-"reorder."
-msgstr ""
-"En el campo **Cantidad Máxima**, introduzca el máximo de elementos que tiene"
-" que ser abastecido. La orden de reposición se basa en que la cantidad de "
-"reordenar."
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:109
-msgid ""
-"The **Quantity Multiple** is the lowest number of items that can be ordered "
-"at once. For instance, some items may be only available for purchase in a "
-"set of 2."
-msgstr ""
-"La **Múltilple Cantidad** es el menor número de artículos que se pueden "
-"pedir a la vez. Por ejemplo, algunos artículos pueden sólo estar disponibles"
-" para su compra en un conjunto de 2."
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:113
-msgid ""
-"In the Misc section, the **Active** box allows you to activate or deactivate"
-" the rule."
-msgstr ""
-"En la sección Miscelánea, la sección **Activo** le permite activar o "
-"desactivar la regla."
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:116
-msgid "In the **Lead Time** section, you can enter:"
-msgstr "En la sección **Tiempo de Entrega**, puede introducir:"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:118
-msgid ""
-"the number of Day(s) to purchase: correspond to the number of days for the "
-"supplier to receive the order"
-msgstr ""
-"el número de día(s) para la compra: corresponden al número de días para que "
-"el proveedor reciba la orden"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:120
-msgid "the number of Day(s) to get the products"
-msgstr "el número de día(s) para obtener los productos"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:122
-msgid ""
-"By default, the lead times are in calendar days. You can change that in "
-":menuselection:`Inventory --> Configuration --> Settings --> Minimum Stock "
-"Rules`"
-msgstr ""
-"Por defecto, los plazos de entrega son en días naturales. Usted puede "
-"cambiar eso en :menuselection:`Inventario --> Configuración --> Ajustes --> "
-"Reglas de Mínimos`"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:125
-msgid "When you have entered all the info, click on Save."
-msgstr "Cuando haya introducido toda la información, haga clic en Guardar."
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:127
-msgid ""
-"From now on, every time a product with a reordering rule reaches the minimum"
-" stock, the system will automatically send a RfQ to your supplier based on "
-"your maximum quantity to replenish your stock."
-msgstr ""
-"A partir de ahora, cada vez que un producto con una regla de reordenamiento "
-"alcance las existencias mínimas, el sistema enviará automáticamente un RfQ a"
-" su proveedor basado en su cantidad máxima para reponer sus existencias."
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:131
-msgid ""
-"The replenishments will take place when the scheduler in the Inventory "
+"The replenishments will take place when the scheduler in the *Inventory* "
 "module runs. By default in Odoo, the schedulers will run every night at "
 "12:00PM."
 msgstr ""
-"Las reposiciones se llevarán a cabo cuando el planificador en el módulo de "
-"inventario se ejecute. Por defecto en Odoo, los cambios se ejecutarán todas "
-"las noches a las 12:00 PM."
 
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:135
+#: ../../purchase/replenishment/flows/setup_stock_rule.rst:33
+msgid "See also: :doc:`../../../inventory/management/misc/schedulers`"
+msgstr ""
+
+#: ../../purchase/replenishment/flows/setup_stock_rule.rst:35
 msgid ""
-"To know how to configure and run the schedulers manually, read the document "
-"on :doc:`../../../inventory/management/misc/schedulers`"
+"From now on, every time a product with a reordering rule reaches the minimum"
+" stock, the system will automatically see how to fulfill that need based on "
+"the product configuration (e.g create an RfQ, create an MO, etc.)."
 msgstr ""
-"Para saber cómo configurar y ejecutar los cambios de forma manual, consulte "
-"el documento :doc:`../../../inventory/management/miscellaneous/schedulers`"
 
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:140
-msgid ":doc:`../../../inventory/management/misc/schedulers`"
-msgstr ":doc:`../../../inventory/management/misc/schedulers`"
+#: ../../purchase/replenishment/flows/setup_stock_rule.rst:41
+msgid "Troubleshooting"
+msgstr "Solución de problemas"
 
-#: ../../purchase/replenishment/flows/warning_triggering.rst:3
-#: ../../purchase/replenishment/flows/warning_triggering.rst:69
-msgid "How to trigger a warning when purchasing at a specific vendor?"
-msgstr "¿Cómo activar una advertencia al comprarle a un proveedor específico?"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:8
+#: ../../purchase/replenishment/flows/setup_stock_rule.rst:43
 msgid ""
-"The **Warning Messages and Alerts** module allow you to configure alerts on "
-"the customers and vendors or products."
+"For your reordering rules to work, your product needs to be correctly "
+"configured. If you are using *Buy* route, you need a vendor on the product. "
+"If you are using *Manufacturing* route you will been a BoM on the product. "
+"If the product is not fully configured or there is a mistake in your routes,"
+" a next activity will be logged on the product informing you there is an "
+"issue with the configuration."
 msgstr ""
-"El módulo de **Mensajes de advertencia y Alertas** permite configurar "
-"alertas sobre los clientes y proveedores o sobre los productos."
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:11
-msgid ""
-"You can select the following types of warnings and create different warnings"
-" for purchases and sales:"
-msgstr ""
-"Puede seleccionar los siguientes tipos de advertencias y crear diferentes "
-"advertencias para las compras y ventas:"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:14
-msgid ""
-"Warning: This option displays the warning message during the process, but "
-"allows the user to continue."
-msgstr ""
-"Advertencia: Esta opción muestra el mensaje de advertencia durante el "
-"proceso, pero permite al usuario continuar."
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:17
-msgid ""
-"Blocking Message: The message displays a warning message, but the user "
-"cannot continue the process further."
-msgstr ""
-"El bloqueo de mensajes: El mensaje muestra un mensaje de advertencia, pero "
-"el usuario no puede continuar más en el proceso."
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:24
-msgid "Module Installation"
-msgstr "Instalación de un módulo"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:26
-msgid ""
-"First, you need to install the **Warning Messages and Alerts** module. Go to"
-" **Apps** and look for it (don't forget to remove the **Apps** filter)."
-msgstr ""
-"Primero, necesita instalar el módulo de **Mensaje de advertencia y "
-"Alertas**. Vaya a **Aplicaciones** y véalo (si no lo encuentra, quite el "
-"filtro de **Aplicaciones**)."
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:33
-msgid "Vendor or Customer warnings"
-msgstr "Advertencias de Proveedores o Clientes"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:35
-msgid ""
-"Go to :menuselection:`Purchases --> Vendors` or to :menuselection:`Sales -->"
-" Customers`."
-msgstr ""
-"Vaya a :menuselection:`Compras --> Proveedores` o vaya a "
-":menuselection:`Ventas --> Clientes`."
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:37
-msgid "Open the vendor or the customer and click on the **Warnings** tab."
-msgstr ""
-"Abra el proveedor o el cliente y haga clic en la pestaña de "
-"**Advertencias**."
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:42
-#: ../../purchase/replenishment/flows/warning_triggering.rst:62
-msgid "The available warnings are:"
-msgstr "Las advertencias disponibles son:"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:44
-msgid "Warning on the **Sales Order**"
-msgstr "Cuidado en la **Orden de Ventas**"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:46
-msgid "Warning on the **Purchase Order**"
-msgstr "Cuidado en la **Orden de Compra**"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:48
-msgid "Warning on the **Picking**"
-msgstr "Cuidado en la **Separación**"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:50
-msgid "Warning on the **Invoice**"
-msgstr "Cuidado en la **Facturación**"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:53
-msgid "Product Warnings"
-msgstr "Advertencias de Productos"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:55
-msgid ""
-"Go to :menuselection:`Purchases --> Products` or to :menuselection:`Sales "
-"--> Products`."
-msgstr ""
-"Vaya a :menuselection:`Compras --> Productos`o vaya a :menuselection:`Ventas"
-" --> Productos`."
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:57
-msgid "Open the product and click on the **Notes** tab."
-msgstr "Abra el producto y haga clic en la pestaña de **Notas**."
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:64
-msgid "Warning when selling this product."
-msgstr "Cuidado cuando venda estos productos."
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:66
-msgid "Warning when Purchasing this product."
-msgstr "Cuidado cuando compre este producto."
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:71
-msgid ""
-"Go to the Purchases application, click on :menuselection:`Purchase --> "
-"Vendors`. Go to the **Warnings** tab."
-msgstr ""
-"Vaya a la aplicación Compras, haga clic en :menuselection:`Compras --> "
-"Proveedores`. Vaya a la pestaña de **Advertencias**."
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:74
-msgid ""
-"Under **Warning on the Purchase Order**, choose **Warning** and write your "
-"warning."
-msgstr ""
-"Debajo **Cuidado en la Orden de Compra**, seleccione **Advertencia** y "
-"escriba su advertencia."
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:80
-msgid ""
-"Create a **Request for Quotation**. Go to :menuselection:`Purchase --> "
-"Request for Quotation` and click on **Create**. Choose the vendor on which a"
-" warning was set."
-msgstr ""
-"Crear una **Licitación**. Vaya a :menuselection:`Compras --> Licitaciones` y"
-" haga clic en **Crear**. Seleccione el proveedor en el cual se creó la "
-"advertencia."
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:84
-msgid "When choosing the vendor, the warning will appear."
-msgstr "Cuando seleccione un proveedor, la advertencia aparecerá."
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:90
-msgid ""
-"If you set a blocking message instead of a warning message, you won't be "
-"able to choose the vendor."
-msgstr ""
-"Si usted configura un mensaje de bloqueo al instante de la advertencia de "
-"mensaje, usted no verá disponible al proveedor que seleccionó."
 
 #: ../../purchase/replenishment/multicompany.rst:3
 msgid "Multi-Companies"
@@ -4051,86 +2310,3 @@ msgid ""
 msgstr ""
 "Con el fin de poder gestionar las reglas entre empresas, asegúrese de que su"
 " usuario tiene los derechos para gestionar las empresas."
-
-#: ../../purchase/replenishment/trouble_shooting.rst:3
-msgid "Trouble-Shooting"
-msgstr "Solución de problemas"
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:3
-msgid "How to check that everything is working fine?"
-msgstr "¿Cómo comprobar que todo está funcionando de manera correcta?"
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:6
-msgid "Vendor Bills"
-msgstr "Facturas de proveedor"
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:8
-msgid ""
-"Even if you don't have the rights to the accounting application, you can "
-"still control the vendor bills."
-msgstr ""
-"Incluso si usted no tiene los derechos del módulo de contabilidad, usted "
-"puede controlar las facturas de proveedor."
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:11
-msgid ""
-"Go to the **Purchases** application: :menuselection:`Control --> Vendor "
-"Bills`."
-msgstr ""
-"Vaya al módulo de **Compras** :menuselection:`Control --> Facturas de "
-"Provedor`."
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:17
-msgid "Incoming Products"
-msgstr "Productos entrantes"
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:19
-msgid ""
-"Even if you don't have the rights to the inventory application, you can "
-"still control the incoming products."
-msgstr ""
-"Incluso si usted no tiene los derechos del módulo de inventario, usted puede"
-" controlar los productos entrantes."
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:22
-msgid ""
-"Go to the **Purchases** application: :menuselection:`Control --> Incoming "
-"Products`."
-msgstr ""
-"Vaya al módulo de **Compras** :menuselection:`Control --> Productos "
-"Entrantes`."
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:28
-msgid "Procurements exceptions"
-msgstr "Excepción de Adquisiciones"
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:30
-msgid "Here, you need the **Inventory Manager** access rights."
-msgstr ""
-"Aquí, usted necesita acceder a los derechos de la **Gestión de "
-"Inventarios**."
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:32
-msgid ""
-"Go to the **Inventory** application: :menuselection:`Control --> Procurement"
-" Exceptions`."
-msgstr ""
-"Vaya al módulo de **Inventarios** :menuselection:`Control --> Excepción de "
-"Adquisiciones`."
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:37
-msgid ""
-"To understand why the procurement is not running, open the exception and "
-"check the message in the chatter."
-msgstr ""
-"Para entender porque las adquisiciones no están corriendo, habrá las "
-"excepciones y revise el mensaje en la conversación."
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:43
-msgid ""
-"Usually, the problem is located on the procurement rules. Either there are "
-"no stock rules, or there are no vendor associated to a product."
-msgstr ""
-"Normalmente, el problema está localizado en las reglas de adquisiciones. Ya "
-"sea que no están las reglas de almacén, o que no hay proveedores asociados "
-"al producto."
diff --git a/locale/es/LC_MESSAGES/recruitment.po b/locale/es/LC_MESSAGES/recruitment.po
index 92aac84a0..f7e14871c 100644
--- a/locale/es/LC_MESSAGES/recruitment.po
+++ b/locale/es/LC_MESSAGES/recruitment.po
@@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-11-22 13:16+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Pedro M. Baeza <pedro.baeza@gmail.com>, 2017\n"
+"Last-Translator: Martin Trigaux, 2018\n"
 "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,4 +20,4 @@ msgstr ""
 
 #: ../../recruitment.rst:5
 msgid "Recruitment"
-msgstr "Proceso de selección"
+msgstr "Proceso de Selección"
diff --git a/locale/es/LC_MESSAGES/sales.po b/locale/es/LC_MESSAGES/sales.po
index 816a511da..bbef3abf5 100644
--- a/locale/es/LC_MESSAGES/sales.po
+++ b/locale/es/LC_MESSAGES/sales.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-23 12:10+0200\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Jesus Chaparro <hawsue4@gmail.com>, 2017\n"
+"Last-Translator: Nicole Kist <nki@odoo.com>, 2018\n"
 "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -278,792 +278,440 @@ msgstr ""
 msgid "Invoicing Method"
 msgstr "Método de facturación"
 
-#: ../../sales/invoicing/services.rst:3
-msgid "Services"
-msgstr "Servicios"
+#: ../../sales/invoicing/down_payment.rst:3
+msgid "Request a down payment"
+msgstr ""
 
-#: ../../sales/invoicing/services/milestones.rst:3
-msgid "How to invoice milestones of a project?"
-msgstr "¿Cómo facturar hitos de un proyecto?"
-
-#: ../../sales/invoicing/services/milestones.rst:5
+#: ../../sales/invoicing/down_payment.rst:5
 msgid ""
-"There are different kind of service sales: prepaid volume of hours/days "
-"(e.g. support contract), billing based on time and material (e.g. billing "
-"consulting hours) or a fixed price contract (e.g. a project)."
+"A down payment is an initial, partial payment, with the agreement that the "
+"rest will be paid later. For expensive orders or projects, it is a way to "
+"protect yourself and make sure your customer is serious."
 msgstr ""
-"Existen distintos tipos de servicios de ventas: cantidad prepagado de "
-"horas/días (e.g. contrato de soporte), facturación basada en tiempo y "
-"material (e.g. facturar horas de consultoría) o un precio fijo de contrato "
-"(e.g. un proyecto)."
 
-#: ../../sales/invoicing/services/milestones.rst:9
+#: ../../sales/invoicing/down_payment.rst:10
+msgid "First time you request a down payment"
+msgstr ""
+
+#: ../../sales/invoicing/down_payment.rst:12
 msgid ""
-"In this section, we will have a look at how to invoice milestones of a "
-"project."
+"When you confirm a sale, you can create an invoice and select a down payment"
+" option. It can either be a fixed amount or a percentage of the total "
+"amount."
 msgstr ""
-"En esta sección, echaremos un vistazo a como facturar hitos de un proyecto."
 
-#: ../../sales/invoicing/services/milestones.rst:12
+#: ../../sales/invoicing/down_payment.rst:16
 msgid ""
-"Milestone invoicing can be used for expensive or large scale projects, with "
-"each milestone representing a clear sequence of work that will incrementally"
-" build up to the completion of the contract. For example, a marketing agency"
-" hired for a new product launch could break down a project into the "
-"following milestones, each of them considered as one service with a fixed "
-"price on the sale order :"
+"The first time you request a down payment you can select an income account "
+"and a tax setting that will be reused for next down payments."
 msgstr ""
-"La facturación de proyectos se puede utilizar para proyectos costosos o de "
-"gran escala, con cada meta que representa una secuencia clara de trabajo que"
-" progresivamente se acumulará a la finalización del contrato. Por ejemplo, "
-"una agencia de marketing contratado para un nuevo lanzamiento del producto "
-"podría descomponer un proyecto en los siguientes proyectos, cada uno de "
-"ellos considerado como uno de servicio con un precio fijado en la orden de "
-"venta:"
 
-#: ../../sales/invoicing/services/milestones.rst:19
-msgid "Milestone 1 : Marketing strategy audit - 5 000 euros"
-msgstr "Hito 1: Auditoría de estrategia de mercadeo - 5 000 euros"
+#: ../../sales/invoicing/down_payment.rst:22
+msgid "You will then see the invoice for the down payment."
+msgstr ""
 
-#: ../../sales/invoicing/services/milestones.rst:21
-msgid "Milestone 2 : Brand Identity - 10 000 euros"
-msgstr "Hito 2: Identidad de marca - 10 000 euros"
-
-#: ../../sales/invoicing/services/milestones.rst:23
-msgid "Milestone 3 : Campaign launch & PR - 8 500 euros"
-msgstr "Hito 3: Lanzamiento de campaña & RP - 8 500 euros"
-
-#: ../../sales/invoicing/services/milestones.rst:25
+#: ../../sales/invoicing/down_payment.rst:27
 msgid ""
-"In this case, an invoice will be sent to the customer each time a milestone "
-"will be successfully reached. That invoicing method is comfortable both for "
-"the company which is ensured to get a steady cash flow throughout the "
-"project lifetime and for the client who can monitor the project's progress "
-"and pay in several times."
+"On the subsequent or final invoice, any prepayment made will be "
+"automatically deducted."
 msgstr ""
-"En este caso, la factura se enviará al cliente cada vez que la meta se haya "
-"concretado con éxito. Ese método de facturación es cómodo tanto para la "
-"empresa que se asegura de obtener un flujo de efectivo constante durante "
-"toda la vida del proyecto y para el cliente que pueden monitorear el "
-"progreso del proyecto y pagar en varias ocasiones."
 
-#: ../../sales/invoicing/services/milestones.rst:32
+#: ../../sales/invoicing/down_payment.rst:34
+msgid "Modify the income account and customer taxes"
+msgstr ""
+
+#: ../../sales/invoicing/down_payment.rst:36
+msgid "From the products list, search for *Down Payment*."
+msgstr ""
+
+#: ../../sales/invoicing/down_payment.rst:41
 msgid ""
-"You can also use milestones to invoice percentages of the entire project. "
-"For example, for a million euros project, your company might require a 15% "
-"upfront payment, 30% at the midpoint and the balance at the contract "
-"conclusion. In that case, each payment will be considered as one milestone."
+"You can then edit it, under the invoicing tab you will be able to change the"
+" income account & customer taxes."
 msgstr ""
-"También puede usar la facturación de proyecto por porcentajes del proyecto "
-"entero. Por ejemplo, un millón de euros por proyecto, su empresa puede "
-"requerir un pago inicial del 15%, 30% en el punto medio y el saldo al cierre"
-" del contrato. En ese caso, cada pago se considerará como una meta."
 
-#: ../../sales/invoicing/services/milestones.rst:39
-#: ../../sales/invoicing/services/reinvoice.rst:26
-#: ../../sales/invoicing/services/reinvoice.rst:95
-#: ../../sales/invoicing/services/support.rst:17
-#: ../../sales/send_quotations/quote_template.rst:10
-msgid "Configuration"
-msgstr "Configuración"
-
-#: ../../sales/invoicing/services/milestones.rst:42
-msgid "Install the Sales application"
-msgstr "Instalar la aplicación de Ventas"
-
-#: ../../sales/invoicing/services/milestones.rst:44
-#: ../../sales/invoicing/services/reinvoice.rst:28
-msgid ""
-"In order to sell services and to send invoices, you need to install the "
-"**Sales** application, from the **Apps** icon."
+#: ../../sales/invoicing/expense.rst:3
+msgid "Re-invoice expenses to customers"
 msgstr ""
-"Con el fin de vender servicios y enviar facturas, es necesario instalar el "
-"módulo de **Ventas**, desde el icono de **Aplicaciones**."
 
-#: ../../sales/invoicing/services/milestones.rst:51
-msgid "Create products"
-msgstr "Crear productos"
-
-#: ../../sales/invoicing/services/milestones.rst:53
-msgid ""
-"In Odoo, each milestone of your project is considered as a product. From the"
-" **Sales** application, use the menu :menuselection:`Sales --> Products`, "
-"create a new product with the following setup:"
-msgstr ""
-"En Odoo, cada meta del proyecto es considerada como un producto. Desde el "
-"módulo de **Ventas**, usa el :menuselection:`Ventas --> Productos`, crear un"
-" nuevo producto con los siguientes pasos a seguir:"
-
-#: ../../sales/invoicing/services/milestones.rst:57
-msgid "**Name**: Strategy audit"
-msgstr "**Nombre**: Auditoría de estrategia"
-
-#: ../../sales/invoicing/services/milestones.rst:59
-#: ../../sales/invoicing/services/support.rst:50
-msgid "**Product Type**: Service"
-msgstr "**Tipo de producto**: Servicio"
-
-#: ../../sales/invoicing/services/milestones.rst:61
-msgid ""
-"**Invoicing Policy**: Delivered Quantities, since you will invoice your "
-"milestone after it has been delivered"
-msgstr ""
-"**Política de facturación**: Las cantidades entregadas, ya que va a facturar"
-" la meta después de haber sido entregada"
-
-#: ../../sales/invoicing/services/milestones.rst:64
-msgid ""
-"**Track Service**: Manually set quantities on order, as you complete each "
-"milestone, you will manually update their quantity from the **Delivered** "
-"tab on your sale order"
-msgstr ""
-"**Servicio de Rastreo**: ajusta manualmente cantidades en orden, a medida "
-"que completa cada meta, usted puede actualizar manualmente su cantidad en la"
-" pestaña **Entregado** en su pedido la venta"
-
-#: ../../sales/invoicing/services/milestones.rst:72
-msgid "Apply the same configuration for the others milestones."
-msgstr "Aplica la misma configuración para las otras metas del proyecto."
-
-#: ../../sales/invoicing/services/milestones.rst:75
-msgid "Managing your project"
-msgstr "Gestionando su proyecto"
-
-#: ../../sales/invoicing/services/milestones.rst:78
-msgid "Quotations and sale orders"
-msgstr "Órdenes de venta y Cotizaciones"
-
-#: ../../sales/invoicing/services/milestones.rst:80
-msgid ""
-"Now that your milestones (or products) are created, you can create a "
-"quotation or a sale order with each line corresponding to one milestone. For"
-" each line, set the **Ordered Quantity** to ``1`` as each milestone is "
-"completed once. Once the quotation is confirmed and transformed into a sale "
-"order, you will be able to change the delivered quantities when the "
-"corresponding milestone has been achieved."
-msgstr ""
-"Ahora que sus metas (o productos) se han creado, se puede crear un "
-"presupuesto o una orden de venta con cada línea correspondiente a una meta. "
-"Para cada línea, establezca la **Cantidad a Ordenar** a `` 1`` como cada "
-"meta se completa una vez. Una vez que la cita se confirma y se transforma en"
-" una orden de venta, usted será capaz de cambiar las cantidades entregadas "
-"cuando la meta correspondiente se ha logrado."
-
-#: ../../sales/invoicing/services/milestones.rst:91
-msgid "Invoice milestones"
-msgstr "Facturar hitos"
-
-#: ../../sales/invoicing/services/milestones.rst:93
-msgid ""
-"Let's assume that your first milestone (the strategy audit) has been "
-"successfully delivered and you want to invoice it to your customer. On the "
-"sale order, click on **Edit** and set the **Delivered Quantity** of the "
-"related product to ``1``."
-msgstr ""
-"Vamos a suponer que su primera meta (la auditoría estratégica) se ha "
-"entregado con éxito y se desea facturar a su cliente. En la orden de venta, "
-"haga clic en **Editar** y establecer la **Cantidad a Entregar** relacionada "
-"al producto `` 1``."
-
-#: ../../sales/invoicing/services/milestones.rst:99
-msgid ""
-"As soon as the above modification has been saved, you will notice that the "
-"color of the line has changed to blue, meaning that the service can now be "
-"invoiced. In the same time, the invoice status of the SO has changed from "
-"**Nothing To Invoice** to **To Invoice**"
-msgstr ""
-"Tan pronto como la modificación anterior se ha guardado, te darás cuenta de "
-"que el color de la línea ha cambiado a azul, lo que significa que el "
-"servicio ya se puede facturar. En el mismo tiempo, el estado de la factura "
-"del SO ha cambiado de **Nada a facturar** a **Facturado**"
-
-#: ../../sales/invoicing/services/milestones.rst:104
-msgid ""
-"Click on **Create invoice** and, in the new window that pops up, select "
-"**Invoiceable lines** and validate. It will create a new invoice (in draft "
-"status) with only the **strategy audit** product as invoiceable."
-msgstr ""
-"Haga clic en **Crear factura** y, en la nueva ventana que aparece, "
-"seleccionar **Líneas a facturar** y validar. Se va a crear una nueva factura"
-" (en el proyecto de estado) sólo con la **estrategia de auditoría** producto"
-" como facturable."
-
-#: ../../sales/invoicing/services/milestones.rst:112
-msgid ""
-"In order to be able to invoice a product, you need to set up the "
-"**Accounting** application and to configure an accounting journal and a "
-"chart of account. Click on the following link to learn more: "
-":doc:`../../../accounting/overview/getting_started/setup`"
-msgstr ""
-"Con el fin de ser capaz de facturar un producto, es necesario configurar el "
-"módulo de **Contabilidad** y configurar un diario de contabilidad y un "
-"gráfico de la cuenta. Haga clic en el siguiente enlace para obtener más "
-"información: :doc:`../../../accounting/overview/getting_started/setup`"
-
-#: ../../sales/invoicing/services/milestones.rst:117
-msgid ""
-"Back on your sale order, you will notice that the **Invoiced** column of "
-"your order line has been updated accordingly and that the **Invoice Status**"
-" is back to **Nothing to Invoice**."
-msgstr ""
-"De regreso en la orden de venta, te darás cuenta de que en la columna "
-"**Factura** de su línea de pedido ha sido actualizado en consecuencia y que "
-"el **Estado Factura** está de nuevo a **Nada facturado**."
-
-#: ../../sales/invoicing/services/milestones.rst:121
-msgid "Follow the same workflow to invoice your remaining milestones."
-msgstr ""
-"Siga el mismo flujo de trabajo para cada factura de sus proyectos restantes."
-
-#: ../../sales/invoicing/services/milestones.rst:124
-msgid ":doc:`reinvoice`"
-msgstr ":doc:`reinvoice`"
-
-#: ../../sales/invoicing/services/milestones.rst:125
-#: ../../sales/invoicing/services/reinvoice.rst:185
-msgid ":doc:`support`"
-msgstr ":doc:`support`"
-
-#: ../../sales/invoicing/services/reinvoice.rst:3
-msgid "How to re-invoice expenses to your customers?"
-msgstr "¿Cómo volver a facturar gastos a sus clientes?"
-
-#: ../../sales/invoicing/services/reinvoice.rst:5
+#: ../../sales/invoicing/expense.rst:5
 msgid ""
 "It often happens that your employees have to spend their personal money "
 "while working on a project for your client. Let's take the example of an "
-"employee paying a parking spot for a meeting with your client. As a company,"
+"consultant paying an hotel to work on the site of your client. As a company,"
 " you would like to be able to invoice that expense to your client."
 msgstr ""
-"A menudo sucede que sus empleados tienen que gastar dinero personal mientras"
-" se trabaja en un proyecto para el cliente. Tomemos el ejemplo de un "
-"empleado paga un ticket de estacionamiento para una reunión con el cliente. "
-"Como empresa, a usted le gustaría ser capaz de facturar ese gasto al "
-"cliente."
 
-#: ../../sales/invoicing/services/reinvoice.rst:11
+#: ../../sales/invoicing/expense.rst:12
+#: ../../sales/invoicing/time_materials.rst:64
+msgid "Expenses configuration"
+msgstr ""
+
+#: ../../sales/invoicing/expense.rst:14
+#: ../../sales/invoicing/time_materials.rst:66
 msgid ""
-"In this documentation we will see two use cases. The first, very basic, "
-"consists of invoicing a simple expense to your client like you would do for "
-"a product. The second, more advanced, will consist of invoicing expenses "
-"entered in your expense system by your employees directly to your customer."
+"To track & invoice expenses, you will need the expenses app. Go to "
+":menuselection:`Apps --> Expenses` to install it."
 msgstr ""
-"En esta documentación veremos dos casos de uso. El primero, muy básico, "
-"consiste en facturar una simple cifra para el cliente como la deseada para "
-"el producto. La segunda, más avanzada, consiste en facturar los costos "
-"completos en su sistema de gastos por sus empleados directamente a su "
-"cliente."
 
-#: ../../sales/invoicing/services/reinvoice.rst:18
-msgid "Use case 1: Simple expense invoicing"
-msgstr "Caso de uso 1: Facturación sencilla de gastos"
-
-#: ../../sales/invoicing/services/reinvoice.rst:20
+#: ../../sales/invoicing/expense.rst:17
+#: ../../sales/invoicing/time_materials.rst:69
 msgid ""
-"Let's take the following example. You are working on a promotion campaign "
-"for one of your customers (``Agrolait``) and you have to print a lot of "
-"copies. Those copies are an expense for your company and you would like to "
-"invoice them."
+"You should also activate the analytic accounts feature to link expenses to "
+"the sales order, to do so, go to :menuselection:`Invoicing --> Configuration"
+" --> Settings` and activate *Analytic Accounting*."
 msgstr ""
-"Tomemos el siguiente ejemplo. Usted está trabajando en una campaña de "
-"promoción para uno de sus clientes (``Agrolait``) y tiene que imprimir "
-"muchas copias. Estas copias son un gasto para su empresa y que le gustaría "
-"facturarlas a ellos."
 
-#: ../../sales/invoicing/services/reinvoice.rst:35
-msgid "Create product to be expensed"
-msgstr "Crear producto para ser gastado"
+#: ../../sales/invoicing/expense.rst:22
+#: ../../sales/invoicing/time_materials.rst:74
+msgid "Add expenses to your sales order"
+msgstr ""
 
-#: ../../sales/invoicing/services/reinvoice.rst:37
-msgid "You will need now to create a product called ``Copies``."
-msgstr "Ahora necesitará crear un producto llamado \"Copias\"."
-
-#: ../../sales/invoicing/services/reinvoice.rst:39
-#: ../../sales/invoicing/services/reinvoice.rst:112
+#: ../../sales/invoicing/expense.rst:24
+#: ../../sales/invoicing/time_materials.rst:76
 msgid ""
-"From your **Sales** module, go to :menuselection:`Sales --> Products` and "
-"create a product as follows:"
+"From the expense app, you or your consultant can create a new one, e.g. the "
+"hotel for the first week on the site of your customer."
 msgstr ""
-"Desde el módulo de **Ventas**, vaya a :menuselection:`Ventas --> Productos` "
-"y crea un producto como sigue:"
 
-#: ../../sales/invoicing/services/reinvoice.rst:42
-msgid "**Product type**: consumable"
-msgstr "**Tipo de Producto**: consumible"
-
-#: ../../sales/invoicing/services/reinvoice.rst:44
+#: ../../sales/invoicing/expense.rst:27
+#: ../../sales/invoicing/time_materials.rst:79
 msgid ""
-"**Invoicing policy**: on delivered quantities (you will manually set the "
-"quantities to invoice on the sale order)"
+"You can then enter a relevant description and select an existing product or "
+"create a new one from right there."
 msgstr ""
-"**Políticas de Facturación**: en entrega de cantidades (usted puede "
-"configurar manualmente las cantidades a facturar en la orden de venta)"
 
-#: ../../sales/invoicing/services/reinvoice.rst:51
-msgid "Create a sale order"
-msgstr "Crear una orden de venta"
+#: ../../sales/invoicing/expense.rst:33
+#: ../../sales/invoicing/time_materials.rst:85
+msgid "Here, we are creating a *Hotel* product:"
+msgstr ""
 
-#: ../../sales/invoicing/services/reinvoice.rst:53
+#: ../../sales/invoicing/expense.rst:38
 msgid ""
-"Now that your product is correctly set up, you can create a sale order for "
-"that product (from the menu :menuselection:`Sales --> Sales Orders`) with "
-"the ordered quantities set to 0. Click on **Confirm the Sale** to create the"
-" sale order. You will be able then to manually change the delivered "
-"quantities on the sale order to reinvoice the copies to your customer."
+"Under the invoicing tab, select *Delivered quantities* and either *At cost* "
+"or *Sales price* as well depending if you want to invoice the cost of your "
+"expense or a previously agreed on sales price."
 msgstr ""
-"Ahora que su producto está correctamente configurado, puede crear una orden "
-"de venta de ese producto (en el menú :menuselection:`Ventas --> Órdenes de "
-"Venta`) con las cantidades pedidas establecidos a 0. Haga clic en "
-"**Confirmar la venta** para crear la orden de venta. Podrá entonces que "
-"cambiar manualmente las cantidades entregadas en la orden de venta al "
-"refacturadas las copias a su cliente."
 
-#: ../../sales/invoicing/services/reinvoice.rst:64
-#: ../../sales/invoicing/services/reinvoice.rst:177
-msgid "Invoice expense to your client"
-msgstr "Facturar gastos a su cliente"
-
-#: ../../sales/invoicing/services/reinvoice.rst:66
+#: ../../sales/invoicing/expense.rst:45
+#: ../../sales/invoicing/time_materials.rst:97
 msgid ""
-"At the end of the month, you have printed ``1000`` copies on behalf of your "
-"client and you want to re-invoice them. From the related sale order, click "
-"on **Delivered Quantities**, manually enter the correct amount of copies and"
-" click on **Save**. Your order line will turn blue, meaning that it is ready"
-" to be invoiced. Click on **Create invoice**."
+"To modify or create more products go to :menuselection:`Expenses --> "
+"Configuration --> Expense products`."
 msgstr ""
-"Al final del mes, usted tendrá ``1000`` copias impresas en nombre de su "
-"cliente y desea volver a facturarles a ellos. De la orden de venta "
-"relacionada, haga clic en **Cantidades entregadas**, introduzca manualmente "
-"la cantidad correcta de copias y haga clic en **Guardar**. La línea de orden"
-" se cambiará a azul, lo que significa que está lista para ser facturada. "
-"Haga clic en **Crear factura**."
 
-#: ../../sales/invoicing/services/reinvoice.rst:73
+#: ../../sales/invoicing/expense.rst:48
+#: ../../sales/invoicing/time_materials.rst:100
 msgid ""
-"The total amount on your sale order will be of 0 as it is computed on the "
-"ordered quantities. It is your invoice which will compute the correct amount"
-" due by your customer."
+"Back on the expense, add the original sale order in the expense to submit."
 msgstr ""
-"La cantidad total de su orden de venta será de 0, ya que se calcula sobre "
-"las cantidades pedidas. Es la factura que calcular la cantidad correcta "
-"debido por su cliente."
 
-#: ../../sales/invoicing/services/reinvoice.rst:77
+#: ../../sales/invoicing/expense.rst:54
+#: ../../sales/invoicing/time_materials.rst:106
+msgid "It can then be submitted to the manager, approved and finally posted."
+msgstr ""
+
+#: ../../sales/invoicing/expense.rst:65
+#: ../../sales/invoicing/time_materials.rst:117
+msgid "It will then be in the sales order and ready to be invoiced."
+msgstr ""
+
+#: ../../sales/invoicing/invoicing_policy.rst:3
+msgid "Invoice based on delivered or ordered quantities"
+msgstr ""
+
+#: ../../sales/invoicing/invoicing_policy.rst:5
 msgid ""
-"The invoice generated is in draft, so you can always control the quantities "
-"and change the amount if needed. You will notice that the amount to be "
-"invoiced is based here on the delivered quantities."
+"Depending on your business and what you sell, you have two options for "
+"invoicing:"
 msgstr ""
-"La factura generada es en borrador, por lo que siempre puede controlar las "
-"cantidades y cambiar la cantidad si es necesario. Usted se dará cuenta de "
-"que la cantidad a facturar se basa aquí en las cantidades entregadas."
 
-#: ../../sales/invoicing/services/reinvoice.rst:84
-msgid "Click on validate to issue the payment to your customer."
-msgstr "Click en validar para emitir el pago a su cliente."
-
-#: ../../sales/invoicing/services/reinvoice.rst:87
-msgid "Use case 2: Invoice expenses via the expense module"
-msgstr "Caso de uso 2: Los gastos de facturas a través del módulo de gastos"
-
-#: ../../sales/invoicing/services/reinvoice.rst:89
+#: ../../sales/invoicing/invoicing_policy.rst:8
 msgid ""
-"To illustrate this case, let's imagine that your company sells some "
-"consultancy service to your customer ``Agrolait`` and both parties agreed "
-"that the distance covered by your consultant will be re-invoiced at cost."
+"Invoice on ordered quantity: invoice the full order as soon as the sales "
+"order is confirmed."
 msgstr ""
-"Para ilustrar este caso, vamos a imaginar que su empresa vende algún "
-"servicio de consultoría para el cliente ``Agrolait`` y ambas partes "
-"acordaron que la distancia recorrida por el consultor se volverá a facturar "
-"al costo."
 
-#: ../../sales/invoicing/services/reinvoice.rst:97
-msgid "Here, you will need to install two more modules:"
-msgstr "Aquí, necesitará instalar dos módulos más:"
-
-#: ../../sales/invoicing/services/reinvoice.rst:99
-msgid "Expense Tracker"
-msgstr "Control de gastos"
-
-#: ../../sales/invoicing/services/reinvoice.rst:101
+#: ../../sales/invoicing/invoicing_policy.rst:10
 msgid ""
-"Accounting, where you will need to activate the analytic accounting from the"
-" settings"
+"Invoice on delivered quantity: invoice on what you delivered even if it's a "
+"partial delivery."
 msgstr ""
-"Contabilidad, donde usted necesitará activar la contabilidad analítica desde"
-" la configuración"
 
-#: ../../sales/invoicing/services/reinvoice.rst:108
-msgid "Create a product to be expensed"
-msgstr "Crear un producto que se va a gastos"
-
-#: ../../sales/invoicing/services/reinvoice.rst:110
-msgid "You will now need to create a product called ``Kilometers``."
-msgstr "Ahora usted necesitará crear un producto llamado ``Kilómetros``. "
-
-#: ../../sales/invoicing/services/reinvoice.rst:115
-msgid "Product can be expensed"
-msgstr "El producto puede ser gastado"
-
-#: ../../sales/invoicing/services/reinvoice.rst:117
-msgid "Product type: Service"
-msgstr "Tipo de Producto: Servicio"
-
-#: ../../sales/invoicing/services/reinvoice.rst:119
-msgid "Invoicing policy: invoice based on time and material"
-msgstr "Política de facturación: facturas basadas en tiempo y material"
-
-#: ../../sales/invoicing/services/reinvoice.rst:121
-msgid "Expense invoicing policy: At cost"
-msgstr "Política de facturación de gastos: Al costo"
-
-#: ../../sales/invoicing/services/reinvoice.rst:123
-msgid "Track service: manually set quantities on order"
+#: ../../sales/invoicing/invoicing_policy.rst:13
+msgid "Invoice on ordered quantity is the default mode."
 msgstr ""
-"Servicio de Rastreo: configuración manual de las cantidades en la orden"
 
-#: ../../sales/invoicing/services/reinvoice.rst:129
-msgid "Create a sales order"
-msgstr "Crear una órden de venta"
-
-#: ../../sales/invoicing/services/reinvoice.rst:131
+#: ../../sales/invoicing/invoicing_policy.rst:15
 msgid ""
-"Still from the Sales module, go to :menuselection:`Sales --> Sales Orders` "
-"and add your product **Consultancy** on the order line."
+"The benefits of using *Invoice on delivered quantity* depends on your type "
+"of business, when you sell material, liquids or food in large quantities the"
+" quantity might diverge a little bit and it is therefore better to invoice "
+"the actual delivered quantity."
 msgstr ""
-"Aún en el módulo de Ventas, vaya a :menuselection:`Ventas --> Orden de "
-"Ventas`y añada el producto **Consultoría** en la línea de orden."
 
-#: ../../sales/invoicing/services/reinvoice.rst:135
+#: ../../sales/invoicing/invoicing_policy.rst:21
 msgid ""
-"If your product doesn't exist yet, you can configure it on the fly from the "
-"SO. Just type the name on the **product** field and click on **Create and "
-"edit** to configure it."
+"You also have the ability to invoice manually, letting you control every "
+"options: invoice ready to invoice lines, invoice a percentage (advance), "
+"invoice a fixed advance."
 msgstr ""
-"Si tu producto no existe todavía, usted puede configurarlo sobre la marcha "
-"desde el SO. Sólo nombre el tipo en el campo del **producto** y haga clic en"
-" **Crear y editar** para configurarlo. "
 
-#: ../../sales/invoicing/services/reinvoice.rst:139
+#: ../../sales/invoicing/invoicing_policy.rst:26
+msgid "Decide the policy on a product page"
+msgstr ""
+
+#: ../../sales/invoicing/invoicing_policy.rst:28
 msgid ""
-"Depending on your product configuration, an **Analytic Account** may have "
-"been generated automatically. If not, you can easily create one in order to "
-"link your expenses to the sale order. Do not forget to confirm the sale "
-"order."
+"From any products page, under the invoicing tab you will find the invoicing "
+"policy and select the one you want."
 msgstr ""
-"Dependiendo de la configuración del producto, la **Cuenta Analítica** puedo "
-"haber sido generada automáticamente. Si no, usted puede crear fácilmente uno"
-" con el fin de vincular sus gastos a la orden de venta. No te olvides de "
-"confirmar la orden de venta."
 
-#: ../../sales/invoicing/services/reinvoice.rst:148
+#: ../../sales/invoicing/invoicing_policy.rst:35
+msgid "Send the invoice"
+msgstr ""
+
+#: ../../sales/invoicing/invoicing_policy.rst:37
 msgid ""
-"Refer to the documentation :doc:`../../../accounting/others/analytic/usage` "
-"to learn more about that concept."
+"Once you confirm the sale, you can see your delivered and invoiced "
+"quantities."
 msgstr ""
-"Relacionado a la documentación "
-":doc:`../../../accounting/others/analytic/usage` para conocer más acerca del"
-" concepto."
 
-#: ../../sales/invoicing/services/reinvoice.rst:152
-msgid "Create expense and link it to SO"
-msgstr "Crear cuenta y vincularla a SO"
-
-#: ../../sales/invoicing/services/reinvoice.rst:154
+#: ../../sales/invoicing/invoicing_policy.rst:43
 msgid ""
-"Let's assume that your consultant covered ``1.000km`` in October as part of "
-"his consultancy project. We will create a expense for it and link it to the "
-"related sales order thanks to the analytic account."
+"If you set it in ordered quantities, you can invoice as soon as the sale is "
+"confirmed. If however you selected delivered quantities, you will first have"
+" to validate the delivery."
 msgstr ""
-"Vamos a suponer que su consulta cubierta ``1.000km`` en Octubre como parte "
-"de su proyecto de consultoría. Crearemos un gasto para ella y vincularlo a "
-"las órdenes de venta relacionadas gracias a la cuenta analítica."
 
-#: ../../sales/invoicing/services/reinvoice.rst:158
+#: ../../sales/invoicing/invoicing_policy.rst:47
 msgid ""
-"Go to the **Expenses** module and click on **Create**. Record your expense "
-"as follows:"
+"Once the products are delivered, you can invoice your customer. Odoo will "
+"automatically add the quantities to invoiced based on how many you delivered"
+" if you did a partial delivery."
 msgstr ""
-"Ir al módulo de **Gastos** y haga clic en **Crear**. Registre su cuenta y "
-"cargo de la siguiente manera:"
 
-#: ../../sales/invoicing/services/reinvoice.rst:161
-msgid "**Expense description**: Kilometers October 2015"
-msgstr "**Descripción del Gasto**: Kilómetros en Octubre 2015"
+#: ../../sales/invoicing/milestone.rst:3
+msgid "Invoice project milestones"
+msgstr ""
 
-#: ../../sales/invoicing/services/reinvoice.rst:163
-msgid "**Product**: Kilometers"
-msgstr "**Producto**: Kilometros"
-
-#: ../../sales/invoicing/services/reinvoice.rst:165
-msgid "**Quantity**: 1.000"
-msgstr "**Cantidad**: 1.000"
-
-#: ../../sales/invoicing/services/reinvoice.rst:167
-msgid "**Analytic account**: SO0019 - Agrolait"
-msgstr "**Contabilidad Analítica**: SO0019 - Agrolait"
-
-#: ../../sales/invoicing/services/reinvoice.rst:172
+#: ../../sales/invoicing/milestone.rst:5
 msgid ""
-"Click on **Submit to manager**. As soon as the expense has been validated "
-"and posted to the journal entries, a new line corresponding to the expense "
-"will automatically be generated on the sale order."
+"Milestone invoicing can be used for expensive or large-scale projects, with "
+"each milestone representing a clear sequence of work that will incrementally"
+" build up to the completion of the contract. This invoicing method is "
+"comfortable both for the company which is ensured to get a steady cash flow "
+"throughout the project lifetime and for the client who can monitor the "
+"project's progress and pay in several installments."
 msgstr ""
-"Haga clic en **Enviar a su gerente**. Tan pronto como el gasto ha sido "
-"validado y publicado a las entradas de diario, una nueva línea "
-"correspondiente a expensas automáticamente se generará en la orden de venta."
 
-#: ../../sales/invoicing/services/reinvoice.rst:179
-msgid "You can now invoice the invoiceable lines to your customer."
-msgstr "Ahora puede facturar las líneas facturables a su cliente."
+#: ../../sales/invoicing/milestone.rst:13
+msgid "Create milestone products"
+msgstr ""
 
-#: ../../sales/invoicing/services/reinvoice.rst:186
-msgid ":doc:`milestones`"
-msgstr ":doc:`milestones`"
-
-#: ../../sales/invoicing/services/support.rst:3
-msgid "How to invoice a support contract (prepaid hours)?"
-msgstr "¿Cómo facturar un contrato de soporte (horas prepagadas)?"
-
-#: ../../sales/invoicing/services/support.rst:5
+#: ../../sales/invoicing/milestone.rst:15
 msgid ""
-"There are different kinds of service sales: prepaid volume of hours/days "
-"(e.g. support contract), billing based on time and material (e.g. billing "
-"consulting hours) and a fixed price contract (e.g. a project)."
+"In Odoo, each milestone of your project is considered as a product. To "
+"configure products to work this way, go to any product form."
 msgstr ""
-"Hay diferentes tipos de ventas de servicios: volumen de prepago de horas/día"
-" (por ejemplo, un contrato de soporte), facturación basadas en tiempo y "
-"material (por ejemplo, horas de consultoría de facturación) y un contrato de"
-" precio fijo (por ejemplo, un proyecto)."
 
-#: ../../sales/invoicing/services/support.rst:9
+#: ../../sales/invoicing/milestone.rst:18
 msgid ""
-"In this section, we will have a look at how to sell and keep track of a pre-"
-"paid support contract."
+"You have to set the product type as *Service* under general information and "
+"select *Milestones* in the sales tab."
 msgstr ""
-"En esta sección, vamos a echar un vistazo a cómo vender y realizar un "
-"seguimiento de un contrato de soporte de pre-pago."
 
-#: ../../sales/invoicing/services/support.rst:12
+#: ../../sales/invoicing/milestone.rst:25
+msgid "Invoice milestones"
+msgstr "Facturar hitos"
+
+#: ../../sales/invoicing/milestone.rst:27
 msgid ""
-"As an example, you may sell a pack of ``50 Hours`` of support at "
-"``$25,000``. The price is fixed and charged initially. But you want to keep "
-"track of the support service you did for the customer."
+"From the sales order, you can manually edit the quantity delivered as you "
+"complete a milestone."
 msgstr ""
-"Como un ejemplo, usted puede vender un paquete de ``50 Hours`` de apoyo en "
-"``$ 25,000``. El precio es fijo y se carga inicialmente. Pero usted quiere "
-"hacer un seguimiento de los servicios de apoyo que hicieron por el cliente."
 
-#: ../../sales/invoicing/services/support.rst:20
-msgid "Install the Sales and Timesheet applications"
-msgstr "Instalación del módulo de Ventas y Hojas de tiempo"
+#: ../../sales/invoicing/milestone.rst:33
+msgid "You can then invoice that first milestone."
+msgstr ""
 
-#: ../../sales/invoicing/services/support.rst:22
+#: ../../sales/invoicing/proforma.rst:3 ../../sales/invoicing/proforma.rst:22
+msgid "Send a pro-forma invoice"
+msgstr ""
+
+#: ../../sales/invoicing/proforma.rst:5
 msgid ""
-"In order to sell services, you need to install the **Sales** application, "
-"from the **Apps** icon. Install also the **Timesheets** application if you "
-"want to track support services you worked on every contract."
+"A pro-forma invoice is an abridged or estimated invoice in advance of a "
+"delivery of goods. It notes the kind and quantity of goods, their value, and"
+" other important information such as weight and transportation charges. Pro-"
+"forma invoices are commonly used as preliminary invoices with a quotation, "
+"or for customs purposes in importation. They differ from a normal invoice in"
+" not being a demand or request for payment."
 msgstr ""
-"De acuerdo a los servicios vendidos, usted necesita instalar el módulo de "
-"**Ventas**, desde el icono de **Aplicaciones**. Instalar el módulo de "
-"**Hojas de tiempo** si desea un registro de soporte de los servicios "
-"trabajados en cada contacto."
 
-#: ../../sales/invoicing/services/support.rst:33
-msgid "Create Products"
-msgstr "Crear Productos"
+#: ../../sales/invoicing/proforma.rst:13
+#: ../../sales/send_quotations/different_addresses.rst:10
+msgid "Activate the feature"
+msgstr ""
 
-#: ../../sales/invoicing/services/support.rst:35
+#: ../../sales/invoicing/proforma.rst:15
 msgid ""
-"By default, products are sold by number of units. In order to sell services "
-"``per hour``, you must allow using multiple unit of measures. From the "
-"**Sales** application, go to the menu :menuselection:`Configuration --> "
-"Settings`. From this screen, activate the multiple **Unit of Measures** "
-"option."
+"Go to :menuselection:`SALES --> Configuration --> Settings` and activate the"
+" *Pro-Forma Invoice* feature."
 msgstr ""
-"Por defecto, los productos serán vendidos en unidades de números. De acuerdo"
-" a los servicios vendidos **por hora**, usted deberá permitir el uso "
-"múltiple de unidades de medida. Desde el módulo de **Ventas**, vaya al menú "
-"de :menuselection:`Configuración --> Ajustes`. Desde esa vista, active la "
-"opción múltiple de **Unidades de Medida**."
 
-#: ../../sales/invoicing/services/support.rst:44
+#: ../../sales/invoicing/proforma.rst:24
 msgid ""
-"In order to sell a support contract, you must create a product for every "
-"support contract you sell. From the **Sales** application, use the menu "
-":menuselection:`Sales --> Products`, create a new product with the following"
-" setup:"
+"From any quotation or sales order, you know have an option to send a pro-"
+"forma invoice."
 msgstr ""
-"Para vender un contrato de soporte, debe crear un producto para cada "
-"contrato de soporte que usted vende. Desde el módulo de **Ventas**, use el "
-"menú :menuselection:`Ventas --> Productos`, crea un nuevo productos con los "
-"siguientes pasos a seguir:"
 
-#: ../../sales/invoicing/services/support.rst:48
-msgid "**Name**: Technical Support"
-msgstr "**Nombre**: Soporte técnico"
-
-#: ../../sales/invoicing/services/support.rst:52
-msgid "**Unit of Measure**: Hours"
-msgstr "**Unidad de Medida**: Horas"
-
-#: ../../sales/invoicing/services/support.rst:54
+#: ../../sales/invoicing/proforma.rst:30
 msgid ""
-"**Invoicing Policy**: Ordered Quantities, since the service is prepaid, we "
-"will invoice the service based on what has been ordered, not based on "
-"delivered quantities."
+"When you click on send, Odoo will send an email with the pro-forma invoice "
+"in attachment."
 msgstr ""
-"**Política de Facturación**: Cantidades pedidas, ya que el servicio es de "
-"prepago, se facturará el servicio basado en lo que se ha ordenado, no se "
-"basan en las cantidades entregadas."
 
-#: ../../sales/invoicing/services/support.rst:58
+#: ../../sales/invoicing/subscriptions.rst:3
+msgid "Sell subscriptions"
+msgstr ""
+
+#: ../../sales/invoicing/subscriptions.rst:5
 msgid ""
-"**Track Service**: Timesheet on contracts. An analytic account will "
-"automatically be created for every order containing this service so that you"
-" can track hours in the related account."
+"Selling subscription products will give you predictable revenue, making "
+"planning ahead much easier."
 msgstr ""
-"**Servicio de Rastreo**: Hojas de tiempo en contrato. Una cuenta analítica "
-"se creará automáticamente para cada pedido que contiene este servicio para "
-"que pueda realizar un seguimiento de horas en la cuenta correspondiente."
 
-#: ../../sales/invoicing/services/support.rst:66
+#: ../../sales/invoicing/subscriptions.rst:9
+msgid "Make a subscription from a sales order"
+msgstr ""
+
+#: ../../sales/invoicing/subscriptions.rst:11
 msgid ""
-"There are different ways to track the service related to a sales order or "
-"product sold. With the above configuration, you can only sell one support "
-"contract per order. If your customer orders several service contracts on "
-"timesheet, you will have to split the quotation into several orders."
+"From the sales app, create a quotation to the desired customer, and select "
+"the subscription product your previously created."
 msgstr ""
 
-#: ../../sales/invoicing/services/support.rst:72
+#: ../../sales/invoicing/subscriptions.rst:14
 msgid ""
-"Note that you can sell in different unit of measure than hours, example: "
-"days, pack of 40h, etc. To do that, just create a new unit of measure in the"
-" **Unit of Measure** category and set a conversion ratio compared to "
-"**Hours** (example: ``1 day = 8 hours``)."
+"When you confirm the sale the subscription will be created automatically. "
+"You will see a direct link from the sales order to the Subscription in the "
+"upper right corner."
 msgstr ""
-"Tenga en cuenta que usted pueda vender en diferente unidad de medida que la "
-"hora, por ejemplo: día, paquete de 40h, etc. Para ello, basta con crear una "
-"nueva unidad de medida en la categoría **Unidad de medida** y establecer una"
-" relación de conversión en comparación a **Horas** (ejemplo: ``1 día = 8 "
-"horas``)."
 
-#: ../../sales/invoicing/services/support.rst:78
-msgid "Managing support contract"
-msgstr "La gestión de contrato de soporte"
+#: ../../sales/invoicing/time_materials.rst:3
+msgid "Invoice based on time and materials"
+msgstr ""
 
-#: ../../sales/invoicing/services/support.rst:81
-msgid "Quotations and Sales Orders"
-msgstr "Presupuestos y pedidos de venta"
-
-#: ../../sales/invoicing/services/support.rst:83
+#: ../../sales/invoicing/time_materials.rst:5
 msgid ""
-"Once the product is created, you can create a quotation or a sales order "
-"with the related product. Once the quotation is confirmed and transformed "
-"into a sales order, your users will be able to record services related to "
-"this support contract using the timesheet application."
+"Time and Materials is generally used in projects in which it is not possible"
+" to accurately estimate the size of the project, or when it is expected that"
+" the project requirements would most likely change."
 msgstr ""
 
-#: ../../sales/invoicing/services/support.rst:93
-msgid "Timesheets"
-msgstr "Partes de horas"
-
-#: ../../sales/invoicing/services/support.rst:95
+#: ../../sales/invoicing/time_materials.rst:9
 msgid ""
-"To track the service you do on a specific contract, you should use the "
-"timesheet application. An analytic account related to the sale order has "
-"been automatically created (``SO009 - Agrolait`` on the screenshot here "
-"above), so you can start tracking services as soon as it has been sold."
-msgstr ""
-"El registro de servicios puede estar especificado en el contrato, usted "
-"normalmente puede usar el módulo de las hojas de tiempo. Una cuenta "
-"analítica relacionada con la orden de venta que se ha creado de forma "
-"automática (``SO009 - Agrolait`` en la captura de pantalla de arriba), para "
-"que pueda iniciar el seguimiento de los servicios tan pronto como se ha "
-"vendido."
-
-#: ../../sales/invoicing/services/support.rst:104
-msgid "Control delivered support on the sales order"
+"This is opposed to a fixed-price contract in which the owner agrees to pay "
+"the contractor a lump sum for the fulfillment of the contract no matter what"
+" the contractors pay their employees, sub-contractors, and suppliers."
 msgstr ""
 
-#: ../../sales/invoicing/services/support.rst:106
+#: ../../sales/invoicing/time_materials.rst:14
 msgid ""
-"From the **Sales** application, use the menu :menuselection:`Sales --> Sales"
-" Orders`  to control the progress of every order. On the sales order line "
-"related to the support contract, you should see the **Delivered Quantities**"
-" that are updated automatically, based on the number of hours in the "
-"timesheet."
+"For this documentation I will use the example of a consultant, you will need"
+" to invoice their time, their various expenses (transport, lodging, ...) and"
+" purchases."
 msgstr ""
-"Desde el módulo de **Ventas**, use el menú :menuselection:`Ventas --> "
-"Órdenes de Ventas` para controlar el progreso de cada orden. En la línea de "
-"órdenes de venta relacionadas con el contrato de soporte, debería ver las "
-"**Cantidades Entregadas** que se actualizan automáticamente, basándose en el"
-" número de horas en la hoja de tiempos."
 
-#: ../../sales/invoicing/services/support.rst:116
-msgid "Upselling and renewal"
-msgstr "Sobreventa y renovación"
+#: ../../sales/invoicing/time_materials.rst:19
+msgid "Invoice time configuration"
+msgstr ""
 
-#: ../../sales/invoicing/services/support.rst:118
+#: ../../sales/invoicing/time_materials.rst:21
 msgid ""
-"If the number of hours you performed on the support contract is bigger or "
-"equal to the number of hours the customer purchased, you are suggested to "
-"sell an extra contract to the customer since they used all their quota of "
-"service. Periodically (ideally once every two weeks), you should check the "
-"sales order that are in such a case. To do so, go to :menuselection:`Sales "
-"--> Invoicing --> Orders to Upsell`."
+"To keep track of progress in the project, you will need the *Project* app. "
+"Go to :menuselection:`Apps --> Project` to install it."
 msgstr ""
 
-#: ../../sales/invoicing/services/support.rst:127
+#: ../../sales/invoicing/time_materials.rst:24
 msgid ""
-"If you use Odoo CRM, a good practice is to create an opportunity for every "
-"sale order in upselling invoice status so that you easily track your "
-"upselling effort."
+"In *Project* you will use timesheets, to do so go to :menuselection:`Project"
+" --> Configuration --> Settings` and activate the *Timesheets* feature."
 msgstr ""
-"Si utiliza el CRM de Odoo, una buena práctica es crear una oportunidad para "
-"que cada orden de venta en estado vendiendo de la factura, seguirá "
-"fácilmente su esfuerzo de mejorarar una venta."
 
-#: ../../sales/invoicing/services/support.rst:131
+#: ../../sales/invoicing/time_materials.rst:32
+msgid "Invoice your time spent"
+msgstr ""
+
+#: ../../sales/invoicing/time_materials.rst:34
 msgid ""
-"If you sell an extra support contract, you can either add a new line on the "
-"existing sales order (thus, you continue to timesheet on the same order) or "
-"create a new order (thus, people will timesheet their hours on the new "
-"contract). To unmark the sales order as **Upselling**, you can set the sales"
-" order as done and it will disappear from your upselling list."
+"From a product page set as a service, you will find two options under the "
+"invoicing tab, select both *Timesheets on tasks* and *Create a task in a new"
+" project*."
 msgstr ""
 
-#: ../../sales/invoicing/services/support.rst:138
-msgid "Special Configuration"
-msgstr "Configuración Especial"
+#: ../../sales/invoicing/time_materials.rst:41
+msgid "You could also add the task to an existing project."
+msgstr ""
 
-#: ../../sales/invoicing/services/support.rst:140
+#: ../../sales/invoicing/time_materials.rst:43
 msgid ""
-"When creating the product form, you may set a different approach to track "
-"the service:"
+"Once confirming a sales order, you will now see two new buttons, one for the"
+" project overview and one for the current task."
 msgstr ""
-"Al crear la forma del producto, es posible establecer un enfoque diferente "
-"para realizar el seguimiento del servicio:"
 
-#: ../../sales/invoicing/services/support.rst:143
+#: ../../sales/invoicing/time_materials.rst:49
 msgid ""
-"**Create task and track hours**: in this mode, a task is created for every "
-"sales order line. Then when you do the timesheet, you don't record hours on "
-"a sales order/contract, but you record hours on a task (that represents the "
-"contract). The advantage of this solution is that it allows to sell several "
-"service contracts within the same sales order."
+"You will directly be in the task if you click on it, you can also access it "
+"from the *Project* app."
 msgstr ""
 
-#: ../../sales/invoicing/services/support.rst:150
+#: ../../sales/invoicing/time_materials.rst:52
 msgid ""
-"**Manually**: you can use this mode if you don't record timesheets in Odoo. "
-"The number of hours you worked on a specific contract can be recorded "
-"manually on the sales order line directly, in the delivered quantity field."
+"Under timesheets, you can assign who works on it. You can or they can add "
+"how many hours they worked on the project so far."
 msgstr ""
 
-#: ../../sales/invoicing/services/support.rst:156
-msgid ":doc:`../../../inventory/settings/products/uom`"
-msgstr ":doc:`../../../inventory/settings/products/uom`"
+#: ../../sales/invoicing/time_materials.rst:58
+msgid "From the sales order, you can then invoice those hours."
+msgstr ""
+
+#: ../../sales/invoicing/time_materials.rst:90
+msgid ""
+"under the invoicing tab, select *Delivered quantities* and either *At cost* "
+"or *Sales price* as well depending if you want to invoice the cost of your "
+"expense or a previously agreed on sales price."
+msgstr ""
+
+#: ../../sales/invoicing/time_materials.rst:120
+msgid "Invoice purchases"
+msgstr ""
+
+#: ../../sales/invoicing/time_materials.rst:122
+msgid ""
+"The last thing you might need to add to the sale order is purchases made for"
+" it."
+msgstr ""
+
+#: ../../sales/invoicing/time_materials.rst:125
+msgid ""
+"You will need the *Purchase Analytics* feature, to activate it, go to "
+":menuselection:`Invoicing --> Configuration --> Settings` and select "
+"*Purchase Analytics*."
+msgstr ""
+
+#: ../../sales/invoicing/time_materials.rst:129
+msgid ""
+"While making the purchase order don't forget to add the right analytic "
+"account."
+msgstr ""
+
+#: ../../sales/invoicing/time_materials.rst:135
+msgid ""
+"Once the PO is confirmed and received, you can create the vendor bill, this "
+"will automatically add it to the SO where you can invoice it."
+msgstr ""
 
 #: ../../sales/products_prices.rst:3
 msgid "Products & Prices"
@@ -1483,10 +1131,6 @@ msgid ""
 "invoice location."
 msgstr ""
 
-#: ../../sales/send_quotations/different_addresses.rst:10
-msgid "Activate the feature"
-msgstr ""
-
 #: ../../sales/send_quotations/different_addresses.rst:12
 msgid ""
 "Go to :menuselection:`SALES --> Configuration --> Settings` and activate the"
@@ -1685,6 +1329,10 @@ msgid ""
 "complete quotation in no time."
 msgstr ""
 
+#: ../../sales/send_quotations/quote_template.rst:10
+msgid "Configuration"
+msgstr "Configuración"
+
 #: ../../sales/send_quotations/quote_template.rst:12
 msgid ""
 "For this feature to work, go to :menuselection:`Sales --> Configuration --> "
diff --git a/locale/es/LC_MESSAGES/website.po b/locale/es/LC_MESSAGES/website.po
index 127fc63d3..686499c4d 100644
--- a/locale/es/LC_MESSAGES/website.po
+++ b/locale/es/LC_MESSAGES/website.po
@@ -1540,7 +1540,7 @@ msgstr "Simple y obvio"
 
 #: ../../website/publish/domain_name.rst:16
 msgid "Easy to remember and spell"
-msgstr "Fácilmente de recordar y pronunciar"
+msgstr "Fácil de recordar y pronunciar"
 
 #: ../../website/publish/domain_name.rst:17
 msgid "The shorter the better"
@@ -1552,7 +1552,7 @@ msgstr "Evite caracteres especiales"
 
 #: ../../website/publish/domain_name.rst:19
 msgid "Aim for a .com and/or your country extension"
-msgstr "Intenta conseguir un .com y/o la extensión de su país"
+msgstr "Intente conseguir un .com y/o la extensión de su país"
 
 #: ../../website/publish/domain_name.rst:21
 msgid ""
diff --git a/locale/fr/LC_MESSAGES/accounting.po b/locale/fr/LC_MESSAGES/accounting.po
index 3896bb1ab..24d1c06c2 100644
--- a/locale/fr/LC_MESSAGES/accounting.po
+++ b/locale/fr/LC_MESSAGES/accounting.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-27 11:08+0200\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Vincent M <subnetiq@gmail.com>, 2018\n"
+"Last-Translator: Cyrille de Lambert <cdelambert@auguria.net>, 2018\n"
 "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../../accounting.rst:5 ../../accounting/localizations/mexico.rst:281
+#: ../../accounting.rst:5 ../../accounting/localizations/mexico.rst:283
 msgid "Accounting"
 msgstr "Comptabilité"
 
@@ -28,7 +28,7 @@ msgstr "Banque et liquidités"
 
 #: ../../accounting/bank/feeds.rst:3
 msgid "Bank Feeds"
-msgstr "Flux bancaires"
+msgstr "Provenance des relevés bancaires"
 
 #: ../../accounting/bank/feeds/coda.rst:3
 msgid "Import Coda statement files (Belgium only)"
@@ -75,6 +75,7 @@ msgstr ""
 #: ../../accounting/bank/reconciliation/use_cases.rst:20
 #: ../../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
@@ -92,12 +93,10 @@ msgstr ""
 #: ../../accounting/payables/pay/sepa.rst:26
 #: ../../accounting/payables/supplier_bills/bills_or_receipts.rst:30
 #: ../../accounting/payables/supplier_bills/manage.rst:31
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:15
 #: ../../accounting/receivables/customer_invoices/cash_rounding.rst:19
 #: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:24
 #: ../../accounting/receivables/customer_invoices/installment_plans.rst:20
 #: ../../accounting/receivables/customer_invoices/payment_terms.rst:19
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:31
 #: ../../accounting/receivables/customer_payments/check.rst:39
 #: ../../accounting/receivables/customer_payments/check.rst:103
 #: ../../accounting/receivables/customer_payments/credit_cards.rst:40
@@ -830,7 +829,7 @@ msgstr ""
 "bancaires seront synchronisés toutes les 4 heures."
 
 #: ../../accounting/bank/feeds/synchronize.rst:73
-#: ../../accounting/localizations/mexico.rst:531
+#: ../../accounting/localizations/mexico.rst:533
 msgid "FAQ"
 msgstr "FAQ"
 
@@ -1786,6 +1785,18 @@ msgstr ""
 "d'entreprise dans vos préférences utilisateur afin d'ajouter, modifier ou "
 "supprimer des comptes bancaires pour une autre société."
 
+#: ../../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 "Type"
+
+#: ../../accounting/bank/setup/create_bank_account.rst:0
+msgid ""
+"Bank account type: Normal or IBAN. Inferred from the bank account number."
+msgstr ""
+"Type de compte banque: normal ou IBAN. Déterminé par le numéro de compte."
+
 #: ../../accounting/bank/setup/create_bank_account.rst:0
 msgid "ABA/Routing"
 msgstr ""
@@ -1794,6 +1805,16 @@ msgstr ""
 msgid "American Bankers Association Routing Number"
 msgstr ""
 
+#: ../../accounting/bank/setup/create_bank_account.rst:0
+msgid "Account Holder Name"
+msgstr "Ancien nom du compte"
+
+#: ../../accounting/bank/setup/create_bank_account.rst:0
+msgid ""
+"Account holder name, in case it is different than the name of the Account "
+"Holder"
+msgstr ""
+
 #: ../../accounting/bank/setup/create_bank_account.rst:49
 msgid "View *Bank Account* in our Online Demonstration"
 msgstr "Voir les *Comptes bancaires* dans notre Démonstration en Ligne"
@@ -2078,18 +2099,13 @@ msgstr ""
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Active"
-msgstr "Actif/ve"
+msgstr "Actif"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Set active to false to hide the Journal without removing it."
 msgstr ""
 "Mettre le champs actif à faux pour masquer le journal sans le supprimer."
 
-#: ../../accounting/bank/setup/manage_cash_register.rst:0
-#: ../../accounting/others/configuration/account_type.rst:0
-msgid "Type"
-msgstr "Type"
-
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Select 'Sale' for customer invoices journals."
 msgstr "Sélectionnez \"Vente\" pour le journal des factures clients."
@@ -2242,7 +2258,7 @@ msgstr ""
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Payment Methods"
-msgstr "Moyens de paiement"
+msgstr "Méthodes de paiements"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Manual:Pay bill by cash or any other method outside of Odoo."
@@ -2451,6 +2467,310 @@ msgstr ""
 msgid "Localizations"
 msgstr "Localisation"
 
+#: ../../accounting/localizations/colombia.rst:3
+msgid "Colombia"
+msgstr "Colombie"
+
+#: ../../accounting/localizations/colombia.rst:6
+#: ../../accounting/localizations/mexico.rst:14
+#: ../../accounting/others/taxes/B2B_B2C.rst:63
+msgid "Introduction"
+msgstr "Introduction"
+
+#: ../../accounting/localizations/colombia.rst:8
+msgid ""
+"Electronic invoicing for Colombia is available from Odoo 12 and requires the"
+" next modules:"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:11
+msgid ""
+"**l11n_co**: All the basic data to manage the accounting module, contains "
+"the default setup for: chart of accounts, taxes, retentions, identification "
+"document types"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:14
+msgid ""
+"**l10n_co_edi**: This module includes all the extra fields that are required"
+" for the Integration with Carvajal T&S and generate the electronic invoice, "
+"based on the DIAN legal requirements."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:19
+msgid "Workflow"
+msgstr "Flux de travail"
+
+#: ../../accounting/localizations/colombia.rst:28
+msgid "1. Install the Colombian localization modules"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:30
+msgid ""
+"For this, go in Apps and search for Colombia. Then click Install for the "
+"first two modules."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:37
+msgid "2. Configure credentials for Carvajal T&S web service"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:39
+msgid ""
+"Once that the modules are installed, in order to be able to connect with "
+"Carvajal T&S Web Service, it's necessary to configure the user and "
+"credentials, this information will be provided by Carvajal T&S."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:43
+#: ../../accounting/localizations/colombia.rst:64
+msgid ""
+"Go to :menuselection:`Accounting --> Configuration --> Settings` and look "
+"for the *Colombian Electronic Invoice* section."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:49
+msgid ""
+"Using the Testing mode it is possible to connect with a Carvajal T&S testing"
+" environment. This allows users to test the complete workflow and "
+"integration with the CEN Financiero portal, which is accessible here: "
+"https://cenfinancierolab.cen.biz"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:54
+msgid ""
+"Once that Odoo and Carvajal T&S is fully configured and ready for production"
+" the testing environment can be disabled."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:58
+msgid "3. Configure your report data"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:60
+msgid ""
+"As part of the configurable information that is sent in the XML, you can "
+"define the data for the fiscal section and the bank information in the PDF."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:71
+msgid "4. Configure data required in the XML"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:74
+msgid "4.1 Partner"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:77
+msgid "4.1.1 Identification"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:79
+msgid ""
+"As part of the Colombian Localization, the document types defined by the "
+"DIAN are now available on the Partner form. Colombian partners have to have "
+"their identification number and document type set:"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:86
+msgid ""
+"When the document type is RUT the identification number needs to be "
+"configured in Odoo including the verification digit, Odoo will split this "
+"number when the data to the third party vendor is sent."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:92
+msgid "4.1.2 Fiscal structure (RUT)"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:94
+msgid ""
+"The partner's responsibility codes (section 53 in the RUT document) are "
+"included as part of the electronic invoice module given that is part of the "
+"information required by the DIAN ."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:98
+msgid ""
+"These fields can be found in :menuselection:`Partner --> Sales & Purchase "
+"Tab --> Fiscal Information`"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:104
+msgid ""
+"Additionally two booleans fields were added in order to specify the fiscal "
+"regimen of the partner."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:108
+msgid "4.2 Taxes"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:110
+msgid ""
+"If your sales transactions include products with taxes, it's important to "
+"consider that an extra field *Value Type* needs to be configured per tax. "
+"This option is located in the Advanced Options tab."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:117
+msgid ""
+"Retention tax types (ICA, IVA, Fuente) are also included in the options to "
+"configure your taxes. This configuration is used in order to correctly "
+"display taxes in the invoice PDF."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:125
+msgid "4.3 Journals"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:127
+msgid ""
+"Once the DIAN has assigned the official sequence and prefix for the "
+"electronic invoice resolution, the Sales journals related to your invoice "
+"documents need to be updated in Odoo.  The sequence can be accessed using "
+"developer mode: :menuselection:`Accounting --> Settings --> Configuration "
+"Setting --> Journals`."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:136
+msgid ""
+"Once that the sequence is opened, the Prefix and Next Number fields should "
+"be configured and synchronized with the CEN Financiero."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:143
+msgid "4.4 Users"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:145
+msgid ""
+"The default template that is used by Odoo on the invoice PDF includes the "
+"job position of the salesperson, so these fields should be configured:"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:153
+#: ../../accounting/localizations/mexico.rst:196
+msgid "Usage and testing"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:156
+msgid "1. Invoice"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:158
+msgid ""
+"When all your master data and credentials has been configured, it's possible"
+" to start testing the electronic invoice workflow."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:162
+msgid "1.1 Invoice creation"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:164
+msgid ""
+"The functional workflow that takes place before an invoice validation "
+"doesn't change. The main changes that are introduced with the electronic "
+"invoice are the next fields:"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:171
+msgid "There are three types of documents:"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:173
+msgid ""
+"**Factura Electronica**: This is the regular type of document and its "
+"applicable for Invoices, Credit Notes and Debit Notes."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:175
+msgid ""
+"**Factura de Importación**: This should be selected for importation "
+"transactions."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:177
+msgid ""
+"**Factura de contingencia**: This is an exceptional type that is used as a "
+"manual backup in case that the company is not able to use the ERP and it's "
+"necessary to generate the invoice manually, when this invoice is added to "
+"the ERP, this invoice type should be selected."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:184
+msgid "1.2 Invoice validation"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:186
+msgid ""
+"After the invoice is validated an XML file is created and sent automatically"
+" to Carvajal, this file is displayed in the chatter."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:192
+msgid ""
+"An extra field is now displayed in \"Other Info\" tab with the name of the "
+"XML file. Additionally there is a second extra field that is displayed with "
+"the Electronic Invoice status, with the initial value \"In progress\":"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:201
+msgid "1.3 Reception of legal XML and PDF"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:203
+msgid ""
+"The electronic invoice vendor receives the XML file and proceeds to validate"
+" the structure and the information in it, if everything is correct the "
+"invoice status changes to \"Validated\" after using the \"Check Carvajal "
+"Status\" button in the Action dropdown. They then proceed to generate a "
+"Legal XML which includes a digital signature and a unique code (CUFE), a PDF"
+" invoice that includes a QR code and the CUFE is also generated."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:211
+msgid "After this:"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:213
+msgid ""
+"A ZIP containing the legal XML and the PDF is downloaded and displayed in "
+"the invoice chatter:"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:222
+msgid "The Electronic Invoice status changes to \"Accepted\""
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:225
+msgid "1.4 Common errors"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:227
+msgid ""
+"During the XML validation the most common errors are usually related to "
+"missing master data. In such cases, error messages are shown in the chatter "
+"after updating the electronic invoice status."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:234
+msgid ""
+"After the master data is corrected, it's possible to reprocess the XML with "
+"the new data and send the updated version, using the following button:"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:245
+msgid "2. Additional use cases"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:247
+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/france.rst:3
 msgid "France"
 msgstr "France"
@@ -2987,11 +3307,6 @@ msgid ""
 "\"Mexico\" set."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:14
-#: ../../accounting/others/taxes/B2B_B2C.rst:63
-msgid "Introduction"
-msgstr "Introduction"
-
 #: ../../accounting/localizations/mexico.rst:16
 msgid "The mexican localization is a group of 3 modules:"
 msgstr "Le module de localisation mexicain est composé de 3 modules:"
@@ -3059,11 +3374,11 @@ msgid ""
 " integrate with the normal invoicing flow in Odoo."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:66
+#: ../../accounting/localizations/mexico.rst:68
 msgid "3. Set you legal information in the company"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:68
+#: ../../accounting/localizations/mexico.rst:70
 msgid ""
 "First, make sure that your company is configured with the correct data. Go "
 "in :menuselection:`Settings --> Users --> Companies` and enter a valid "
@@ -3071,20 +3386,20 @@ msgid ""
 "position on your company’s contact."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:75
+#: ../../accounting/localizations/mexico.rst:77
 msgid ""
 "If you want use the Mexican localization on test mode, you can put any known"
 " address inside Mexico with all fields for the company address and set the "
 "vat to **ACO560518KW7**."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:83
+#: ../../accounting/localizations/mexico.rst:85
 msgid ""
 "4. Set the proper \"Fiscal Position\" on the partner that represent the "
 "company"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:85
+#: ../../accounting/localizations/mexico.rst:87
 msgid ""
 "Go In the same form where you are editing the company save the record in "
 "order to set this form as a readonly and on readonly view click on the "
@@ -3094,11 +3409,11 @@ msgid ""
 "the option)."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:92
+#: ../../accounting/localizations/mexico.rst:94
 msgid "5. Enabling CFDI Version 3.3"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:95
+#: ../../accounting/localizations/mexico.rst:97
 msgid ""
 "This steps are only necessary when you will enable the CFDI 3.3 (only "
 "available for V11.0 and above) if you do not have Version 11.0 or above on "
@@ -3106,11 +3421,11 @@ msgid ""
 "https://www.odoo.com/help."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:100
+#: ../../accounting/localizations/mexico.rst:102
 msgid "Enable debug mode:"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:105
+#: ../../accounting/localizations/mexico.rst:107
 msgid ""
 "Go and look the following technical parameter, on :menuselection:`Settings "
 "--> Technical --> Parameters --> System Parameters` and set the parameter "
@@ -3118,7 +3433,7 @@ msgid ""
 "name does not exist)."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:111
+#: ../../accounting/localizations/mexico.rst:113
 msgid ""
 "The CFDI 3.2 will be legally possible until November 30th 2017 enable the "
 "3.3 version will be a mandatory step to comply with the new `SAT "
@@ -3126,36 +3441,36 @@ msgid ""
 "the default behavior."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:120
+#: ../../accounting/localizations/mexico.rst:122
 msgid "Important considerations when yo enable the CFDI 3.3"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:122
-#: ../../accounting/localizations/mexico.rst:611
+#: ../../accounting/localizations/mexico.rst:124
+#: ../../accounting/localizations/mexico.rst:613
 msgid ""
 "Your tax which represent the VAT 16% and 0% must have the \"Factor Type\" "
 "field set to \"Tasa\"."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:130
+#: ../../accounting/localizations/mexico.rst:132
 msgid ""
 "You 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:137
+#: ../../accounting/localizations/mexico.rst:139
 msgid ""
 "All products must have for CFDI 3.3 the \"SAT code\" and the field "
 "\"Reference\" properly set, you can export them and re import them to do it "
 "faster."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:144
+#: ../../accounting/localizations/mexico.rst:146
 msgid "6. Configure the PAC in order to sign properly the invoices"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:146
+#: ../../accounting/localizations/mexico.rst:148
 msgid ""
 "To configure the EDI with the **PACs**, you can go in "
 ":menuselection:`Accounting --> Settings --> Electronic Invoicing (MX)`. You "
@@ -3163,14 +3478,14 @@ msgid ""
 "and then enter your PAC username and PAC password."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:152
+#: ../../accounting/localizations/mexico.rst:154
 msgid ""
 "Remember you must sign up in the refereed PAC before hand, that process can "
 "be done with the PAC itself on this case we will have two (2) availables "
 "`Finkok`_ and `Solución Factible`_."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:156
+#: ../../accounting/localizations/mexico.rst:158
 msgid ""
 "You must process your **Private Key (CSD)** with the SAT institution before "
 "follow this steps, if you do not have such information please try all the "
@@ -3179,85 +3494,81 @@ msgid ""
 "environment with real transactions."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:166
+#: ../../accounting/localizations/mexico.rst:168
 msgid ""
 "If you ticked the box *MX PAC test environment* there is no need to enter a "
 "PAC username or password."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:173
+#: ../../accounting/localizations/mexico.rst:175
 msgid ""
 "Here is a SAT certificate you can use if you want to use the *Test "
 "Environment* for the Mexican Accounting Localization."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:176
+#: ../../accounting/localizations/mexico.rst:178
 msgid "`Certificate`_"
 msgstr "`Certificat`_"
 
-#: ../../accounting/localizations/mexico.rst:177
+#: ../../accounting/localizations/mexico.rst:179
 msgid "`Certificate Key`_"
 msgstr "`Clé Du Certificat`_"
 
-#: ../../accounting/localizations/mexico.rst:178
+#: ../../accounting/localizations/mexico.rst:180
 msgid "**Password :** 12345678a"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:181
+#: ../../accounting/localizations/mexico.rst:183
 msgid "7. Configure the tag in sales taxes"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:183
+#: ../../accounting/localizations/mexico.rst:185
 msgid ""
 "This tag is used to set the tax type code, transferred or withhold, "
 "applicable to the concept in the CFDI. So, if the tax is a sale tax the "
 "\"Tag\" field should be \"IVA\", \"ISR\" or \"IEPS\"."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:190
+#: ../../accounting/localizations/mexico.rst:192
 msgid ""
 "Note that the default taxes already has a tag assigned, but when you create "
 "a new tax you should choose a tag."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:194
-msgid "Usage and testing"
-msgstr ""
-
-#: ../../accounting/localizations/mexico.rst:197
+#: ../../accounting/localizations/mexico.rst:199
 msgid "Invoicing"
 msgstr "Facturation"
 
-#: ../../accounting/localizations/mexico.rst:199
+#: ../../accounting/localizations/mexico.rst:201
 msgid ""
 "To use the mexican invoicing you just need to do a normal invoice following "
 "the normal Odoo's behaviour."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:202
+#: ../../accounting/localizations/mexico.rst:204
 msgid ""
 "Once you validate your first invoice a correctly signed invoice should look "
 "like this:"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:209
+#: ../../accounting/localizations/mexico.rst:211
 msgid ""
 "You can generate the PDF just clicking on the Print button on the invoice or"
 " sending it by email following the normal process on odoo to send your "
 "invoice by email."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:216
+#: ../../accounting/localizations/mexico.rst:218
 msgid ""
 "Once you send the electronic invoice by email this is the way it should "
 "looks like."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:223
+#: ../../accounting/localizations/mexico.rst:225
 msgid "Cancelling invoices"
 msgstr "Annulation de factures"
 
-#: ../../accounting/localizations/mexico.rst:225
+#: ../../accounting/localizations/mexico.rst:227
 msgid ""
 "The cancellation process is completely linked to the normal cancellation in "
 "Odoo."
@@ -3265,79 +3576,79 @@ msgstr ""
 "Le processus d'annulation est entièrement lié aux annulations régulières "
 "d'Odoo."
 
-#: ../../accounting/localizations/mexico.rst:227
+#: ../../accounting/localizations/mexico.rst:229
 msgid "If the invoice is not paid."
 msgstr "Si la facture n'est pas payé."
 
-#: ../../accounting/localizations/mexico.rst:229
+#: ../../accounting/localizations/mexico.rst:231
 msgid "Go to to the customer invoice journal where the invoice belong to"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:237
+#: ../../accounting/localizations/mexico.rst:239
 msgid "Check the \"Allow cancelling entries\" field"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:242
+#: ../../accounting/localizations/mexico.rst:244
 msgid "Go back to your invoice and click on the button \"Cancel Invoice\""
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:247
+#: ../../accounting/localizations/mexico.rst:249
 msgid ""
 "For security reasons it is recommendable return the check on the to allow "
 "cancelling to false again, then go to the journal and un check such field."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:250
+#: ../../accounting/localizations/mexico.rst:252
 msgid "**Legal considerations**"
 msgstr "**Considérations Légales**"
 
-#: ../../accounting/localizations/mexico.rst:252
+#: ../../accounting/localizations/mexico.rst:254
 msgid "A cancelled invoice will automatically cancelled on the SAT."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:253
+#: ../../accounting/localizations/mexico.rst:255
 msgid ""
 "If you retry to use the same invoice after cancelled, you will have as much "
 "cancelled CFDI as you tried, then all those xml are important to maintain a "
 "good control of the cancellation reasons."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:256
+#: ../../accounting/localizations/mexico.rst:258
 msgid ""
 "You must unlink all related payment done to an invoice on odoo before cancel"
 " such document, this payments must be cancelled to following the same "
 "approach but setting the \"Allow Cancel Entries\" in the payment itself."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:261
+#: ../../accounting/localizations/mexico.rst:263
 msgid "Payments (Just available for CFDI 3.3)"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:263
+#: ../../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."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:266
+#: ../../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\"."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:269
+#: ../../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:271
+#: ../../accounting/localizations/mexico.rst:273
 msgid "You must print the payment in order to retrieve the PDF properly."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:272
+#: ../../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 "
@@ -3346,66 +3657,66 @@ msgid ""
 "caso de anticipos recibidos**."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:277
+#: ../../accounting/localizations/mexico.rst:279
 msgid ""
 "Related to topic 4 it is blocked the possibility to create a Customer "
 "Payment without a proper invoice."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:282
+#: ../../accounting/localizations/mexico.rst:284
 msgid "The accounting for Mexico in odoo is composed by 3 reports:"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:284
+#: ../../accounting/localizations/mexico.rst:286
 msgid "Chart of Account (Called and shown as COA)."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:285
+#: ../../accounting/localizations/mexico.rst:287
 msgid "Electronic Trial Balance."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:286
+#: ../../accounting/localizations/mexico.rst:288
 msgid "DIOT report."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:288
+#: ../../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."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:291
+#: ../../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:297
+#: ../../accounting/localizations/mexico.rst:299
 msgid "Electronic Accounting (Requires Accounting App)"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:300
+#: ../../accounting/localizations/mexico.rst:302
 msgid "Electronic Chart of account CoA"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:302
+#: ../../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)**"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:309
+#: ../../accounting/localizations/mexico.rst:311
 msgid "**How to add new accounts?**"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:311
+#: ../../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."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:314
+#: ../../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 "
@@ -3415,17 +3726,17 @@ msgid ""
 " xml."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:324
+#: ../../accounting/localizations/mexico.rst:326
 msgid "**What is the meaning of the tag?**"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:326
+#: ../../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**."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:330
+#: ../../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 "
@@ -3433,11 +3744,11 @@ msgid ""
 "is not created you can create one on the fly."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:336
+#: ../../accounting/localizations/mexico.rst:338
 msgid "Electronic Trial Balance"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:338
+#: ../../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 "
@@ -3446,28 +3757,28 @@ msgid ""
 "the previous selection of the period you want to export."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:347
+#: ../../accounting/localizations/mexico.rst:349
 msgid ""
 "All the normal auditory and analysis features are available here also as any"
 " regular Odoo Report."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:351
+#: ../../accounting/localizations/mexico.rst:353
 msgid "DIOT Report (Requires Accounting App)"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:353
+#: ../../accounting/localizations/mexico.rst:355
 msgid "**What is the DIOT and the importance of presenting it SAT**"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:355
+#: ../../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."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:358
+#: ../../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 "
@@ -3475,25 +3786,25 @@ msgid ""
 "the same, with our providers."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:363
+#: ../../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:"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:367
+#: ../../accounting/localizations/mexico.rst:369
 msgid "**When to file the DIOT and in what format?**"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:369
+#: ../../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:373
+#: ../../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 "
@@ -3501,24 +3812,24 @@ msgid ""
 "to said data."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:378
+#: ../../accounting/localizations/mexico.rst:380
 msgid "**Where the DIOT is presented?**"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:380
+#: ../../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."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:384
+#: ../../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."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:387
+#: ../../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 "
@@ -3527,18 +3838,18 @@ msgid ""
 "that you will still have these records and of course, your CD or USB."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:393
+#: ../../accounting/localizations/mexico.rst:395
 msgid "**One more fact to know: the Batch load?**"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:395
+#: ../../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:"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:399
+#: ../../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 "
@@ -3548,7 +3859,7 @@ msgid ""
 "integration for the presentation in time and form to the SAT."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:406
+#: ../../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 "
@@ -3556,41 +3867,41 @@ msgid ""
 "Third Parties."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:411
+#: ../../accounting/localizations/mexico.rst:413
 msgid "You can find the `official information here`_."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:413
+#: ../../accounting/localizations/mexico.rst:415
 msgid "**How Generate this report in odoo?**"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:415
+#: ../../accounting/localizations/mexico.rst:417
 msgid ""
 "Go to  :menuselection:`Accounting --> Reports --> Mexico --> Transactions "
 "with third partied (DIOT)`."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:420
+#: ../../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."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:426
+#: ../../accounting/localizations/mexico.rst:428
 msgid "Click on \"Export (TXT)."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:431
+#: ../../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."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:435
+#: ../../accounting/localizations/mexico.rst:437
 msgid "Important considerations on your Supplier and Invice data for the DIOT"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:437
+#: ../../accounting/localizations/mexico.rst:439
 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 "
@@ -3599,34 +3910,34 @@ msgid ""
 " suppliers."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:445
+#: ../../accounting/localizations/mexico.rst:447
 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:448
+#: ../../accounting/localizations/mexico.rst:450
 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:451
+#: ../../accounting/localizations/mexico.rst:453
 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:454
+#: ../../accounting/localizations/mexico.rst:456
 msgid ""
 "Remember this report only shows the Supplier Invoices that were actually "
 "paid."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:456
+#: ../../accounting/localizations/mexico.rst:458
 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 "
@@ -3636,26 +3947,26 @@ msgid ""
 "your partners are correctly set."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:467
+#: ../../accounting/localizations/mexico.rst:469
 msgid "Extra Recommended features"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:470
+#: ../../accounting/localizations/mexico.rst:472
 msgid "Contact Module (Free)"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:472
+#: ../../accounting/localizations/mexico.rst:474
 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:477
+#: ../../accounting/localizations/mexico.rst:479
 msgid "Multi currency (Requires Accounting App)"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:479
+#: ../../accounting/localizations/mexico.rst:481
 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"
@@ -3665,17 +3976,17 @@ msgid ""
 "information daily in the system manually."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:486
+#: ../../accounting/localizations/mexico.rst:488
 msgid "Go to settings and enable the multi currency feature."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:492
+#: ../../accounting/localizations/mexico.rst:494
 msgid ""
 "Enabling Explicit errors on the CFDI using the XSD local validator (CFDI "
 "3.3)"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:494
+#: ../../accounting/localizations/mexico.rst:496
 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 "
@@ -3683,72 +3994,72 @@ msgid ""
 "debug mode enabled)."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:499
+#: ../../accounting/localizations/mexico.rst:501
 msgid ""
 "Go to :menuselection:`Settings --> Technical --> Actions --> Server Actions`"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:500
+#: ../../accounting/localizations/mexico.rst:502
 msgid "Look for the Action called \"Download XSD files to CFDI\""
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:501
+#: ../../accounting/localizations/mexico.rst:503
 msgid "Click on button \"Create Contextual Action\""
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:502
+#: ../../accounting/localizations/mexico.rst:504
 msgid ""
 "Go to the company form :menuselection:`Settings --> Users&Companies --> "
 "Companies`"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:503
+#: ../../accounting/localizations/mexico.rst:505
 msgid "Open any company you have."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:504
-#: ../../accounting/localizations/mexico.rst:527
+#: ../../accounting/localizations/mexico.rst:506
+#: ../../accounting/localizations/mexico.rst:529
 msgid "Click on \"Action\" and then on \"Download XSD file to CFDI\"."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:509
+#: ../../accounting/localizations/mexico.rst:511
 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:514
+#: ../../accounting/localizations/mexico.rst:516
 msgid "If you see an error like this:"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:516
+#: ../../accounting/localizations/mexico.rst:518
 msgid "The cfdi generated is not valid"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:518
+#: ../../accounting/localizations/mexico.rst:520
 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:522
+#: ../../accounting/localizations/mexico.rst:524
 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:526
+#: ../../accounting/localizations/mexico.rst:528
 msgid "Go to the company in which the error occurs."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:533
+#: ../../accounting/localizations/mexico.rst:535
 msgid "**Error message** (Only applicable on CFDI 3.3):"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:535
+#: ../../accounting/localizations/mexico.rst:537
 msgid ""
 ":9:0:ERROR:SCHEMASV:SCHEMAV_CVC_MINLENGTH_VALID: Element "
 "'{http://www.sat.gob.mx/cfd/3}Concepto', attribute 'NoIdentificacion': "
@@ -3756,43 +4067,43 @@ msgid ""
 "allowed minimum length of '1'."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:537
+#: ../../accounting/localizations/mexico.rst:539
 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:540
+#: ../../accounting/localizations/mexico.rst:542
 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:543
-#: ../../accounting/localizations/mexico.rst:568
-#: ../../accounting/localizations/mexico.rst:578
-#: ../../accounting/localizations/mexico.rst:591
-#: ../../accounting/localizations/mexico.rst:602
+#: ../../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
 msgid "**Error message**:"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:545
+#: ../../accounting/localizations/mexico.rst:547
 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:547
+#: ../../accounting/localizations/mexico.rst:549
 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:550
+#: ../../accounting/localizations/mexico.rst:552
 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"
@@ -3802,20 +4113,20 @@ msgid ""
 "considerations about fiscal positions."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:557
+#: ../../accounting/localizations/mexico.rst:559
 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:565
+#: ../../accounting/localizations/mexico.rst:567
 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:570
+#: ../../accounting/localizations/mexico.rst:572
 msgid ""
 ":2:0:ERROR:SCHEMASV:SCHEMAV_CVC_ENUMERATION_VALID: Element "
 "'{http://www.sat.gob.mx/cfd/3}Comprobante', attribute 'FormaPago': [facet "
@@ -3824,11 +4135,11 @@ msgid ""
 "'26', '27', '28', '29', '30', '99'}"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:573
+#: ../../accounting/localizations/mexico.rst:575
 msgid "**Solution:** The payment method is required on your invoice."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:580
+#: ../../accounting/localizations/mexico.rst:582
 msgid ""
 ":2:0:ERROR:SCHEMASV:SCHEMAV_CVC_ENUMERATION_VALID: Element "
 "'{http://www.sat.gob.mx/cfd/3}Comprobante', attribute 'LugarExpedicion': "
@@ -3842,16 +4153,16 @@ msgid ""
 "missing."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:585
+#: ../../accounting/localizations/mexico.rst:587
 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 `3. Set you legal "
-"information in the company`."
+"the required fields for your address following the step :ref:`mx-legal-"
+"info`."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:593
+#: ../../accounting/localizations/mexico.rst:595
 msgid ""
 ":2:0:ERROR:SCHEMASV:SCHEMAV_CVC_DATATYPE_VALID_1_2_1: Element "
 "'{http://www.sat.gob.mx/cfd/3}Comprobante', attribute 'LugarExpedicion': '' "
@@ -3859,13 +4170,13 @@ msgid ""
 "'{http://www.sat.gob.mx/sitio_internet/cfd/catalogos}c_CodigoPostal'."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:596
+#: ../../accounting/localizations/mexico.rst:598
 msgid ""
 "**Solution:** The postal code on your company address is not a valid one for"
 " Mexico, fix it."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:604
+#: ../../accounting/localizations/mexico.rst:606
 msgid ""
 ":18:0:ERROR:SCHEMASV:SCHEMAV_CVC_COMPLEX_TYPE_4: Element "
 "'{http://www.sat.gob.mx/cfd/3}Traslado': The attribute 'TipoFactor' is "
@@ -3874,7 +4185,7 @@ msgid ""
 "is required but missing.\", '')"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:608
+#: ../../accounting/localizations/mexico.rst:610
 msgid ""
 "**Solution:** Set the mexican name for the tax 0% and 16% in your system and"
 " used on the invoice."
@@ -4480,138 +4791,6 @@ msgstr ""
 msgid "Explanation of the fields:"
 msgstr "Explication des champs :"
 
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Status"
-msgstr "État"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "When an asset is created, the status is 'Draft'."
-msgstr "Lorsqu'une immobilisation est créée, le statut est « Brouillon »."
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid ""
-"If the asset is confirmed, the status goes in 'Running' and the depreciation"
-" lines can be posted in the accounting."
-msgstr ""
-"Si l'immobilisation est confirmée, l'état passe «En cours » et les lignes "
-"d'amortissement peuvent être comptabilisées."
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid ""
-"You can manually close an asset when the depreciation is over. If the last "
-"line of depreciation is posted, the asset automatically goes in that status."
-msgstr ""
-"Vous pouvez fermer manuellement une immobilisation lorsque l'amortissement "
-"est terminé. Si la dernière ligne de l'amortissement est comptabilisée, "
-"l'immobilisation passe automatiquement dans ce statut."
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Category"
-msgstr "Catégorie"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Category of asset"
-msgstr "Catégorie d'immobilisation"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Date"
-msgstr "Date "
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Date of asset"
-msgstr "Date de l'immobilisation"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Gross Value"
-msgstr "Valeur brute"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Gross value of asset"
-msgstr "Valeur brute des immobilisations"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Salvage Value"
-msgstr "Valeur de récupération"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "It is the amount you plan to have that you cannot depreciate."
-msgstr "Il s'agit de la part non dépréciable de l'immobilisation."
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Computation Method"
-msgstr "Méthode de calcul"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Choose the method to use to compute the amount of depreciation lines."
-msgstr ""
-"Choisissez la méthode à utiliser pour calculer le montant des lignes "
-"d'amortissement."
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid ""
-"* Linear: Calculated on basis of: Gross Value / Number of Depreciations"
-msgstr ""
-"* Linéaire: Calculé sur la base de : Valeur brute / Nombre d'Amortissements"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid ""
-"* Degressive: Calculated on basis of: Residual Value * Degressive Factor"
-msgstr ""
-"* Dégressif : Calculé sur la base de: Valeur résiduelle * Taux "
-"d'amortissement Dégressif"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Time Method Based On"
-msgstr "Méthode temporelle basée sur"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Choose the method to use to compute the dates and number of entries."
-msgstr ""
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid ""
-"* Number of Entries: Fix the number of entries and the time between 2 "
-"depreciations."
-msgstr ""
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid ""
-"* Ending Date: Choose the time between 2 depreciations and the date the "
-"depreciations won't go beyond."
-msgstr ""
-"* Date de fin : Choisissez le temps entre 2 amortissements et la date au "
-"delà de laquelle les amortissements cesseront."
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Prorata Temporis"
-msgstr "Prorata temporis"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid ""
-"Indicates that the first depreciation entry for this asset have to be done "
-"from the purchase date instead of the first January / Start date of fiscal "
-"year"
-msgstr ""
-"Indiquez si le premier amortissement doit être calculé à partir de la date "
-"d'achat ou à partir du 1er janvier / premier jour de l'exercice comptable."
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Number of Depreciations"
-msgstr "Nombre d'amortissements"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "The number of depreciations needed to depreciate your asset"
-msgstr ""
-"Le nombre d'amortissements nécessaire pour amortir votre immobilisation"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Number of Months in a Period"
-msgstr "Nombre de mois dans une période"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "The amount of time between two depreciations, in months"
-msgstr "La durée entre deux amortissements, en mois"
-
 #: ../../accounting/others/adviser/assets.rst:88
 msgid "Try creating an *Asset* in our online demonstration"
 msgstr ""
@@ -4942,15 +5121,11 @@ msgstr ""
 msgid ":doc:`../../receivables/customer_invoices/overview`"
 msgstr ":doc:`../../receivables/customer_invoices/overview`"
 
-#: ../../accounting/others/adviser/budget.rst:128
-msgid ":doc:`../../../purchase/overview/process/from_po_to_invoice`"
-msgstr ":doc:`../../../purchase/overview/process/from_po_to_invoice`"
-
-#: ../../accounting/others/adviser/budget.rst:130
+#: ../../accounting/others/adviser/budget.rst:129
 msgid "Go back in the budget list and find the Smith Project."
 msgstr "Revenez à la liste des budgets et trouvez le Projet Smith."
 
-#: ../../accounting/others/adviser/budget.rst:132
+#: ../../accounting/others/adviser/budget.rst:131
 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 "
@@ -4960,7 +5135,7 @@ msgstr ""
 "clients et fournisseurs enregistrées dans les comptes et les afficher dans "
 "la colonne **Montant réel**."
 
-#: ../../accounting/others/adviser/budget.rst:141
+#: ../../accounting/others/adviser/budget.rst:140
 msgid ""
 "The theoretical amount represents the amount of money you theoretically "
 "could have spend / should have received in function of the date. When your "
@@ -5172,6 +5347,37 @@ msgstr ""
 " au dernier jour de l'exercice. Assurez-vous avant de le faire que les "
 "résultats de l'exercice en cours dans le **Bilan** ont bien un solde à 0."
 
+#: ../../accounting/others/adviser/fiscalyear.rst:93
+msgid ":doc:`../configuration/fiscal_year`"
+msgstr ""
+
+#: ../../accounting/others/adviser/reverse_entry.rst:3
+msgid "Reverse an accounting entry automatically"
+msgstr ""
+
+#: ../../accounting/others/adviser/reverse_entry.rst:5
+msgid ""
+"You may want to automatically reverse an accounting entry at a specific "
+"date."
+msgstr ""
+
+#: ../../accounting/others/adviser/reverse_entry.rst:8
+msgid ""
+"This is, for example, used when you make a provision (e.g. provision for bad"
+" debt). When making the accounting entry for the provision, the amount you "
+"entered is only an estimated amount. You will only be sure of the amount at "
+"the end of the fiscal year. That's why, at that point, you want the "
+"accounting entry to be reversed to be able to enter the real loss that "
+"occurred."
+msgstr ""
+
+#: ../../accounting/others/adviser/reverse_entry.rst:15
+msgid ""
+"For this, you just have to tick the box \"Reverse Automatically\" on the "
+"journal entry and to define a reversal date. The accounting entry will be "
+"reversed at that date."
+msgstr ""
+
 #: ../../accounting/others/analytic.rst:3
 msgid "Analytic"
 msgstr "Analytique"
@@ -5335,21 +5541,12 @@ msgstr "Article acheté"
 #: ../../accounting/others/analytic/purchases_expenses.rst:104
 msgid ""
 "We also need to buy a software for our customers. In the purchase app create"
-" a purchase order for the software product. (please refer to the following "
-"document: :doc:`../../../purchase/overview/process/from_po_to_invoice`). "
-"Within the line we can link the product's cost with the analytical account. "
-"Specify the order line and select the correct analytical account. Confirm "
-"the sale."
+" a purchase order for the software product. Within the line we can link the "
+"product's cost with the analytical account. Specify the order line and "
+"select the correct analytical account. Confirm the sale."
 msgstr ""
-"Nous devons également acheter un logiciel pour nos clients. Dans "
-"l'application Purchases créez une commande pour le logiciel. (Référez-vous "
-"au document suivant : "
-":doc:`../../../purchase/overview/process/from_po_to_invoice`). Dans la ligne"
-" nous pouvons affecter le coût du produit au compte analytique. Spécifiez la"
-" ligne de commande et sélectionnez le compte analytique approprié. Confirmez"
-" la vente."
 
-#: ../../accounting/others/analytic/purchases_expenses.rst:114
+#: ../../accounting/others/analytic/purchases_expenses.rst:113
 msgid ""
 "Accept the delivery and enter the invoice. Once the invoice is entered the "
 "cost price (**Vendor Price** field) will be booked in the analytical "
@@ -5359,11 +5556,11 @@ msgstr ""
 "le prix de revient (champ **Prix d'achat**) sera affecté au compte "
 "analytique."
 
-#: ../../accounting/others/analytic/purchases_expenses.rst:118
+#: ../../accounting/others/analytic/purchases_expenses.rst:117
 msgid "Subcontracting"
 msgstr "Sous-traitance"
 
-#: ../../accounting/others/analytic/purchases_expenses.rst:120
+#: ../../accounting/others/analytic/purchases_expenses.rst:119
 msgid ""
 "The purchase module can be used in the same way as seen previously to handle"
 " subcontracting. if we purchase a service from another company we can re "
@@ -5376,17 +5573,17 @@ msgstr ""
 " commande d'achat au compte analyse concerné. Nous devons juste créer "
 "l'article approprié."
 
-#: ../../accounting/others/analytic/purchases_expenses.rst:128
+#: ../../accounting/others/analytic/purchases_expenses.rst:127
 msgid "You can also track cost with timesheets, see: :doc:`timesheets`"
 msgstr ""
 "Vous pouvez également suivre les coûts avec des feuilles de temps, voir : "
 ":doc:`timesheets`"
 
-#: ../../accounting/others/analytic/purchases_expenses.rst:131
+#: ../../accounting/others/analytic/purchases_expenses.rst:130
 msgid "Track costs in accounting"
 msgstr "Suivre les coûts en comptabilité"
 
-#: ../../accounting/others/analytic/purchases_expenses.rst:133
+#: ../../accounting/others/analytic/purchases_expenses.rst:132
 msgid ""
 "Now that everything is booked and points to the analytical account. Simply "
 "open it to check the costs related to that account."
@@ -5394,7 +5591,7 @@ msgstr ""
 "Maintenant tout est comptabilisé et affecté au compte analytique. Il suffit "
 "de l'ouvrir pour vérifier les coûts liés à ce compte."
 
-#: ../../accounting/others/analytic/purchases_expenses.rst:136
+#: ../../accounting/others/analytic/purchases_expenses.rst:135
 msgid ""
 "Enter the accounting module, click on :menuselection:`Advisers --> Analytic "
 "Accounts --> Open Charts`."
@@ -5402,7 +5599,7 @@ msgstr ""
 "Entrez dans le module Comptabilité, cliquez sur :menuselection:`Conseiller "
 "--> Comptes analytiques --> Ouvrir le plan comptable`."
 
-#: ../../accounting/others/analytic/purchases_expenses.rst:139
+#: ../../accounting/others/analytic/purchases_expenses.rst:138
 msgid ""
 "Select \"consulting pack - Smith\" and click on the cost and revenue button "
 "to have an overview of all cost linked to the account."
@@ -5410,7 +5607,7 @@ msgstr ""
 "Selectionnez \"Mision de conseil - Smith\" et cliquez sur le bouton coût et "
 "recette pour avoir une vue d'ensemble de tous les coûts liés à ce compte."
 
-#: ../../accounting/others/analytic/purchases_expenses.rst:147
+#: ../../accounting/others/analytic/purchases_expenses.rst:146
 msgid ""
 "If you would like to have the revenue as well you should invoice the "
 "Consulting Pack in the Invoice menu and link the invoice line to this same "
@@ -6424,11 +6621,11 @@ msgstr "Banque et liquidités"
 
 #: ../../accounting/others/configuration/account_type.rst:33
 msgid "Current Assets"
-msgstr "Actifs actuels"
+msgstr "Actif circulant"
 
 #: ../../accounting/others/configuration/account_type.rst:35
 msgid "Non-current Assets"
-msgstr "Actifs immobilisés"
+msgstr "Actif immobilisé"
 
 #: ../../accounting/others/configuration/account_type.rst:37
 msgid "Prepayments"
@@ -6579,9 +6776,49 @@ msgstr ""
 msgid "View *Create Account* in our Online Demonstration"
 msgstr "Voir *Créer un compte* dans notre démonstration en ligne"
 
+#: ../../accounting/others/configuration/fiscal_year.rst:3
+msgid "Manage Fiscal Years"
+msgstr ""
+
+#: ../../accounting/others/configuration/fiscal_year.rst:5
+msgid ""
+"In most cases, the fiscal years last 12 months. If it is your case, you just"
+" have to define what is the last day of your fiscal year in the accounting "
+"settings. By default, it is set on the 31st December."
+msgstr ""
+
+#: ../../accounting/others/configuration/fiscal_year.rst:12
+msgid ""
+"However, there might be some exceptions. For example, if it is the first "
+"fiscal year of your business, it could last more or less than 12 months. In "
+"this case, some additional configuration is required."
+msgstr ""
+
+#: ../../accounting/others/configuration/fiscal_year.rst:16
+msgid ""
+"Go in :menuselection:`accounting --> configuration --> settings` and "
+"activate the fiscal years."
+msgstr ""
+
+#: ../../accounting/others/configuration/fiscal_year.rst:22
+msgid ""
+"You can then configure your fiscal years in :menuselection:`accounting --> "
+"configuration --> fiscal years`."
+msgstr ""
+
+#: ../../accounting/others/configuration/fiscal_year.rst:29
+msgid ""
+"You only have to create fiscal years if they last more or less than 12 "
+"months."
+msgstr ""
+
+#: ../../accounting/others/configuration/fiscal_year.rst:34
+msgid ":doc:`../adviser/fiscalyear`"
+msgstr ""
+
 #: ../../accounting/others/inventory.rst:3
 msgid "Inventory"
-msgstr "Inventaire"
+msgstr "Stock"
 
 #: ../../accounting/others/inventory/avg_price_valuation.rst:3
 msgid "Impact on the average price valuation when returning goods"
@@ -7214,6 +7451,7 @@ msgstr ""
 
 #: ../../accounting/others/multicurrencies/exchange.rst:109
 #: ../../accounting/payables/pay/multiple.rst:153
+#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:68
 msgid ":doc:`../../bank/reconciliation/configure`"
 msgstr ":doc:`../../bank/reconciliation/configure`"
 
@@ -7600,7 +7838,7 @@ msgstr ":doc:`how_it_works`"
 #: ../../accounting/overview/process_overview/supplier_bill.rst:124
 #: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:106
 msgid "Reporting"
-msgstr "Rapport"
+msgstr "Analyse"
 
 #: ../../accounting/others/reporting/customize.rst:3
 msgid "How to create a customized reports with your own formulas?"
@@ -10329,7 +10567,6 @@ msgid "15"
 msgstr "15"
 
 #: ../../accounting/overview/process_overview/customer_invoice.rst:117
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:89
 msgid "Payment"
 msgstr "Paiement"
 
@@ -11494,7 +11731,7 @@ msgid ""
 "Technical field used to adapt the interface to the payment type selected."
 msgstr ""
 "Champ technique utilisé pour adapter l'interface au type de paiement "
-"sélectionné."
+"sélectionné ."
 
 #: ../../accounting/payables/pay/check.rst:0
 msgid "Check Number"
@@ -12100,7 +12337,6 @@ msgstr ""
 
 #: ../../accounting/payables/pay/sepa.rst:132
 #: ../../accounting/receivables/customer_payments/credit_cards.rst:168
-#: ../../accounting/receivables/customer_payments/followup.rst:168
 #: ../../accounting/receivables/customer_payments/recording.rst:129
 msgid ":doc:`check`"
 msgstr ":doc:`check`"
@@ -12707,227 +12943,80 @@ msgid "Customer Invoices"
 msgstr "Factures clients"
 
 #: ../../accounting/receivables/customer_invoices/cash_discounts.rst:3
-msgid "How to setup cash discounts?"
-msgstr "Comment mettre en place des escomptes de caisse ?"
+msgid "Offer cash discounts"
+msgstr ""
 
 #: ../../accounting/receivables/customer_invoices/cash_discounts.rst:5
 msgid ""
-"Cash discounts are an incentive (usually a small percentage) that you offer "
-"to customers in return for paying a bill owed before the scheduled due date."
-" If used properly, cash discounts improve the Days Sales Outstanding aspect "
-"of a business's cash conversion cycle."
+"Cash discounts are incentives you can offer to customers to motivate them to"
+" pay within a specific time frame. For instance, you offer a 2% discount if "
+"the customer pays you within the first 5 days of the invoice, when it is due"
+" in 30 days. This approach can greatly improve your average collection "
+"period."
 msgstr ""
-"Les escomptes de caisse sont des incitations (généralement un faible "
-"pourcentage) que vous offrez aux clients en échange du payment d'une facture"
-" avant la date d'échéance prévue. S'ils sont utilisés correctement, les "
-"escomptes de caisse améliorent l'aspect « Jours de Ventes Exceptionnelles » "
-"du cycle de conversion de trésorerie des affaires."
 
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:10
+#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:12
+msgid "Set up a cash discount"
+msgstr ""
+
+#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:14
 msgid ""
-"For example, a typical cash discount would be: you offer a 2% discount on an"
-" invoice due in 30 days if the customer were to pay within the first 5 days "
-"of receiving the invoice."
+"To set up a cash discount, go to :menuselection:`Accounting --> "
+"Configuration --> Management --> Payment Terms` and click on *Create*. Add a"
+" *Percent* type of term with a corresponding value (e.g. 98% of the total "
+"price for a 2% discount) and the number of days during which the offer is "
+"valid. You can also change the default balance term if needed."
 msgstr ""
-"Par exemple, un escompte de caisse typique serait : vous offrez un rabais de"
-" 2% sur une facture due à 30 jours si le client paye dans les 5 jours "
-"suivant la réception de la facture."
 
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:18
-msgid "Payment terms"
-msgstr "Conditions de règlement"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:20
-msgid ""
-"In order to manage cash discounts, we will use the payment terms concept of "
-"Odoo (From the Accounting module, go to :menuselection:`Configuration --> "
-"Management --> Payment terms --> Create`)."
+#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:25
+msgid "Start offering the cash discount"
 msgstr ""
-"Afin de gérer les escomptes de caisse, nous allons utiliser le concept de "
-"modalités de paiement dans Odoo (Dans le module Comptabilité, allez à "
-":menuselection:`Configuration --> Divers --> Conditions de paiement --> "
-"Créer`)."
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:24
-msgid ""
-"Let's start with the above example: a 2% discount on an invoice due in 30 "
-"days if the customer were to pay within the first 5 days."
-msgstr ""
-"Commençons par l'exemple ci-dessus: un escompte de 2% sur une facture due à "
-"30 jours si le client paye dans les 5 premiers jours."
 
 #: ../../accounting/receivables/customer_invoices/cash_discounts.rst:27
 msgid ""
-"A typical payment term of 30 days would have only one installment: balance "
-"in 30 days. But, in order to configure the cash discount, you can configure "
-"the payment term with two installments:"
+"Now, you can create a customer invoice and select the cash discount payment "
+"term you added. Once the invoice is validated, Odoo will automatically split"
+" the account receivables part of the journal entry into two installments "
+"having different due dates. Since the discounted price is already "
+"calculated, your payment controls will be simplified."
 msgstr ""
-"Une condition de paiement typique à 30 jours aurait un seul versement : "
-"solde à 30 jours. Mais, afin de configurer l'escompte, vous pouvez "
-"configurer le délai de paiement en deux tranches :"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:31
-msgid "98% within 5 days"
-msgstr "98% dans les 5 jours"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:32
-msgid "balance within 30 days"
-msgstr "solde sous 30 jours"
 
 #: ../../accounting/receivables/customer_invoices/cash_discounts.rst:37
-msgid ""
-"To make it clear that it's not a payment term but a cash discount, don't "
-"forget to set a clear description that will appear on the invoice: Invoice "
-"is due within 30 days, but you can benefit from a 2% cash discount if you "
-"pay within 5 days."
+msgid "Grant the cash discount"
 msgstr ""
-"Pour qu'il soit clair que ce n'est pas une condition de paiement, mais un "
-"escompte de caisse, ne pas oublier de mettre une description claire qui "
-"apparaîtra sur la facture : la facture est payable sous 30 jours, mais vous "
-"pouvez bénéficier d'un escompte de caisse de 2% si vous payez dans les 5 "
-"jours."
 
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:43
-msgid "Bank reconciliation model"
-msgstr "modèle de rapprochement bancaire"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:45
+#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:39
 msgid ""
-"In order to speed up the bank reconciliation process, we can create a model "
-"of entry for all cash discounts. To do that, from the Accounting application"
-" dashboard, click on the \"More\" link on the bank and choose the option "
-"\"Reconciliation Models\"."
+"The customer fulfilled the payment terms and therefore benefits from the "
+"cash discount. When you process the bank statement, match the payment with "
+"the related journal entry. Then, select the remaining cash discount and "
+"click on *Create Write-off* to reconcile it."
 msgstr ""
-"Afin d'accélérer le processus de rapprochement bancaire, nous pouvons créer "
-"un modèle de pièce pour tous les escomptes de caisse. Pour ce faire, depuis "
-"l'application tableau de bord de la Comptabilité, cliquez sur le lien "
-"\"Plus\" de la Banque et choisissez l'option \"Modèles de lettrage\"."
 
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:53
-msgid "Create a new model for cash discounts as follow:"
-msgstr "Créer un nouveau modèle d'escompte de caisse comme suit :"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:55
-msgid "**Button Label**: Cash Discount"
-msgstr "**Nom du bouton** : Escompte de Caisse"
+#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:48
+msgid ""
+"You can also create a dedicated reconciliation model to make the process "
+"easier. In this case, you should add a tax to the model based on the taxes "
+"applied to your invoices. This means that if you handle multiple tax rates, "
+"you need to create several reconciliation models. Note that depending on "
+"your localisation, you might already have a Cash Discount model available by"
+" default."
+msgstr ""
 
 #: ../../accounting/receivables/customer_invoices/cash_discounts.rst:56
-msgid "**Account**: Cash Discount (according to your country)"
-msgstr "**Compte** : Escomptes accordés (665000)"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:57
-msgid "**Amount Type**: Percentage"
-msgstr "**Type de montant** : Pourcentage de la balance"
+msgid "Register the full payment"
+msgstr ""
 
 #: ../../accounting/receivables/customer_invoices/cash_discounts.rst:58
-msgid "**Amount**: 100%"
-msgstr "**Montant** : 100%"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:60
-msgid "**Taxes**: depending on your country, you may put a tax on the cash"
+msgid ""
+"In this case, the customer has not fulfilled the payment term and cannot "
+"benefit from the cash discount. When you process the bank statement, match "
+"the payment with the two related journal entries."
 msgstr ""
-"**Taxes** : selon votre pays, vous pouvez devoir mettre une taxe sur "
-"l'escompte"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:60
-msgid "discount if taxes have to be deduced"
-msgstr " de caisse si les taxes doivent être déduites"
 
 #: ../../accounting/receivables/customer_invoices/cash_discounts.rst:67
-msgid ""
-"Even if it's a 2% cash discount, set a 100% amount on the reconciliation "
-"model as it means 100% of the remaining balance (the 2%). You can use the "
-"same reconciliation model for all your cash discount. No need to create a "
-"model per payment term."
+msgid ":doc:`../../receivables/customer_invoices/payment_terms`"
 msgstr ""
-"Même si c'est un escompte de caisse de 2%, fixez un montant de 100% sur le "
-"modèle de lettrage, car cela signifie 100% du solde restant (les 2%). Vous "
-"pouvez utiliser le même modèle de rapprochement pour tous vos escomptes de "
-"caisse. Pas besoin de créer un modèle par terme de paiement."
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:73
-msgid "Creating an invoice with a cash discount"
-msgstr "Créer une facture avec un escompte de caisse"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:75
-msgid ""
-"When you create a customer invoice, set the right payment term \"30 days, 2%"
-" cash discount\" right after having selected the customer."
-msgstr ""
-"Lorsque vous créez une facture client, définissez les conditions de "
-"règlement exactes \"30 jours, 2% d'escompte de caisse\" juste après avoir "
-"sélectionné le client."
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:81
-msgid ""
-"Once the invoice is validated, Odoo will automatically split the account "
-"receivable part of the journal entry with two installments having a "
-"different due date: 98% within 5 days, 2% within 30 days."
-msgstr ""
-"Une fois la facture validée, Odoo divisera automatiquement la partie dette "
-"client de la pièce comptable en deux tranches avec des dates d'échéance "
-"différentes : 98% dans les 5 jours, 2% dans les 30 jours."
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:92
-msgid "Paying the invoice with a cash discount"
-msgstr "Payer la facture comportant un escompte"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:94
-msgid ""
-"If the customer pays with a cash discount, when processing the bank "
-"statement, you will match the payment (98%) with the related line in the "
-"journal entry."
-msgstr ""
-"Si le client paie avec un escompte de caisse, lors du traitement du relevé "
-"bancaire, vous ferez correspondre le paiement (98%) avec la ligne associée "
-"de la pièce comptable."
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:101
-msgid ""
-"As you can see in the above screenshot, when selecting the customer, you "
-"also see the 2% remaining of 3$. If you want to accept the cash discount (if"
-" the customer paid within the 5 days), you can click on this line with 2%, "
-"click on \"Open Balance\", and select your \"Cash Discount\" reconciliation "
-"model. That way, the invoice is marked as fully paid."
-msgstr ""
-"Comme vous pouvez le voir dans la capture d'écran ci-dessus, lors du choix "
-"du client, vous voyez aussi les 2% restants, soit $3. Si vous choisissez "
-"d'accepter l'escompte (si le client a payé dans les 5 jours), vous pouvez "
-"cliquer sur cette ligne avec 2%, cliquez sur \"Open Balance\", et "
-"sélectionnez votre modèle de lettrage « Escompte de Caisse ». De cette "
-"façon, la facture est marquée comme entièrement payée."
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:109
-msgid ""
-"from now on, matching the remaining 2% has to be done manually. In the "
-"future, we plan to automate the reconciliation of the 2% if the 98% are paid"
-" on time."
-msgstr ""
-"from now on, matching the remaining 2% has to be done manually. In the "
-"future, we plan to automate the reconciliation of the 2% if the 98% are paid"
-" on time."
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:113
-msgid "Paying the invoice in full"
-msgstr "Payer la facture entièrement"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:115
-msgid ""
-"If the customer pays the invoice fully, without benefiting from the cash "
-"discount, you will reconcile the payment (in full) with the two lines from "
-"the invoice (98% and 2%). Just click on the two lines to match them with the"
-" payment."
-msgstr ""
-"Si le client paie la facture entièrement, sans bénéficier de l'escompte, "
-"vous lettrerez le paiement (en entier) avec les deux lignes de la facture "
-"(98% et 2%). Il suffit de cliquer sur les deux lignes pour les faire "
-"correspondre avec le paiement."
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:125
-#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:116
-#: ../../accounting/receivables/customer_invoices/installment_plans.rst:86
-msgid ":doc:`overview`"
-msgstr ":doc:`overview`"
 
 #: ../../accounting/receivables/customer_invoices/cash_rounding.rst:2
 msgid "Set up cash roundings"
@@ -13216,6 +13305,11 @@ msgstr ""
 "Pour analyser tous vos contrats actuels ayant un revenu différé, vous pouvez"
 " utiliser le menu :menusélection:`Rapport --> Analyse des revenus différés`."
 
+#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:116
+#: ../../accounting/receivables/customer_invoices/installment_plans.rst:86
+msgid ":doc:`overview`"
+msgstr ":doc:`overview`"
+
 #: ../../accounting/receivables/customer_invoices/installment_plans.rst:3
 msgid "How to define an installment plan on customer invoices?"
 msgstr ""
@@ -13897,372 +13991,6 @@ msgstr ""
 msgid "Customer Payments"
 msgstr "Paiements client"
 
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:3
-msgid "How to automate customer follow-ups with plans?"
-msgstr "Comment automatiser et planifier le suivi des paiements clients ?"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:5
-msgid ""
-"With the Odoo Accounting application, you get a dynamic aged receivable "
-"report, customer statements and you can easily send them to customers."
-msgstr ""
-"Avec la comptabilité d'Odoo, Vous disposez d'un rapport dynamique Balance "
-"Agée Clients, de relevés clients, que vous pouvez envoyer facilement aux "
-"clients."
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:8
-msgid ""
-"If you want to go further in the automation of the credit collection "
-"process, you can use follow-up plans. They will help you automate all the "
-"steps to get paid, by triggering them at the right time: send customer "
-"statements by emails, send regular letter (through the Docsaway "
-"integration), create a task to manually call the customer, etc..."
-msgstr ""
-"Si vous voulez aller plus loin dans l'automatisation du processus de "
-"recouvrement, vous pouvez utiliser des plans de relance. Ils vous aideront à"
-" automatiser toutes les étapes pour vous faire payer, en les déclenchant au "
-"bon moment : envoyer les relevés des clients par courriels, envoyer des "
-"courriers postaux (grâce à l'interface Docsaway), planifier des appels "
-"téléphoniques des client, etc ..."
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:14
-msgid "Here is an example of a plan:"
-msgstr "Voici un exemple de plan de relance :"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:17
-msgid "When?"
-msgstr "Quand ?"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:17
-msgid "What?"
-msgstr "Quoi ?"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:17
-msgid "Who?"
-msgstr "Qui ?"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:19
-msgid "3 days before due date"
-msgstr "3 jours après la date d'échéance"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:19
-msgid "Email"
-msgstr "Courriel"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:19
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:21
-msgid "automated"
-msgstr "automatisé"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:21
-msgid "1 day after due date"
-msgstr "1 jour après la date d'échéance"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:21
-msgid "Email + Regular Letter"
-msgstr "Courriel + Courrier Postal"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:23
-msgid "15 days after due date"
-msgstr "15 jours après la date d'échéance"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:23
-msgid "Call the customer"
-msgstr "Appeler le client"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:23
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:25
-msgid "John Mac Gregor"
-msgstr "John Mac Gregor"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:25
-msgid "35 days after due date"
-msgstr "35 jours après la date d'échéance"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:25
-msgid "Email + Letter + Call"
-msgstr "Courriel + Courrier Postal + Appel"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:27
-msgid "60 days after due date"
-msgstr "60 jours après la date d'échéance"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:27
-msgid "Formal notice"
-msgstr "Mise en demeure"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:27
-msgid "Bailiff"
-msgstr "Bailiff"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:34
-msgid "Install Reminder Module"
-msgstr "Installez le module de rappel"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:36
-msgid ""
-"You must start by activating the feature, using the menu "
-":menuselection:`Configuration --> Settings` of the Accounting application. "
-"From the settings screen, activate the feature **Enable payment follow-up "
-"management**."
-msgstr ""
-"Vous devez commencer par activer la fonction, en utilisant le menu "
-":menuselection:`Configuration --> Configuration` de l'application de "
-"Comptabilité. Dans l'écran des paramètres, dans la section Facturation et "
-"paiements, cochez l'option **Activer la gestion des relances de paiement**."
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:44
-msgid "Define Payment Follow-ups Levels"
-msgstr "Définir des niveaux de relance de paiement"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:46
-msgid ""
-"To automate customer follow ups, you must configure your follow–up levels "
-"using the menu :menuselection:`Accounting --> Configuration --> Payment "
-"Follow-ups`. You should define one and only one follow-up plan per company."
-msgstr ""
-"Pour automatiser les relances de paiement client, vous devez configurer vos "
-"niveaux de relance en utilisant le menu :menuselection:`Configuration --> "
-"Configuration --> Configurez vos niveaux de relance` dans la section "
-"Facturation et paiements. Vous devez définir un et un seul plan de relance "
-"pour chacune de vos sociétés."
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:50
-msgid ""
-"The levels of follow-up are relative to the due date; when no payment term "
-"is specified, the invoice date will be considered as the due date."
-msgstr ""
-"Les niveaux de relance se réfèrent à la date d'échéance; si aucune condition"
-" de règlement n'est spécifiée, la date d'échéance sera égale à la date "
-"d'émission de la facture."
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:53
-msgid ""
-"For each level, you should define the number of days and create a note which"
-" will automatically be added into the reminder letter."
-msgstr ""
-"Pour chaque niveau, vous devez définir le nombre de jours et créer une note "
-"qui sera automatiquement ajoutée à la lettre de rappel."
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:59
-msgid "Odoo defines several actions for every reminder:"
-msgstr "Odoo définit plusieurs actions pour chaque rappel :"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:61
-msgid ""
-"**Manual Action:** assign a responsible that will have to call the customer"
-msgstr "**Action Manuelle:** désigner la personne chargée d'appeler le client"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:62
-msgid "**Send an Email:** send an email to customer using the provided text"
-msgstr ""
-"**Envoyer un Courriel:** envoyer un courriel au client en utilisant le texte"
-" fourni"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:63
-msgid ""
-"**Send a Letter:** send a letter by regular mail, using the provided note"
-msgstr ""
-"**Envoyer une Lettre:** envoyer une lettre par courrier postal, en utilisant"
-" la note fournie"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:69
-msgid ""
-"As you need to provide a number of days relative to the due date, you can "
-"use a negative number. As an example, if an invoice is issued the January "
-"1st but the due date is January 20, if you set a reminder 3 days before the "
-"due date, the customer may receive an email in January 17."
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:76
-msgid "Doing your weekly follow-ups"
-msgstr "Faire vos relances hebdomadaires"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:78
-msgid ""
-"Once everything is setup, Odoo will prepare follow-up letters and emails "
-"automatically for you. All you have to do is to the menu "
-":menuselection:`Sales --> Customers Statement` in the accounting "
-"application."
-msgstr ""
-"Une fois que tout sera configuré, Odoo vous préparera automatiquement les "
-"lettres et les courriels de relances. Tout ce que vous avez à faire est "
-"d'aller à :menuselection:`Ventes -> Relevé Clients` dans l'application de "
-"Comptabilité."
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:85
-msgid ""
-"Odoo will automatically propose you actions based on the follow-up plan you "
-"defined, invoices to pay and payment received."
-msgstr ""
-"Odoo vous proposera automatiquement des actions sur la base du plan de "
-"relances que vous avez défini, des factures à payer et des paiements reçus."
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:88
-msgid ""
-"You can use this menu every day, once a week or once a month. You do not "
-"risk to send two times the same reminder to your customer. Odoo only "
-"proposes you the action you have to do. If you do it every day, you will "
-"have a few calls to do per day. If you do it once a month, you will have "
-"much more work once you do it."
-msgstr ""
-"Vous pouvez utiliser ce menu chaque jour, une fois par semaine ou une fois "
-"par mois. Vous ne risquez pas d'envoyer deux fois le même rappel à votre "
-"client. Odoo vous propose seulement l'action que vous avez à faire. Si vous "
-"le faites tous les jours, vous n'aurez que quelques appels à faire par jour."
-" Si vous ne le faites qu'une fois par mois, vous aurez beaucoup plus de "
-"travail à faire à chaque fois."
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:94
-msgid ""
-"It's up to you to organize the way you want to work. But it's a good "
-"practice to reconcile your bank statements before launching the follow-ups. "
-"That way, all paid invoices will be reconciled and you will not send a "
-"follow-up letter to a customer that already paid his invoice."
-msgstr ""
-"C'est à vous de définir la façon dont vous voulez travailler. Mais il est "
-"conseillé de rapprocher vos relevés bancaires avant de lancer les relances. "
-"De cette façon, toutes les factures payées sera rapprochées et vous "
-"n'enverrez pas de relances aux clients qui ont déjà payé leurs factures."
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:99
-msgid "From a customer follow-up proposition, you can:"
-msgstr "Depuis une proposition de relance client, vous pouvez :"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:101
-msgid "Get the customer information to contact him"
-msgstr "Accéder aux informations du client pour le contacter"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:103
-msgid "Drill down to the customer information form by clicking on its name"
-msgstr "Consulter en détail une fiche client en cliquant sur son nom"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:105
-msgid "Change the text (or the email or letter) and adapt to the customer"
-msgstr ""
-"Modifier le texte (ou le courriel ou la lettre) et l'adapter au client"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:107
-msgid ""
-"Change the colored dot to mark the customer as being a good, normal or bad "
-"debtor"
-msgstr ""
-"Modifier le point de couleur pour marquer le client comme étant un bon, "
-"normal ou mauvais payeur"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:110
-msgid "Log a note is you called the customer"
-msgstr "Enregistrer une note si vous avez appelé le client"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:112
-msgid "Exclude some invoices from the statement table (litigation)"
-msgstr "Exclure certaines factures du tableau de relevé (litiges)"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:114
-msgid "Send an email with the statement"
-msgstr "Envoyer un courriel avec le relevé"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:116
-msgid ""
-"Print a letter, or send a regular mail (if you installed the Docsaway "
-"integration)"
-msgstr ""
-"Imprimer une lettre, et l'envoyer par courrier postal (si vous avez installé"
-" l'interface Docsaway)"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:119
-msgid ""
-"Plan the next reminder (but it's better to keep in automatic mode so that "
-"Odoo will stick to the follow-up plan of the company)"
-msgstr ""
-"Planifier le prochain rappel (mais il est préférable de rester en mode "
-"automatique afin qu'Odoo reste au plus prés du plan de relances de votre "
-"entreprise)"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:122
-msgid "Drill down to an invoice"
-msgstr "Consulter en détail une facture"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:124
-msgid ""
-"Change the expected payment date of an invoice (thus, impacting the next "
-"time Odoo will propose you to send a reminder)"
-msgstr ""
-"Changer la date de paiement attendue d'une facture (donc, modifier la "
-"prochaine fois qu'Odoo vous proposera d'envoyer un rappel)"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:128
-msgid ""
-"You can force a customer statement, even if Odoo do not proposes you to do "
-"it, because it's not the right date yet. To do this, you should go to the "
-"Aged Receivable report (in the report menu of the Accounting application). "
-"From this report, you can click on a customer to get to his customer "
-"statement."
-msgstr ""
-"Vous pouvez forcer un relevé client, même si Odoo ne vous propose pas de le "
-"faire parce que ce n'est pas encore la bonne date. Pour ce faire, vous devez"
-" aller dans la Balance Agée Client (dans le menu Rapport de l'application de"
-" Comptabilité). A partir de ce rapport, vous pouvez cliquer sur un client "
-"pour obtenir son relevé client."
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:135
-msgid "How to exclude an invoice from auto follow up?"
-msgstr "Comment exclure une facture des relances automatiques ?"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:137
-msgid "To see all **overdue invoices** or **on need of action**,"
-msgstr ""
-"Pour voir toutes les **factures impayées** ou **nécessitant une action**,"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:139
-msgid "Go to :menuselection:`Accounting --> Sales --> Customers Statement`"
-msgstr "allez à :menuselection:`Ventes --> Relevé clients`"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:145
-msgid "Exclude a specific invoice for a specific date"
-msgstr "Exclure une facture spécifique pour une date précise"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:147
-msgid ""
-"Odoo can exclude an invoice from follow-ups actions for specific date by "
-"clicking on **Log a Note**, then choose one of the ready options (*one "
-"week*, *two weeks*, *one month*, *two months*), So Odoo will calculate the "
-"required date according to the current date."
-msgstr ""
-"Odoo peut exclure une facture des actions de relance pour une date "
-"spécifique en cliquant sur **Enregistrer une note*, puis en choisissant "
-"l'une des options préréglées (*une semaine*, *deux semaines*, *un mois*, "
-"*deux mois*), ainsi Odoo calculera la date requise en fonction de la date "
-"actuelle."
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:155
-msgid ""
-"Another way to achieve it is the following: click on the required invoice, "
-"then choose **Change expected payment date/note**, then enter a new payment "
-"date and note."
-msgstr ""
-"Une autre façon d'y parvenir est la suivante : cliquez sur la facture "
-"requise, puis choisissez **Modifier la date de paiement prévue / la note**, "
-"puis entrez une nouvelle date de paiement et/ou une nouvelle note."
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:162
-msgid "Exclude a specific invoice forever"
-msgstr "Exclure une facture spécifique définitivement"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:164
-msgid ""
-"Odoo can exclude an invoice for a specific customer by clicking on the "
-"checkbox **Excluded**"
-msgstr ""
-"Odoo peut exclure une facture pour un client spécifique en cliquant sur la "
-"case à cocher **Exclue**"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:168
-msgid "If you click on **History**, you can see all follow ups actions."
-msgstr ""
-"Si vous cliquez sur **Historique**, vous pouvez voir tous les actions de "
-"relance."
-
 #: ../../accounting/receivables/customer_payments/check.rst:3
 msgid "How to register customer payments by checks?"
 msgstr "Comment enregistrer les paiements par chèques des clients ?"
@@ -14777,7 +14505,6 @@ msgstr ""
 "concernée)."
 
 #: ../../accounting/receivables/customer_payments/credit_cards.rst:166
-#: ../../accounting/receivables/customer_payments/followup.rst:167
 msgid ":doc:`recording`"
 msgstr ":doc:`recording`"
 
@@ -14792,305 +14519,95 @@ msgid ":doc:`followup`"
 msgstr ":doc:`followup`"
 
 #: ../../accounting/receivables/customer_payments/followup.rst:3
-msgid "How to get paid and organize customer follow-ups?"
-msgstr "Comment se faire payer et organiser le suivi des paiements clients ?"
+msgid "Follow-up on invoices and get paid faster"
+msgstr ""
 
 #: ../../accounting/receivables/customer_payments/followup.rst:5
 msgid ""
-"Getting paid and organizing customer reminders is always a difficult task, "
-"however it is critical for the health of the company to stay diligent about "
-"outstanding receivables. Fortunately, Odoo provides the right tools to track"
-" receivables, automate customer statements, and measure your performance."
+"It is essential for your business to collect payments when they are overdue."
+" Odoo will help you identify payments that are late and will allow you to "
+"send the appropriate reminders."
 msgstr ""
-"Se faire payer et organiser les relances des clients est toujours une tâche "
-"difficile, mais il est essentiel pour la santé de l'entreprise de rester "
-"vigilant au sujet des créances impayées. Heureusement, Odoo fournit les bons"
-" outils pour le suivi des créances, l'automatisation des relevés clients, et"
-" la mesure de votre performance."
 
-#: ../../accounting/receivables/customer_payments/followup.rst:12
-msgid "Customer follow-ups: A step by step guide"
-msgstr "Suivi des paiements clients : un guide pas à pas"
+#: ../../accounting/receivables/customer_payments/followup.rst:10
+msgid "Manage your follow-ups"
+msgstr ""
 
-#: ../../accounting/receivables/customer_payments/followup.rst:15
-msgid "Cleaning up outstanding payments"
-msgstr "Nettoyage des paiements en suspens"
+#: ../../accounting/receivables/customer_payments/followup.rst:13
+msgid ""
+"We recommend that you reconcile your bank statements before launching your "
+"follow-up process. It will avoid you the trouble of sending a statement to a"
+" customer that has already paid you."
+msgstr ""
 
 #: ../../accounting/receivables/customer_payments/followup.rst:17
 msgid ""
-"If you have any unreconciled transactions in your bank account, you will "
-"need to process them first before you begin analyzing your customers "
-"statements. This ensures that you have recorded all of the latest customer "
-"payments before sending out reminders to any customers with outstanding "
-"balances."
+"The overdue invoices you need to follow-up on are available by default in "
+":menuselection:`Accounting --> Sales --> Follow-up Reports`. There, you can "
+"easily send a reminder by email or print it as a letter. Then, you can click"
+" on the *Done* button to view the next follow-up that needs your attention."
 msgstr ""
-"Si vous avez des transactions non lettrées dans votre compte de banque, vous"
-" devrez préalablement les traiter avant de commencer l'analyse de vos "
-"relevés clients. Cela garantit que vous avez enregistré tous les derniers "
-"paiements des clients avant d'envoyer des rappels à tous les clients avec "
-"des soldes impayés."
 
-#: ../../accounting/receivables/customer_payments/followup.rst:27
-msgid "Checking the Aged Receivables report"
-msgstr "Vérification de la Balance Agée Clients"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:29
+#: ../../accounting/receivables/customer_payments/followup.rst:23
 msgid ""
-"After you have reconciled all of your bank accounts, you can then generate "
-"an accurate Aged Receivables Report from the Reports menu. This report will "
-"display all of the customers and their outstanding balances on open "
-"invoices."
+"Otherwise, if now is not the time for a reminder, click on *Remind me "
+"later*. You will get the next report according to the *Next Reminder Date* "
+"set on the statement."
 msgstr ""
-"Après avoir lettré tous vos comptes de banque, vous pouvez alors générer une"
-" Balance Agée Client précise dans le menu Rapports. Ce rapport affiche tous "
-"les clients et leurs soldes impayés sur les factures ouvertes."
 
-#: ../../accounting/receivables/customer_payments/followup.rst:37
+#: ../../accounting/receivables/customer_payments/followup.rst:28
 msgid ""
-"The report displays this information in time increments to better paint a "
-"picture of the outstanding balances your customers hold and for how long "
-"they have held these outstanding balances. You can then appropriately focus "
-"your efforts on the appropriate customers."
+"To avoid sending too many reminders in a short period of time, change the "
+"number of days calculated between each report by going to "
+":menuselection:`Accounting --> Configuration --> Settings --> Payment "
+"Follow-up`."
+msgstr ""
+
+#: ../../accounting/receivables/customer_payments/followup.rst:33
+msgid ""
+"You can also set a trust level for your customers by marking them as bad, "
+"normal or good debtors on the follow-up reports."
+msgstr ""
+
+#: ../../accounting/receivables/customer_payments/followup.rst:40
+msgid "Send reminders in batch"
 msgstr ""
-"Le rapport affiche cette information par périodes pour mieux dresser un "
-"tableau des soldes impayés que vos clients détiennent et depuis combien de "
-"temps ils les détiennent. Vous pouvez ainsi concentrer vos efforts sur les "
-"clients appropriés."
 
 #: ../../accounting/receivables/customer_payments/followup.rst:42
 msgid ""
-"You can then select any of the customers on this list and Odoo will open up "
-"their invoice details in the form of the Customer Follow-Up letter, also "
-"known as the **Customer Statement**."
+"To get your follow-up process easier, you can send reminder emails in batch "
+"from your follow-up reports page. Select all the reports you would like to "
+"process, click on *Action* and then on *Process Follow-ups*. A pdf document "
+"containing all of the follow-up letters for you to print will also be "
+"automatically generated."
 msgstr ""
-"Vous pouvez alors sélectionner l'un des clients sur cette liste et Odoo "
-"ouvrira les détails de leurs factures sous la forme de Suivi des Créances "
-"Client, également connu sous le nom **Relevé Client**."
 
-#: ../../accounting/receivables/customer_payments/followup.rst:49
-msgid "From the customer statement, you can:"
-msgstr "Depuis le relevé client, vous pouvez :"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:51
-msgid "Change and customize the message that is sent to the customer"
-msgstr "Modifier et personnaliser le message qui est envoyé au client"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:53
-msgid "Send a reminder email to the customer"
-msgstr "Envoyer un courriel de rappel au client"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:55
-msgid "Send a printed reminder letter to the customer"
-msgstr "Envoyer une lettre imprimée au client"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:57
-msgid "Send automated printed reminders by utilizing our Docsaway integration"
+#: ../../accounting/receivables/customer_payments/followup.rst:52
+msgid "Plan a follow-up process"
 msgstr ""
-"Envoyer des rappels imprimés automatisés en utilisant notre interface avec "
-"Docsaway"
 
-#: ../../accounting/receivables/customer_payments/followup.rst:60
-msgid "Zoom in on the different open invoices or payments"
-msgstr "Zoomer sur les différentes factures ouvertes et sur les paiements"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:62
-msgid "Remove an invoice or payment from the report (in case of conflict)"
-msgstr "Retirer une facture ou un paiement du rapport (en cas de désaccord)"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:64
-msgid "Log any call notes made to the customer"
-msgstr "Enregistrer toutes les notes de rappel faites au client"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:66
+#: ../../accounting/receivables/customer_payments/followup.rst:54
 msgid ""
-"Schedule your next follow up task to stay on top of customer payments (e.g. "
-"call back in 15 days if not payments are made)"
+"To plan a follow-up process, go to :menuselection:`Accounting --> "
+"Configuration --> Settings` and activate the *Follow-up Levels* feature "
+"under the *Customer Payments* section. Then, click on the new *Follow-up "
+"Levels* button that has appeared on your settings page."
+msgstr ""
+
+#: ../../accounting/receivables/customer_payments/followup.rst:59
+msgid ""
+"A follow-up plan with several actions is available by default in Odoo, but "
+"you can customize it any way you want. Depending on a specific number of "
+"overdue days, plan to send an email, a letter or to undertake a manual "
+"action. You can also edit the template used for the statement according to "
+"the stage of the process."
 msgstr ""
-"Planifiez votre prochaine tâche pour suivre de près les paiements clients "
-"(par exemple rappeler dans les 15 jours si aucun paiement n'est effectué)"
 
 #: ../../accounting/receivables/customer_payments/followup.rst:69
 msgid ""
-"You can set reminders for when you would like to next contact the particular"
-" customer. Selecting **Manual** will open up the follow up scheduling tool, "
-"while selecting **Auto** will automatically recommend that you contact the "
-"customer 15 days from then if the customer has not yet paid for the invoice."
-" Installing the **Follow-Up Plans** module will allow you to define "
-"automated actions and intervals to send reminders."
+"If you would like to get a reminder before the actual due date, set a "
+"negative number of due days."
 msgstr ""
-"Vous pouvez configurer des rappels lorsque vous souhaitez contacter un "
-"client particulier. Sélectionner **Manuel** ouvrira l'outil de "
-"plannification de rappel, alors que sélectionner **Auto** plannifiera "
-"automatiquement un rappel du client 15 jours plus tard si le client n'a "
-"toujours pas payé la facture. L'installation du module **Gestion des "
-"relances de paiement** vous permettra de définir d'autres actions et "
-"intervalles automatisés pour envoyer des rappels."
-
-#: ../../accounting/receivables/customer_payments/followup.rst:79
-msgid ""
-"If you have already sent out a reminder to a customer a few days ago, a "
-"warning message will appear at the top of the screen, reminding you that you"
-" should not send another reminder so soon since one was already sent "
-"recently. Every time you log a note, Odoo will automatically set the next "
-"reminder date, unless you choose to manually set it by selecting the next "
-"reminder button at the top right of the screen."
-msgstr ""
-"Si vous avez déjà envoyé un rappel à un client quelques jours auparavant, un"
-" message d'avertissement apparaîtra en haut de l'écran, vous rappelant que "
-"vous ne devriez pas déjà envoyer un autre rappel puisque l'on en a déjà "
-"envoyé un récemment. Chaque fois que vous enregistrez un rappel, Odoo "
-"plannifiera automatiquement la prochaine date de rappel, à moins que vous "
-"choisissez de le régler manuellement en sélectionnant le bouton de rappel "
-"suivant en haut à droite de l'écran."
-
-#: ../../accounting/receivables/customer_payments/followup.rst:88
-msgid ""
-"You can also specify the expected payment date on an invoice line directly, "
-"therefore defining the next reminder in case the invoice has not been paid."
-msgstr ""
-"Vous pouvez également préciser la date de paiement attendue directement sur "
-"chaque ligne de facture, définissant ainsi le prochain rappel au cas où la "
-"facture n'aurait pas été payée."
-
-#: ../../accounting/receivables/customer_payments/followup.rst:92
-msgid "Sending customer statements"
-msgstr "Envoi de relevés clients"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:94
-msgid ""
-"Send your customers reminders in batches in the menu :menuselection:`Sales "
-"--> Customer Statements`."
-msgstr ""
-"Envoyez vos rappels clients par lots par le menu :menuselection:`Ventes --> "
-"Relevé clients`."
-
-#: ../../accounting/receivables/customer_payments/followup.rst:97
-msgid ""
-"Here Odoo will open all the statements awaiting to be processed, which is "
-"determined by the last reminder they received. You can choose to process "
-"them one by one, send multiple letters or emails in batches, or set a next "
-"action date for the next time they'll be contacted."
-msgstr ""
-"Ici Odoo ouvrira toutes les relevés en attente de traitement, ce qui est "
-"déterminé par le dernier rappel qu'ils ont reçu. Vous pouvez choisir de les "
-"traiter un par un, en envoyant plusieurs lettres ou courriels par lots, ou "
-"définir une la prochaine date à laquelle ils seront contactés."
-
-#: ../../accounting/receivables/customer_payments/followup.rst:104
-msgid ""
-"If an invoice has not yet been paid, Odoo will remind you to contact at "
-"particular customer based after their next action date."
-msgstr ""
-"Si une facture n'a pas encore été payée, Odoo vous rappellera de contacter "
-"ce client en fonction de sa prochaine date de rappel."
-
-#: ../../accounting/receivables/customer_payments/followup.rst:107
-msgid ""
-"You can access the customer statement report daily and Odoo will only "
-"display the customers you need to contact on any given day. This is based "
-"on:"
-msgstr ""
-"Vous pouvez accéder au rapport de relevé client quotidiennement et Odoo "
-"affichera uniquement les clients que vous avez besoin de contacter chaque "
-"jour. Ceci est basé sur :"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:111
-msgid "Customers you have not yet received a payment from"
-msgstr "Les clients pour lesquels vous n'avez pas encore reçu de paiement"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:113
-msgid ""
-"Customers that have not been reminded over the last X days (\"X\" being "
-"defined as the overdue date of the invoice after the first reminder, then "
-"the next action date set at every reminder)"
-msgstr ""
-"Les clients qui n'ont pas rappelés au cours des X derniers jours (\"X\" "
-"étant défini comme la date de retard de la facture après le premier rappel, "
-"puis comme la prochaine date d'action fixée à chaque rappel)"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:118
-msgid "Setting up your dunning process"
-msgstr "Configuration de votre processus de relance"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:120
-msgid ""
-"The **Payment Follow-up Management** module allows you to define reminder "
-"plans. After installing it from the **Apps** menu, go to the **Follow-up "
-"Levels** menu in the accounting configuration to set up your dunning "
-"process."
-msgstr ""
-"Le module **Gestion des relances de paiement** vous permet de définir des "
-"plans de rappel. Après l'avoir installé depuis le menu **Applications**, "
-"aller dans le menu **Niveaux de relance** dans la configuration de la "
-"Comptabilité pour configurer votre processus de relance."
-
-#: ../../accounting/receivables/customer_payments/followup.rst:125
-msgid "Some Examples are:"
-msgstr "Quelques exemples :"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:127
-msgid "**Email**: 3 days before overdue date"
-msgstr "**Courriel** : 3 jours après la date d'échéance"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:129
-msgid "**Email+Letter**: at the overdue date"
-msgstr "**Courriel+Lettre** : à la date d'échéance"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:131
-msgid "**Email+Call**: 15 days after the overdue date"
-msgstr "**Courriel+Appel** : 15 jours après la date d'échéance"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:133
-msgid "**Email+Letter**: 60 days after the overdue date"
-msgstr "**Courriel+Lettre** : 60 jours après la date d'échéance"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:138
-msgid ""
-"Thanks to this module, you can send every email and letters in batches for "
-"all your customers at once. The next reminder will automatically be computed"
-" based on your configured follow-up plan."
-msgstr ""
-"Grâce à ce module, vous pouvez envoyer tous les courriels et les lettres par"
-" lots pour tous vos clients à la fois. Le prochain rappel sera "
-"automatiquement calculé en fonction de la configuration de votre plan de "
-"relances."
-
-#: ../../accounting/receivables/customer_payments/followup.rst:142
-msgid ""
-"The module will also add a red/green dot on each customer, this will allow "
-"you to easily mark customer status's with the following options: \"Good "
-"Debtor, Normal Debtor, or bad debtors."
-msgstr ""
-"Le module ajoutera également un point rouge/vert sur chaque client, ce qui "
-"vous indiquera facilement les statuts des clients avec les options "
-"suivantes: \"Bon Payeur, Payeur Normal, ou Mauvais Payeur\"."
-
-#: ../../accounting/receivables/customer_payments/followup.rst:150
-msgid "DSO: Measuring your performance"
-msgstr "DMP : Mesurez votre performance"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:152
-msgid ""
-"The DSO (Days of Outstanding Sales) is a measure of the average number of "
-"days that a company takes to collect revenue after a sale has been made. DSO"
-" is calculated by dividing the amount of accounts receivable during a given "
-"period by the total value of credit sales during the same period, and "
-"multiplying the result by the number of days in the period measured."
-msgstr ""
-"Le DMP (Délai Moyen de Paiement) est une mesure du nombre moyen de jours "
-"qu'une entreprise met à percevoir des revenus après qu'une vente a été "
-"faite. Le DMP est calculé en divisant le montant des comptes débiteurs au "
-"cours d'une période donnée par la valeur totale des ventes de crédit au "
-"cours de la même période, et en multipliant le résultat par le nombre de "
-"jours de la période mesurée."
-
-#: ../../accounting/receivables/customer_payments/followup.rst:159
-msgid ""
-"You can get the DSO of your company from the Executive Summary report under "
-"Reporting (check the KPI average debtors days)."
-msgstr ""
-"Vous pouvez obtenir le DMP de votre entreprise dans le rapport Note de "
-"Synthèse (vérifier les ICP jours moyens débiteurs)."
 
 #: ../../accounting/receivables/customer_payments/payment_sepa.rst:3
 #: ../../accounting/receivables/customer_payments/payment_sepa.rst:29
diff --git a/locale/fr/LC_MESSAGES/applications.po b/locale/fr/LC_MESSAGES/applications.po
index 5492a3f09..d62a4154e 100644
--- a/locale/fr/LC_MESSAGES/applications.po
+++ b/locale/fr/LC_MESSAGES/applications.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2015-TODAY, Odoo S.A.
-# This file is distributed under the same license as the Odoo Business package.
+# This file is distributed under the same license as the Odoo package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 10.0\n"
+"Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-07 09:30+0200\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Martin Trigaux <mat@odoo.com>, 2017\n"
+"Last-Translator: Martin Trigaux, 2018\n"
 "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,4 +20,4 @@ msgstr ""
 
 #: ../../applications.rst:3
 msgid "Applications"
-msgstr "Applications"
+msgstr "Candidatures"
diff --git a/locale/fr/LC_MESSAGES/discuss.po b/locale/fr/LC_MESSAGES/discuss.po
index e99bffdc4..16b104acf 100644
--- a/locale/fr/LC_MESSAGES/discuss.po
+++ b/locale/fr/LC_MESSAGES/discuss.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-27 11:08+0200\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: kaj nithi <kajanth.nithiy@skipthedishes.ca>, 2018\n"
 "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n"
@@ -30,23 +30,32 @@ msgstr ""
 msgid ""
 "This document is mainly dedicated to Odoo on-premise users who don't benefit"
 " from an out-of-the-box solution to send and receive emails in Odoo, unlike "
-"in `Odoo Online <https://www.odoo.com/trial>`__ & `Odoo.sh "
+"`Odoo Online <https://www.odoo.com/trial>`__ & `Odoo.sh "
 "<https://www.odoo.sh>`__."
 msgstr ""
 
 #: ../../discuss/email_servers.rst:9
 msgid ""
 "If no one in your company is used to manage email servers, we strongly "
-"recommend that you opt for such convenient Odoo hosting solutions. Indeed "
-"their email system works instantly and is monitored by professionals. "
-"Nevertheless you can still use your own email servers if you want to manage "
-"your email server's reputation yourself."
+"recommend that you opt for those Odoo hosting solutions. Their email system "
+"works instantly and is monitored by professionals. Nevertheless you can "
+"still use your own email servers if you want to manage your email server's "
+"reputation yourself."
 msgstr ""
 
 #: ../../discuss/email_servers.rst:15
 msgid ""
-"You will find here below some useful information to do so by integrating "
-"your own email solution with Odoo. .. note::"
+"You will find here below some useful information on how to integrate your "
+"own email solution with Odoo."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:18
+msgid ""
+"Office 365 email servers don't allow easiliy to send external emails from "
+"hosts like Odoo. Refer to the `Microsoft's documentation "
+"<https://support.office.com/en-us/article/How-to-set-up-a-multifunction-"
+"device-or-application-to-send-email-using-"
+"Office-365-69f58e99-c550-4274-ad18-c805d654b4c4>`__ to make it work."
 msgstr ""
 
 #: ../../discuss/email_servers.rst:24
@@ -501,6 +510,27 @@ msgid ""
 "their *Category* is set as *Meeting*."
 msgstr ""
 
+#: ../../discuss/plan_activities.rst:40
+msgid "Schedule a chain of activities to follow"
+msgstr ""
+
+#: ../../discuss/plan_activities.rst:42
+msgid ""
+"Odoo helps you easily plan your usual flow of activities. Go to "
+":menuselection:`Configuration --> Activity Types` and set the common "
+"following steps as *Recommended next activities*."
+msgstr ""
+
+#: ../../discuss/plan_activities.rst:49
+msgid ""
+"Now, when an activity is completed, you can select *Done & schedule next*. "
+"The next steps will automatically be suggested to you."
+msgstr ""
+
+#: ../../discuss/plan_activities.rst:55
+msgid "Have fun getting better organized by planning activities !"
+msgstr ""
+
 #: ../../discuss/team_communication.rst:3
 msgid "How to efficiently communicate in team using channels"
 msgstr ""
diff --git a/locale/fr/LC_MESSAGES/ecommerce.po b/locale/fr/LC_MESSAGES/ecommerce.po
index bd1a34295..086bdb9ad 100644
--- a/locale/fr/LC_MESSAGES/ecommerce.po
+++ b/locale/fr/LC_MESSAGES/ecommerce.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2015-TODAY, Odoo S.A.
-# This file is distributed under the same license as the Odoo Business package.
+# This file is distributed under the same license as the Odoo package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 10.0\n"
+"Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-10 09:08+0200\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: e2f <projects@e2f.com>, 2018\n"
+"Last-Translator: Jérôme Tanché <jerome.tanche@ouest-dsi.fr>, 2018\n"
 "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/locale/fr/LC_MESSAGES/general.po b/locale/fr/LC_MESSAGES/general.po
index 96fab95cf..5b9b11c8b 100644
--- a/locale/fr/LC_MESSAGES/general.po
+++ b/locale/fr/LC_MESSAGES/general.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2015-TODAY, Odoo S.A.
-# This file is distributed under the same license as the Odoo Business package.
+# This file is distributed under the same license as the Odoo package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 10.0\n"
+"Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-10 09:08+0200\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Olivier Lenoir <olivier.lenoir@free.fr>, 2017\n"
+"Last-Translator: 1d432ba7e4292878d212aa334c4d2933, 2018\n"
 "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,7 +24,7 @@ msgstr "Général"
 
 #: ../../general/auth.rst:3
 msgid "Authentication"
-msgstr "Authentification"
+msgstr "Identification"
 
 #: ../../general/auth/google.rst:3
 msgid "How to allow users to sign in with their Google account"
@@ -751,10 +751,6 @@ msgid ""
 "users>`_"
 msgstr ""
 
-#: ../../general/odoo_basics/add_user.rst:46
-msgid ":doc:`../../crm/salesteam/setup/create_team`"
-msgstr ""
-
 #: ../../general/odoo_basics/choose_language.rst:3
 msgid "Manage Odoo in your own language"
 msgstr ""
diff --git a/locale/fr/LC_MESSAGES/helpdesk.po b/locale/fr/LC_MESSAGES/helpdesk.po
index 7094370fc..836348b2a 100644
--- a/locale/fr/LC_MESSAGES/helpdesk.po
+++ b/locale/fr/LC_MESSAGES/helpdesk.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2015-TODAY, Odoo S.A.
-# This file is distributed under the same license as the Odoo Business package.
+# This file is distributed under the same license as the Odoo package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 10.0\n"
+"Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-08 14:28+0100\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: William Henrotin <whe@odoo.com>, 2017\n"
+"Last-Translator: William Henrotin <whe@odoo.com>, 2018\n"
 "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/locale/fr/LC_MESSAGES/index.po b/locale/fr/LC_MESSAGES/index.po
index c494ecc61..ac574e6f1 100644
--- a/locale/fr/LC_MESSAGES/index.po
+++ b/locale/fr/LC_MESSAGES/index.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2015-TODAY, Odoo S.A.
-# This file is distributed under the same license as the Odoo Business package.
+# This file is distributed under the same license as the Odoo package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 10.0\n"
+"Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-07 09:30+0200\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Martin Trigaux <mat@odoo.com>, 2017\n"
+"Last-Translator: Martin Trigaux, 2018\n"
 "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/locale/fr/LC_MESSAGES/inventory.po b/locale/fr/LC_MESSAGES/inventory.po
index 61b78bf0d..35c01c49c 100644
--- a/locale/fr/LC_MESSAGES/inventory.po
+++ b/locale/fr/LC_MESSAGES/inventory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2015-TODAY, Odoo S.A.
-# This file is distributed under the same license as the Odoo Business package.
+# This file is distributed under the same license as the Odoo package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 10.0\n"
+"Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-08 17:10+0100\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Micky Jault <micky037@hotmail.fr>, 2017\n"
+"Last-Translator: Laura Piraux <lap@odoo.com>, 2018\n"
 "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: ../../inventory.rst:5 ../../inventory/overview/concepts/double-entry.rst:64
 msgid "Inventory"
-msgstr "Inventaire"
+msgstr "Stock"
 
 #: ../../inventory/barcode.rst:3
 msgid "Barcodes"
@@ -670,7 +670,7 @@ msgstr ""
 
 #: ../../inventory/management/adjustment/initial_inventory.rst:102
 msgid "Reporting"
-msgstr "Rapport"
+msgstr "Analyse"
 
 #: ../../inventory/management/adjustment/initial_inventory.rst:104
 msgid ""
@@ -796,7 +796,7 @@ msgstr ""
 
 #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
 msgid "Active"
-msgstr "Actif/ve"
+msgstr "Actif"
 
 #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
 msgid ""
@@ -7313,10 +7313,6 @@ msgstr ":doc:`../../overview/start/setup`"
 msgid ":doc:`uom`"
 msgstr ":doc:`uom`"
 
-#: ../../inventory/settings/products/usage.rst:72
-msgid ":doc:`packages`"
-msgstr ":doc:`packages`"
-
 #: ../../inventory/settings/products/variants.rst:3
 msgid "Using product variants"
 msgstr "Utilisation de variantes d'articles"
diff --git a/locale/fr/LC_MESSAGES/iot.po b/locale/fr/LC_MESSAGES/iot.po
new file mode 100644
index 000000000..1493d4bac
--- /dev/null
+++ b/locale/fr/LC_MESSAGES/iot.po
@@ -0,0 +1,391 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2015-TODAY, Odoo S.A.
+# This file is distributed under the same license as the Odoo package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo 11.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Cécile Collart <cco@odoo.com>, 2018\n"
+"Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ../../iot.rst:5
+msgid "Internet of Things (IoT)"
+msgstr ""
+
+#: ../../iot/connect.rst:3
+msgid "Connect an IoT Box to your database"
+msgstr ""
+
+#: ../../iot/connect.rst:5
+msgid "Install the Internet of Things (IoT) App on your Odoo Database."
+msgstr ""
+
+#: ../../iot/connect.rst:10
+msgid "Go in the IoT App and click on Connect on the IoT Boxes page."
+msgstr ""
+
+#: ../../iot/connect.rst:15
+msgid "Follow the steps to connect your IoT Box."
+msgstr ""
+
+#: ../../iot/connect.rst:21
+msgid "Ethernet Connection"
+msgstr ""
+
+#: ../../iot/connect.rst:23
+msgid ""
+"Connect to the IoT Box all the devices that have to be connected with cables"
+" (ethernet, usb devices, etc.)."
+msgstr ""
+
+#: ../../iot/connect.rst:26
+msgid "Power on the IoT Box."
+msgstr ""
+
+#: ../../iot/connect.rst:28
+msgid "Then click on the Scan button."
+msgstr ""
+
+#: ../../iot/connect.rst:34
+msgid "WiFi Connection"
+msgstr ""
+
+#: ../../iot/connect.rst:36
+msgid "Power on the IoT Box"
+msgstr ""
+
+#: ../../iot/connect.rst:38
+msgid "Copy the token"
+msgstr ""
+
+#: ../../iot/connect.rst:43
+msgid ""
+"Connect to the IoT Box WiFi Network (make sure there is no ethernet cable "
+"plugged in your computer)."
+msgstr ""
+
+#: ../../iot/connect.rst:49
+msgid ""
+"You will be redirected to the IoT Box Homepage (if it doesn't work, connect "
+"to the IP address of the box). Give a name to your IoT Box (not required) "
+"and paste the token, then click on next."
+msgstr ""
+
+#: ../../iot/connect.rst:57
+msgid ""
+"If you are on Runbot, do not forget to add the -all or -base in the token "
+"(e.g. this token **http://375228-saas-11-5-iot-"
+"f3f920.runbot16.odoo.com\\|4957098401** should become "
+"**http://375228-saas-11-5-iot-f3f920-all.runbot16.odoo.com\\|4957098401**)."
+msgstr ""
+
+#: ../../iot/connect.rst:63
+msgid ""
+"Choose the WiFi network you want to connect with (enter the password if "
+"there is one) and click on Submit. Wait a few seconds before being "
+"redirected to your database."
+msgstr ""
+
+#: ../../iot/connect.rst:70
+msgid "You should now see the IoT Box."
+msgstr ""
+
+#: ../../iot/connect.rst:76
+msgid "IoT Box Schema"
+msgstr ""
+
+#: ../../iot/pos.rst:3
+msgid "Use the IoT Box for the PoS"
+msgstr ""
+
+#: ../../iot/pos.rst:9
+msgid "Prerequisites"
+msgstr "Prérequis"
+
+#: ../../iot/pos.rst:11
+msgid "Before starting, make sure you have the following:"
+msgstr ""
+
+#: ../../iot/pos.rst:13
+msgid "An IoT Box"
+msgstr ""
+
+#: ../../iot/pos.rst:15
+msgid "A 2A Power adapter with pi 3 b+ 2.5 A"
+msgstr ""
+
+#: ../../iot/pos.rst:17
+msgid "A computer or tablet with an up-to-date web browser"
+msgstr "Un ordinateur ou une tablette avec un navigateur web à jour"
+
+#: ../../iot/pos.rst:19
+msgid ""
+"A running SaaS or Odoo instance with the Point of Sale and IoT apps "
+"installed"
+msgstr ""
+
+#: ../../iot/pos.rst:22
+msgid "A local network setup with DHCP (this is the default setting)"
+msgstr ""
+
+#: ../../iot/pos.rst:24
+msgid ""
+"An Epson USB TM-T20 Printer or another ESC/POS compatible printer "
+"(officially supported printers are listed at the `POS Hardware page "
+"<https://www.odoo.com/page/pos-ipad-android-hardware>`__)"
+msgstr ""
+
+#: ../../iot/pos.rst:28
+msgid "A Honeywell Eclipse USB Barcode Scanner or another compatible scanner"
+msgstr ""
+"Un scanner code à barre USB Eclipse Honeywell ou tout autre scanner "
+"compatible"
+
+#: ../../iot/pos.rst:30
+msgid "An Epson compatible cash drawer"
+msgstr "Un tiroir-caisse compatible Epson"
+
+#: ../../iot/pos.rst:32
+msgid "An RJ45 Ethernet Cable (optional, WiFi is built in)"
+msgstr ""
+
+#: ../../iot/pos.rst:35
+msgid "Set Up"
+msgstr "Configurer"
+
+#: ../../iot/pos.rst:37
+msgid ""
+"To connect hardware to the PoS, the first step is to connect an IoT Box to "
+"your database. For this, follow this `documentation "
+"<https://docs.google.com/document/d/1vhWrSSlSdJcRYe4tjPpXKYVMTD47lVK3ysyYc7tJDlA/edit#>`__."
+msgstr ""
+
+#: ../../iot/pos.rst:44
+msgid "Then, you have to connect the peripheral devices to your IoT Box."
+msgstr ""
+
+#: ../../iot/pos.rst:46
+msgid ""
+"Officially supported hardware is listed on `the POS Hardware page "
+"<https://www.odoo.com/page/pos-ipad-android-hardware>`__, but other hardware"
+" might work as well."
+msgstr ""
+
+#: ../../iot/pos.rst:50
+msgid "**Printer**: Connect an ESC/POS printer to a USB port and power it on."
+msgstr ""
+"**Imprimante**: Connectez une imprimante ESC/POS à un port USB et mettez la "
+"en marche."
+
+#: ../../iot/pos.rst:53
+msgid ""
+"**Cash drawer**: The cash drawer should be connected to the printer with an "
+"RJ25 cable."
+msgstr ""
+"**Tiroir caisse**: Le tiroir caisse devrait être connecté à l'imprimante "
+"avec un cable RJ25."
+
+#: ../../iot/pos.rst:56
+msgid ""
+"**Barcode scanner**: Connect your barcode scanner. In order for your barcode"
+" scanner to be compatible it must behave as a keyboard and must be "
+"configured in **US QWERTY**. It also must end barcodes with an Enter "
+"character (keycode 28). This is most likely the default configuration of "
+"your barcode scanner."
+msgstr ""
+"**Scanner de code-barres**: Connectez votre scanner de code-barres. Pour que"
+" votre scanner puisse être compatible, il doit se comporter comme un clavier"
+" et être configuré en **US QWERTY**. Il doit également terminer les codes-"
+"barres par le caractère Entrer (keycode 28). Il s'agit le plus souvent de la"
+" configuration par défaut de votre scanner de code-barres."
+
+#: ../../iot/pos.rst:62
+msgid "**Scale**: Connect your scale and power it on."
+msgstr ""
+"**Balance**: Connectez votre balance électronique et mettez la en marche."
+
+#: ../../iot/pos.rst:64
+msgid ""
+"**Ethernet**: If you do not wish to use Wi-Fi, plug in the Ethernet cable. "
+"Make sure this will connect the IoT Box to the same network as your POS "
+"device."
+msgstr ""
+
+#: ../../iot/pos.rst:68
+msgid ""
+"**Wi-Fi**: The current version of the IoT Box has Wi-Fi built in. Make sure "
+"not to plug in an Ethernet cable when booting, because all Wi-Fi "
+"functionality will be bypassed when a wired network connection is available "
+"on boot."
+msgstr ""
+
+#: ../../iot/pos.rst:73
+msgid ""
+"Once it's done, you can connect the IoT Box to your PoS. For this, go in "
+"Point of Sale > Configuration > PoS, tick the box \"IoT Box\" and select the"
+" IoT Box you want to connect with. Save the changes."
+msgstr ""
+
+#: ../../iot/pos.rst:77
+msgid "Set up is done, you can launch a new PoS Session."
+msgstr ""
+
+#: ../../iot/pos.rst:80
+msgid "Troubleshoot"
+msgstr "Problèmes"
+
+#: ../../iot/pos.rst:83
+msgid "The PoS cannot connect to the IoT Box"
+msgstr ""
+
+#: ../../iot/pos.rst:85
+msgid ""
+"The easiest way to make sure the IoT Box is properly set-up is to turn it on"
+" with the printer plugged in as it will print a receipt indicating any error"
+" if encountered or the IoT Box's IP address in case of success. If no "
+"receipt is printed, check the following steps:"
+msgstr ""
+
+#: ../../iot/pos.rst:91
+msgid ""
+"Make sure the IoT Box is powered on, indicated by a brightly lit red status "
+"LED."
+msgstr ""
+
+#: ../../iot/pos.rst:94
+msgid ""
+"Make sure the IoT Box is ready, this is indicated by a brightly lit green "
+"status LED just next to the red power status LED. The IoT Box should be "
+"ready ~2 minutes after it is started."
+msgstr ""
+
+#: ../../iot/pos.rst:98
+msgid ""
+"Make sure the IoT Box is connected to the same network as your POS device. "
+"Both the device and the IoT Box should be visible in the list of connected "
+"devices on your network router."
+msgstr ""
+
+#: ../../iot/pos.rst:102
+msgid ""
+"If you specified the IoT Box's IP address in the configuration, make sure it"
+" corresponds to the ip address printed on the IoT Box's status receipt."
+msgstr ""
+
+#: ../../iot/pos.rst:106
+msgid "Make sure that the POS is not loaded over HTTPS."
+msgstr "Assurez-vous que la page du PdV n'est pas chargé en HTTPS."
+
+#: ../../iot/pos.rst:108
+msgid ""
+"A bug in Firefox's HTTP implementation might prevent the autodiscovery from "
+"working reliably. You could also manually set up the IoT Box's IP address in"
+" the POS configuration."
+msgstr ""
+
+#: ../../iot/pos.rst:113
+msgid "The Barcode Scanner is not working"
+msgstr "Le scanner de code barre ne fonctionne pas correctement"
+
+#: ../../iot/pos.rst:115
+msgid ""
+"The barcode scanner must be configured in US QWERTY and emit an Enter after "
+"each barcode. This is the default configuration of most barcode readers. "
+"Refer to the barcode reader documentation for more information."
+msgstr ""
+"Le scanner doit être configuré en US QWERTY et doit émettre un caractère "
+"ENTER après chaque code barre scanné. C'est la configuration par défaut sur "
+"la plupart des scanners. Vérifiez le manuel du scanner pour plus "
+"d'information."
+
+#: ../../iot/pos.rst:120
+msgid ""
+"The IoT Box needs a 2A power supply to work with some barcode scanners. If "
+"you are not using the provided power supply, make sure the one you use has "
+"enough power."
+msgstr ""
+
+#: ../../iot/pos.rst:124
+msgid ""
+"Some barcode scanners will need more than 2A and will not work, or will work"
+" unreliably, even with the provided power supply. In those case you can plug"
+" the barcode scanner in a self-powered USB hub."
+msgstr ""
+"Certains scanners vont demander plus de 2A et ne fonctionneront pas or de "
+"façon instable, même avec l'alimentation fournie. Dans ce cas, vous devrez "
+"utiliser une alimentation externe pour le scanner."
+
+#: ../../iot/pos.rst:129
+msgid ""
+"Some poorly built barcode scanners do not advertise themselves as barcode "
+"scanners but as a usb keyboard instead, and will not be recognized by the "
+"IoT Box."
+msgstr ""
+
+#: ../../iot/pos.rst:134
+msgid "The Barcode Scanner is not working reliably"
+msgstr "Le scanner de codes-barres ne fonctionne pas de manière fiable"
+
+#: ../../iot/pos.rst:136
+msgid ""
+"Make sure that no more than one device with 'Scan via Proxy'/'Barcode "
+"Scanner' enabled are connected to the IoT Box at the same time."
+msgstr ""
+
+#: ../../iot/pos.rst:140
+msgid "Printing the receipt takes too much time"
+msgstr "L'impression du reçu prend trop de temps"
+
+#: ../../iot/pos.rst:142
+msgid ""
+"A small delay before the first print is expected, as the IoT Box will do "
+"some preprocessing to speed up the next printings. If you suffer delays "
+"afterwards it is most likely due to poor network connection between the POS "
+"and the IoT Box."
+msgstr ""
+
+#: ../../iot/pos.rst:148
+msgid "Some characters are not correctly printed on the receipt"
+msgstr "Certains caractères ne sont pas correctement imprimés sur le reçu"
+
+#: ../../iot/pos.rst:150
+msgid ""
+"The IoT Box does not support all languages and characters. It currently "
+"supports Latin and Cyrillic based scripts, with basic Japanese support."
+msgstr ""
+
+#: ../../iot/pos.rst:155
+msgid "The printer is offline"
+msgstr "L'imprimante est hors ligne"
+
+#: ../../iot/pos.rst:157
+msgid ""
+"Make sure the printer is connected, powered, has enough paper and has its "
+"lid closed, and is not reporting an error. If the error persists, please "
+"contact support."
+msgstr ""
+"Assurez-vous que l'imprimante est connectée, sous tension, qu'elle contient "
+"suffisamment de papier, que son couvercle est fermé et qu'elle ne signale "
+"aucune erreur. Si l'erreur persiste, contactez le support technique."
+
+#: ../../iot/pos.rst:162
+msgid "The cashdrawer does not open"
+msgstr "Le tiroir caisse n'ouvre pas"
+
+#: ../../iot/pos.rst:164
+msgid ""
+"The cashdrawer should be connected to the printer and should be activated in"
+" the POS configuration."
+msgstr ""
+"Le tiroir-caisse doit être connecté à l'imprimante et doit être activé dans "
+"la configuration PdV."
diff --git a/locale/fr/LC_MESSAGES/livechat.po b/locale/fr/LC_MESSAGES/livechat.po
index 35555d327..fb73c57c9 100644
--- a/locale/fr/LC_MESSAGES/livechat.po
+++ b/locale/fr/LC_MESSAGES/livechat.po
@@ -1,14 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2015-TODAY, Odoo S.A.
-# This file is distributed under the same license as the Odoo Business package.
+# This file is distributed under the same license as the Odoo package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 10.0\n"
+"Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-08 14:28+0100\n"
+"POT-Creation-Date: 2018-07-23 12:10+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: William Henrotin <whe@odoo.com>, 2018\n"
 "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: ../../livechat/livechat.rst:5
 msgid "Live Chat"
-msgstr "Discussion instantanée"
+msgstr "Live Chat"
 
 #: ../../livechat/livechat.rst:8
 msgid "Chat in live with website visitors"
diff --git a/locale/fr/LC_MESSAGES/manufacturing.po b/locale/fr/LC_MESSAGES/manufacturing.po
index 2fecba3f8..660e8814c 100644
--- a/locale/fr/LC_MESSAGES/manufacturing.po
+++ b/locale/fr/LC_MESSAGES/manufacturing.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2015-TODAY, Odoo S.A.
-# This file is distributed under the same license as the Odoo Business package.
+# This file is distributed under the same license as the Odoo package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 10.0\n"
+"Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-22 15:27+0100\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Olivier Lenoir <olivier.lenoir@free.fr>, 2017\n"
+"Last-Translator: Xavier Belmere <Info@cartmeleon.com>, 2018\n"
 "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -51,13 +51,10 @@ msgstr ""
 #: ../../manufacturing/management/bill_configuration.rst:16
 msgid ""
 "If you choose to manage your manufacturing operations using manufacturing "
-"orders only, you will define basic bills of materials without routings. For "
-"more information about which method of management to use, review the "
-"**Getting Started** section of the *Manufacturing* chapter of the "
-"documentation."
+"orders only, you will define basic bills of materials without routings."
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:22
+#: ../../manufacturing/management/bill_configuration.rst:19
 msgid ""
 "Before creating your first bill of materials, you will need to create a "
 "product and at least one component (components are considered products in "
@@ -70,7 +67,7 @@ msgid ""
 "Materials`, or using the button on the top of the product form."
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:32
+#: ../../manufacturing/management/bill_configuration.rst:29
 msgid ""
 "Under the **Miscellaneous** tab, you can fill additional fields. "
 "**Sequence** defines the order in which your BoMs will be selected for "
@@ -78,11 +75,11 @@ msgid ""
 "allows you to track changes to your BoM over time."
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:38
+#: ../../manufacturing/management/bill_configuration.rst:35
 msgid "Adding a Routing to a BoM"
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:40
+#: ../../manufacturing/management/bill_configuration.rst:37
 msgid ""
 "A routing defines a series of operations required to manufacture a product "
 "and the work center at which each operation is performed. A routing may be "
@@ -90,14 +87,14 @@ msgid ""
 "information about configuring routings, review the chapter on routings."
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:46
+#: ../../manufacturing/management/bill_configuration.rst:43
 msgid ""
 "After enabling routings from :menuselection:`Configuration --> Settings`, "
 "you will be able to add a routing to a bill of materials by selecting a "
 "routing from the dropdown list or creating one on the fly."
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:50
+#: ../../manufacturing/management/bill_configuration.rst:47
 msgid ""
 "You may define the work operation or step in which each component is "
 "consumed using the field, **Consumed in Operation** under the **Components**"
@@ -107,23 +104,23 @@ msgid ""
 "consumed/produced at the final operation in the routing."
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:61
+#: ../../manufacturing/management/bill_configuration.rst:58
 msgid "Adding Byproducts to a BoM"
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:63
+#: ../../manufacturing/management/bill_configuration.rst:60
 msgid ""
 "In Odoo, a byproduct is any product produced by a BoM in addition to the "
 "primary product."
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:66
+#: ../../manufacturing/management/bill_configuration.rst:63
 msgid ""
 "To add byproducts to a BoM, you will first need to enable them from "
 ":menuselection:`Configuration --> Settings`."
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:72
+#: ../../manufacturing/management/bill_configuration.rst:69
 msgid ""
 "Once byproducts are enabled, you can add them to your bills of materials "
 "under the **Byproducts** tab of the bill of materials. You can add any "
@@ -131,11 +128,11 @@ msgid ""
 "of the routing as the primary product of the BoM."
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:81
+#: ../../manufacturing/management/bill_configuration.rst:78
 msgid "Setting up a BoM for a Product With Sub-Assemblies"
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:83
+#: ../../manufacturing/management/bill_configuration.rst:80
 #: ../../manufacturing/management/sub_assemblies.rst:5
 msgid ""
 "A subassembly is a manufactured product which is intended to be used as a "
@@ -145,7 +142,7 @@ msgid ""
 "that employs subassemblies is often referred to as a multi-level BoM."
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:90
+#: ../../manufacturing/management/bill_configuration.rst:87
 #: ../../manufacturing/management/sub_assemblies.rst:12
 msgid ""
 "Multi-level bills of materials in Odoo are accomplished by creating a top-"
@@ -155,11 +152,11 @@ msgid ""
 "subassembly is created as well."
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:97
+#: ../../manufacturing/management/bill_configuration.rst:94
 msgid "Configure the Top-Level Product BoM"
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:99
+#: ../../manufacturing/management/bill_configuration.rst:96
 #: ../../manufacturing/management/sub_assemblies.rst:21
 msgid ""
 "To configure a multi-level BoM, create the top-level product and its BoM. "
@@ -167,12 +164,12 @@ msgid ""
 "subassembly as you would for any product."
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:107
+#: ../../manufacturing/management/bill_configuration.rst:104
 #: ../../manufacturing/management/sub_assemblies.rst:29
 msgid "Configure the Subassembly Product Data"
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:109
+#: ../../manufacturing/management/bill_configuration.rst:106
 #: ../../manufacturing/management/sub_assemblies.rst:31
 msgid ""
 "On the product form of the subassembly, you must select the routes "
@@ -181,7 +178,7 @@ msgid ""
 "effect."
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:117
+#: ../../manufacturing/management/bill_configuration.rst:114
 #: ../../manufacturing/management/sub_assemblies.rst:39
 msgid ""
 "If you would like to be able to purchase the subassembly in addition to "
@@ -189,11 +186,11 @@ msgid ""
 "subassembly product form may be configured according to your preference."
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:123
+#: ../../manufacturing/management/bill_configuration.rst:120
 msgid "Using a Single BoM to Describe Several Variants of a Single Product"
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:125
+#: ../../manufacturing/management/bill_configuration.rst:122
 #: ../../manufacturing/management/product_variants.rst:5
 msgid ""
 "Odoo allows you to use one bill of materials for multiple variants of the "
@@ -201,7 +198,7 @@ msgid ""
 "Settings`."
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:132
+#: ../../manufacturing/management/bill_configuration.rst:129
 #: ../../manufacturing/management/product_variants.rst:12
 msgid ""
 "You will then be able to specify which component lines are to be used in the"
@@ -210,7 +207,7 @@ msgid ""
 "variants."
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:137
+#: ../../manufacturing/management/bill_configuration.rst:134
 #: ../../manufacturing/management/product_variants.rst:17
 msgid ""
 "When defining variant BoMs on a line-item-basis, the **Product Variant** "
@@ -409,6 +406,112 @@ msgstr ""
 msgid "Configure the Top -Level Product BoM"
 msgstr ""
 
+#: ../../manufacturing/management/unbuild.rst:3
+msgid "Unbuild a product"
+msgstr ""
+
+#: ../../manufacturing/management/unbuild.rst:5
+msgid ""
+"In Odoo Manufacturing App, you can *Unbuild* products. Two use cases can be "
+"managed: (1) you can unbuild products you have built yourself or (2) you can"
+" unbuild products you have received."
+msgstr ""
+
+#: ../../manufacturing/management/unbuild.rst:9
+msgid ""
+"Let's take the first case, you are manufacturing products yourself. If one "
+"of your product presents some defect, you might want to unbuild it instead "
+"of scrapping it completely, allowing you to reuse some components of the "
+"product."
+msgstr ""
+
+#: ../../manufacturing/management/unbuild.rst:14
+msgid ""
+"In the second case, you are buying products for the sole purpose of "
+"unbuilding them and recycling them."
+msgstr ""
+
+#: ../../manufacturing/management/unbuild.rst:18
+msgid "Unbuild Order"
+msgstr "Ordre de deconstruction"
+
+#: ../../manufacturing/management/unbuild.rst:20
+msgid ""
+"While in the Manufacturing App, under the *Operations* tab you will find the"
+" menu *Unbuild Orders*."
+msgstr ""
+
+#: ../../manufacturing/management/unbuild.rst:26
+msgid ""
+"When creating a new one, you can either select a MO if you are unbuilding "
+"something you manufactured or only select a product if you are unbuilding "
+"something you received."
+msgstr ""
+
+#: ../../manufacturing/management/unbuild.rst:33
+msgid "When you are done, just click unbuild and the process will be over."
+msgstr ""
+
+#: ../../manufacturing/management/unbuild.rst:35
+msgid ""
+"If you unbuild a product that you manufactured before, you will get the "
+"components from the MO back in stock."
+msgstr ""
+
+#: ../../manufacturing/management/unbuild.rst:38
+msgid ""
+"If you unbuild a product you bought, you will get the components from the "
+"BoM back in stock."
+msgstr ""
+
 #: ../../manufacturing/overview.rst:5
 msgid "Overview"
 msgstr "Vue d'ensemble"
+
+#: ../../manufacturing/repair.rst:5
+msgid "Repair Management"
+msgstr ""
+
+#: ../../manufacturing/repair/repair.rst:3
+msgid "Repair products"
+msgstr ""
+
+#: ../../manufacturing/repair/repair.rst:5
+msgid ""
+"The Odoo *Repair* app allows you to manage a complete after sales process "
+"but also to simply repair products you have manufactured, if they present a "
+"defect."
+msgstr ""
+
+#: ../../manufacturing/repair/repair.rst:10
+msgid "Create a Repair Order"
+msgstr ""
+
+#: ../../manufacturing/repair/repair.rst:12
+msgid ""
+"Once in the app, you can access your existing *Repair Orders* and create a "
+"new one."
+msgstr ""
+
+#: ../../manufacturing/repair/repair.rst:19
+msgid "Manage a repair"
+msgstr ""
+
+#: ../../manufacturing/repair/repair.rst:21
+msgid ""
+"When a customer sends you a product for repair, create a new *Repair Order*."
+" Fill it in with all the information you may need such as the product, the "
+"customer, if it has to be invoiced after or before the repair, the parts you"
+" might need, etc."
+msgstr ""
+
+#: ../../manufacturing/repair/repair.rst:29
+msgid ""
+"Once everything is done, you can then send the repair quotation to your "
+"customer. If it is approved, you can confirm the repair. You will then be "
+"able to start & end the repair when it is completed."
+msgstr ""
+
+#: ../../manufacturing/repair/repair.rst:36
+msgid "You can now invoice the repair."
+msgstr ""
diff --git a/locale/fr/LC_MESSAGES/mobile.po b/locale/fr/LC_MESSAGES/mobile.po
new file mode 100644
index 000000000..2b876f9f7
--- /dev/null
+++ b/locale/fr/LC_MESSAGES/mobile.po
@@ -0,0 +1,117 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2015-TODAY, Odoo S.A.
+# This file is distributed under the same license as the Odoo package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo 11.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Eloïse Stilmant <est@odoo.com>, 2018\n"
+"Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ../../mobile/firebase.rst:5
+msgid "Mobile"
+msgstr "Mobile"
+
+#: ../../mobile/firebase.rst:8
+msgid "Setup your Firebase Cloud Messaging"
+msgstr ""
+
+#: ../../mobile/firebase.rst:10
+msgid ""
+"In order to have mobile notifications in our Android app, you need an API "
+"key."
+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 "Créer un nouveau projet"
+
+#: ../../mobile/firebase.rst:27
+msgid ""
+"First, make sure you to sign in to your Google Account. Then, go to "
+"`https://console.firebase.google.com "
+"<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."
+msgstr ""
diff --git a/locale/fr/LC_MESSAGES/point_of_sale.po b/locale/fr/LC_MESSAGES/point_of_sale.po
index 16f2420f3..5eb0cecaf 100644
--- a/locale/fr/LC_MESSAGES/point_of_sale.po
+++ b/locale/fr/LC_MESSAGES/point_of_sale.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-26 12:01+0200\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Julien Bertrand <jub@odoo.com>, 2018\n"
 "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: ../../point_of_sale.rst:5
 msgid "Point of Sale"
-msgstr "Point de Vente"
+msgstr "Point de vente"
 
 #: ../../point_of_sale/advanced.rst:3
 msgid "Advanced topics"
@@ -60,11 +60,9 @@ msgstr ""
 
 #: ../../point_of_sale/advanced/barcode.rst:14
 msgid ""
-"Under the PosBox / Hardware category, you will find *Barcode Scanner* select"
-" it."
+"Under the IoT Box / Hardware category, you will find *Barcode Scanner* "
+"select it."
 msgstr ""
-"Sous la catégorie PosBox / Hardware, vous trouverez *Barcode Scanner* , "
-"sélectionnez-le."
 
 #: ../../point_of_sale/advanced/barcode.rst:21
 msgid "You can find more about Barcode Nomenclature here (ADD HYPERLINK)"
@@ -128,10 +126,14 @@ msgid ""
 " documentation about it `here <https://docs.google.com/document/d"
 "/1tg7yarr2hPKTddZ4iGbp9IJO-cp7u15eHNVnFoL40Q8/edit>`__"
 msgstr ""
+"Pour utiliser les étiquettes de remise, vous devrez utiliser un scanner de "
+"codes-barres, vous pouvez lire la documentation à ce sujet `ici "
+"<https://docs.google.com/document/d/1tg7yarr2hPKTddZ4iGbp9IJO-"
+"cp7u15eHNVnFoL40Q8/edit>`__"
 
 #: ../../point_of_sale/advanced/discount_tags.rst:15
 msgid "Barcode Nomenclature"
-msgstr "Nomenclature de code-barre"
+msgstr "Nomenclature de code-barres"
 
 #: ../../point_of_sale/advanced/discount_tags.rst:17
 msgid "To use discounts tags, we need to learn about barcode nomenclature."
@@ -161,6 +163,10 @@ msgid ""
 "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 ""
+"Disons que vous voulez 50% de remise sur un produit, vous devez commencer "
+"votre code-barres par 22 (pour la nomenclature du code-barres de réduction) "
+"puis 50 (pour le%) avant d'ajouter le code-barres du produit. Dans notre "
+"exemple, le code-barres serait:"
 
 #: ../../point_of_sale/advanced/discount_tags.rst:43
 msgid "Scan the products & tags"
@@ -189,7 +195,7 @@ msgid ""
 "*Loyalty Program*."
 msgstr ""
 "Encouragez vos clients à continuer à faire leurs achats dans votre Point de "
-"Vente avec un * programme de fidélité *."
+"Vente avec un *programme de fidélité*."
 
 #: ../../point_of_sale/advanced/loyalty.rst:11
 msgid ""
@@ -232,9 +238,8 @@ msgid ""
 msgstr ""
 "Lorsqu'un client est défini, vous verrez désormais les points qu'il "
 "obtiendra pour la transaction et ils s'accumuleront jusqu'à ce qu'ils soient"
-" dépensés. Ils sont dépensés en utilisant le bouton * Récompenses * quand "
-"ils ont assez de points selon les règles définies dans le programme de "
-"fidélité."
+" dépensés. Ils sont dépensés en utilisant le bouton *Récompenses* quand ils "
+"ont assez de points selon les règles définies dans le programme de fidélité."
 
 #: ../../point_of_sale/advanced/loyalty.rst:40
 #: ../../point_of_sale/shop/seasonal_discount.rst:45
@@ -312,6 +317,7 @@ msgstr ""
 #: ../../point_of_sale/advanced/manual_discount.rst:34
 msgid "You now have a new *Discount* button in your PoS interface."
 msgstr ""
+"Vous avez maintenant un nouveau bouton *Remise* dans votre interface PoS."
 
 #: ../../point_of_sale/advanced/manual_discount.rst:39
 msgid ""
@@ -325,6 +331,8 @@ msgid ""
 "On this example, you can see a global discount of 50% as well as a specific "
 "product discount also at 50%."
 msgstr ""
+"Sur cet exemple, vous pouvez voir une réduction globale de 50% ainsi qu'une "
+"réduction de  50% spécifique au produit."
 
 #: ../../point_of_sale/advanced/mercury.rst:3
 msgid "Accept credit card payment using Mercury"
@@ -399,7 +407,7 @@ msgid ""
 "Then go to :menuselection:`Point of Sale --> Configuration --> Payment "
 "Methods` and create a new one."
 msgstr ""
-"Ensuite, allez à :menuselection: `Point de Vente --> Configuration --> "
+"Ensuite, allez à :menuselection:`Point de Vente --> Configuration --> "
 "Méthodes de paiement` et créez-en un nouveau."
 
 #: ../../point_of_sale/advanced/mercury.rst:46
@@ -475,14 +483,14 @@ msgid ""
 ":menuselection:`Settings --> Manage Access rights` and select the user."
 msgstr ""
 "Vous pouvez également définir un code PIN sur chaque utilisateur. Pour ce "
-"faire, allez à :menuselection: `Paramètres --> Gérer les droits d'accès` et "
+"faire, allez à :menuselection:`Paramètres --> Gérer les droits d'accès` et "
 "sélectionnez l'utilisateur."
 
 #: ../../point_of_sale/advanced/multi_cashiers.rst:41
 msgid ""
 "On the user page, under the *Point of Sale* tab you can add a Security PIN."
 msgstr ""
-"Sur la page de l'utilisateur, sous l'onglet * Point de Vente *, vous pouvez "
+"Sur la page de l'utilisateur, sous l'onglet *Point de Vente*, vous pouvez "
 "ajouter un code PIN de sécurité."
 
 #: ../../point_of_sale/advanced/multi_cashiers.rst:47
@@ -526,6 +534,8 @@ msgstr "Ré-imprimer des reçus"
 msgid ""
 "Use the *Reprint receipt* feature if you have the need to reprint a ticket."
 msgstr ""
+"Utilisez la fonction *Ré-impression du reçu* si vous devez ré-imprimer un "
+"ticket."
 
 #: ../../point_of_sale/advanced/reprint.rst:10
 msgid ""
@@ -585,7 +595,7 @@ msgid ""
 "To access your statistics go to :menuselection:`Point of Sale --> Reporting "
 "--> Orders`"
 msgstr ""
-"Pour accéder à vos statistiques, allez à :menuselection: `Point de Vente -> "
+"Pour accéder à vos statistiques, allez à :menuselection:`Point de Vente -> "
 "Reporting -> Commandes`"
 
 #: ../../point_of_sale/analyze/statistics.rst:15
@@ -624,12 +634,12 @@ msgid ""
 "website <http://www.systemedecaisseenregistreuse.be/>`_."
 msgstr ""
 "Le gouvernement belge exige que certaines entreprises utilisent un appareil "
-"certifié par le gouvernement appelé ** Module de données fiscales ** "
-"(également connu sous le nom de ** blackbox **). Cet appareil fonctionne "
-"avec l'application PdV et enregistre certaines transactions. En plus de "
-"cela, l'application PdV utilisée doit également être certifiée par le "
-"gouvernement et doit respecter les normes strictes spécifiées par eux. `Odoo"
-" 9 (Enterprise Edition) est une application certifiée "
+"certifié par le gouvernement appelé **Module de données fiscales** "
+"(également connu sous le nom de **blackbox**). Cet appareil fonctionne avec "
+"l'application PdV et enregistre certaines transactions. En plus de cela, "
+"l'application PdV utilisée doit également être certifiée par le gouvernement"
+" et doit respecter les normes strictes spécifiées par eux. `Odoo 9 "
+"(Enterprise Edition) est une application certifiée "
 "<http://www.systemedecaisseenregistreuse.be/systemes-certifies>` _. De plus "
 "amples informations sur le module de données fiscales peuvent être trouvées "
 "sur le site officiel <http://www.systemedecaisseenregistreuse.be/> `_."
@@ -669,33 +679,26 @@ msgstr ""
 "<http://trendnet.com/products/proddetail.asp?prod=265_TU-S9>`__)"
 
 #: ../../point_of_sale/belgian_fdm/setup.rst:32
-msgid "A registered POSBox per POS configuration"
-msgstr "Une POSBox enregistrée par configuration PdV"
+msgid "A registered IoT Box per POS configuration"
+msgstr ""
 
 #: ../../point_of_sale/belgian_fdm/setup.rst:35
 msgid "Setup"
 msgstr "Configuration"
 
 #: ../../point_of_sale/belgian_fdm/setup.rst:38
-msgid "POSBox"
-msgstr "POSBox"
+msgid "IoT Box"
+msgstr "IoT Box"
 
 #: ../../point_of_sale/belgian_fdm/setup.rst:40
 msgid ""
-"In order to use a Fiscal Data Module, you will need a registered POSBox. "
-"These POSBoxes are similar to the regular POSBoxes we sell, but they are "
+"In order to use a Fiscal Data Module, you will need a registered IoT Box. "
+"These IoT Boxes are similar to the regular IoT Boxes we sell, but they are "
 "registered with the Belgian government. This is required by law. Attempting "
-"to use a Fiscal Data Module on a non-registered POSBox will not work. You "
-"can verify that the Fiscal Data Module is recognized by the POSBox by going "
-"to the *Hardware status page* via the POSBox homepage."
+"to use a Fiscal Data Module on a non-registered IoT Box will not work. You "
+"can verify that the Fiscal Data Module is recognized by the IoT Box by going"
+" to the *Hardware status page* via the IoT Box homepage."
 msgstr ""
-"Afin d'utiliser un module de données fiscales, vous aurez besoin d'une "
-"POSBox enregistrée. Ces POSBox sont similaires aux POSBox que nous vendons, "
-"mais elles sont enregistrées auprès du gouvernement belge. Ceci est requis "
-"par la loi. Tenter d'utiliser un module de données fiscales sur une POSBox "
-"non enregistrée ne fonctionnera pas. Vous pouvez vérifier que le module de "
-"données fiscales est reconnu par la POSBox en accédant à la * page d'état du"
-" matériel * via la page d'accueil POSBox."
 
 #: ../../point_of_sale/belgian_fdm/setup.rst:52
 msgid "Odoo"
@@ -707,24 +710,13 @@ msgid ""
 "**Belgian Registered Cash Register** app (technical name: "
 "``pos_blackbox_be``). Because of government restrictions imposed on us, this"
 " installation cannot be undone. After this, you will have to ensure that "
-"each POS configuration has a unique registered POSBox associated with it "
+"each POS configuration has a unique registered IoT Box associated with it "
 "(:menuselection:`Point of Sale --> Configuration --> Point of Sale` and "
-"ensure Hardware Proxy / POSBox and the serial number of your POSBox is set)."
-" The first time you open the Point of Sale and attempt to do a transaction, "
-"you will be asked to input the PIN that you received with your VAT signing "
-"card."
+"ensure Hardware Proxy / IoT Box and the serial number of your IoT Box is "
+"set). The first time you open the Point of Sale and attempt to do a "
+"transaction, you will be asked to input the PIN that you received with your "
+"VAT signing card."
 msgstr ""
-"Une application PdV Odoo peut être dotée de capacités de point de vente "
-"certifiées en installant l'application **Belgian Registered Cash Register** "
-"(nom technique: «pos_blackbox_be»). En raison des restrictions imposées par "
-"le gouvernement, cette installation ne peut pas être annulée. Après cela, "
-"vous devrez vous assurer que chaque configuration PdV est associé à une "
-"POSBox unique et enregistrée (: menuselection: `Point de Vente --> "
-"Configuration --> Point de Vente` et vérifiez que le proxy matériel / POSBox"
-" ainsi que le numéro de série de votre POSBox soient définis). La première "
-"fois que vous ouvrez le Point de Vente et tentez d'effectuer une "
-"transaction, il vous sera demandé de saisir le code PIN que vous avez reçu "
-"avec votre carte de signature TVA."
 
 #: ../../point_of_sale/belgian_fdm/setup.rst:69
 msgid "Certification & On-premise"
@@ -741,8 +733,8 @@ msgid ""
 msgstr ""
 "La certification accordée par le gouvernement est limitée à l'utilisation "
 "sur l'instance SaaS d'odoo.com. L'utilisation du module à partir de la "
-"source ou d'une version modifiée ** ne sera pas ** certifiée. Pour les "
-"clients sur site, nous supportons aussi l'utilisation d'un module fisacle. "
+"source ou d'une version modifiée **ne sera pas** certifiée. Pour les clients"
+" sur site, nous supportons aussi l'utilisation d'un module fisacle. "
 "Cependant, une version figée du module peut etre distribuée a la demande "
 "pour les clients Enterprise."
 
@@ -778,13 +770,12 @@ msgid "Selling products without a valid tax"
 msgstr "Vendre des produits sans taxe valide"
 
 #: ../../point_of_sale/belgian_fdm/setup.rst:90
-msgid "Multiple Odoo POS configurations per POSBox are not allowed"
+msgid "Multiple Odoo POS configurations per IoT Box are not allowed"
 msgstr ""
-"Les multiples configurations Odoo PdV par POSBox ne sont pas autorisées"
 
 #: ../../point_of_sale/belgian_fdm/setup.rst:91
-msgid "Using the POS without a connection to the POSBox (and thus FDM)"
-msgstr "Utilisation du PdV sans connexion à la POSBox (et donc FDM)"
+msgid "Using the POS without a connection to the IoT Box (and thus FDM)"
+msgstr ""
 
 #: ../../point_of_sale/belgian_fdm/setup.rst:92
 msgid "Blacklisted modules: pos_discount, pos_reprint, pos_loyalty"
@@ -836,1132 +827,6 @@ msgstr ""
 "Utilisez le bouton Enregistrer lorsque vous avez terminé. Vous pouvez "
 "ensuite sélectionner ce client dans toutes les transactions futures."
 
-#: ../../point_of_sale/overview/setup.rst:3
-msgid "Point of Sale Hardware Setup"
-msgstr "Configuration du matériel du Point de Vente"
-
-#: ../../point_of_sale/overview/setup.rst:6
-msgid "POSBox Setup Guide"
-msgstr "Manuel de Configuration de la POSBox"
-
-#: ../../point_of_sale/overview/setup.rst:11
-#: ../../point_of_sale/overview/setup.rst:205
-msgid "Prerequisites"
-msgstr "Prérequis"
-
-#: ../../point_of_sale/overview/setup.rst:13
-msgid ""
-"Before you start setting up your POSBox make sure you have everything. You "
-"will need :"
-msgstr ""
-"Avant de commencer à configurer votre POSBox, assurez-vous de tout avoir à "
-"disposition. Vous avez besoin de :"
-
-#: ../../point_of_sale/overview/setup.rst:16
-msgid "The POSBox"
-msgstr "La POSBox"
-
-#: ../../point_of_sale/overview/setup.rst:17
-msgid "A 2A Power adapter"
-msgstr "Un adaptateur secteur A2"
-
-#: ../../point_of_sale/overview/setup.rst:18
-msgid "A computer or tablet with an up-to-date web browser"
-msgstr "Un ordinateur ou une tablette avec un navigateur web à jour"
-
-#: ../../point_of_sale/overview/setup.rst:19
-msgid "A running SaaS or Odoo database with the Point of Sale installed"
-msgstr ""
-"Une base de données SaaS ou Odoo en cours d'exécution avec le Point de Vente"
-" installé"
-
-#: ../../point_of_sale/overview/setup.rst:20
-msgid "A local network set up with DHCP (this is the default setting)"
-msgstr "Un réseau local configuré avec DHCP (c'est le réglage par défaut)"
-
-#: ../../point_of_sale/overview/setup.rst:21
-msgid ""
-"An Epson USB TM-T20 Printer or another ESC/POS compatible printer "
-"(officially supported printers are listed at the `POS Hardware page "
-"<https://www.odoo.com/page/pos-ipad-android-hardware>`_)"
-msgstr ""
-"Une imprimante Epson USB TM-T20 ou une autre imprimante compatible ESC / POS"
-" (les imprimantes officiellement prises en charge sont répertoriées sur la "
-"page `Matériel TPV <https://www.odoo.com/page/pos-ipad-android-hardware>` _)"
-
-#: ../../point_of_sale/overview/setup.rst:24
-msgid "A Honeywell Eclipse USB Barcode Scanner or another compatible scanner"
-msgstr ""
-"Un scanner code à barre USB Eclipse Honeywell ou tout autre scanner "
-"compatible"
-
-#: ../../point_of_sale/overview/setup.rst:25
-msgid "An Epson compatible cash drawer"
-msgstr "Un tiroir-caisse compatible Epson"
-
-#: ../../point_of_sale/overview/setup.rst:26
-msgid "An RJ45 Ethernet Cable (optional, Wi-Fi is built in)"
-msgstr "Un câble Ethernet RJ45 (en option, le Wi-Fi est intégré)"
-
-#: ../../point_of_sale/overview/setup.rst:29
-#: ../../point_of_sale/overview/setup.rst:213
-msgid "Step By Step Setup Guide"
-msgstr "Guide d'installation pas à pas"
-
-#: ../../point_of_sale/overview/setup.rst:32
-msgid "Current version of the POSBox (since 2015)"
-msgstr "Version courante de la POSbox (depuis 2015)"
-
-#: ../../point_of_sale/overview/setup.rst:36
-msgid "Connect peripheral devices"
-msgstr "Connecter des périphériques"
-
-#: ../../point_of_sale/overview/setup.rst:38
-msgid ""
-"Officially supported hardware is listed on `the POS Hardware page "
-"<https://www.odoo.com/page/pos-ipad-android-hardware>`_, but other hardware "
-"might work as well."
-msgstr ""
-"La liste officielle du matériel compatible est disponible sur la page de "
-"`spécifications matérielles du POS <https://www.odoo.com/page/pos-ipad-"
-"android-hardware>`_, ,bien qu'un matériel non-listé puisse tout aussi bien "
-"fonctionner."
-
-#: ../../point_of_sale/overview/setup.rst:42
-msgid "**Printer**: Connect an ESC/POS printer to a USB port and power it on."
-msgstr ""
-"**Imprimante**: Connectez une imprimante ESC/POS à un port USB et mettez la "
-"en marche."
-
-#: ../../point_of_sale/overview/setup.rst:45
-msgid ""
-"**Cash drawer**: The cash drawer should be connected to the printer with an "
-"RJ25 cable."
-msgstr ""
-"**Tiroir caisse**: Le tiroir caisse devrait être connecté à l'imprimante "
-"avec un cable RJ25."
-
-#: ../../point_of_sale/overview/setup.rst:48
-msgid ""
-"**Barcode scanner**: Connect your barcode scanner. In order for your barcode"
-" scanner to be compatible it must behave as a keyboard and must be "
-"configured in **US QWERTY**. It also must end barcodes with an Enter "
-"character (keycode 28). This is most likely the default configuration of "
-"your barcode scanner."
-msgstr ""
-"**Scanner de code-barres**: Connectez votre scanner de code-barres. Pour que"
-" votre scanner puisse être compatible, il doit se comporter comme un clavier"
-" et être configuré en **US QWERTY**. Il doit également terminer les codes-"
-"barres par le caractère Entrer (keycode 28). Il s'agit le plus souvent de la"
-" configuration par défaut de votre scanner de code-barres."
-
-#: ../../point_of_sale/overview/setup.rst:54
-msgid "**Scale**: Connect your scale and power it on."
-msgstr ""
-"**Balance**: Connectez votre balance électronique et mettez la en marche."
-
-#: ../../point_of_sale/overview/setup.rst:56
-msgid ""
-"**Ethernet**: If you do not wish to use Wi-Fi, plug in the Ethernet cable. "
-"Make sure this will connect the POSBox to the same network as your POS "
-"device."
-msgstr ""
-"**Ethernet**: Si vous ne souhaitez pas utiliser le Wi-Fi, branchez le câble "
-"Ethernet. Assurez-vous de connecter la POSBox sur le même réseau que votre "
-"périphérique PdV."
-
-#: ../../point_of_sale/overview/setup.rst:60
-msgid ""
-"**Wi-Fi**: The current version of the POSBox has Wi-Fi built in. Make sure "
-"not to plug in an Ethernet cable, because all Wi-Fi functionality will be "
-"bypassed when a wired network connection is available."
-msgstr ""
-"** Wi-Fi **: La connexion Wi-Fi est intégrée à la version actuelle de la "
-"POSBox. Assurez-vous de ne pas brancher un câble Ethernet, car toute "
-"fonctionnalité Wi-Fi sera ignorée lorsqu'une connexion réseau câblée est "
-"disponible."
-
-#: ../../point_of_sale/overview/setup.rst:66
-msgid "Power the POSBox"
-msgstr "Mettez la POSBox sous tension"
-
-#: ../../point_of_sale/overview/setup.rst:68
-msgid ""
-"Plug the power adapter into the POSBox, a bright red status led should light"
-" up."
-msgstr ""
-"Connecter l'adaptateur secteur à la POSBox, une led rouge brillante devrait "
-"s'allumer."
-
-#: ../../point_of_sale/overview/setup.rst:72
-msgid "Make sure the POSBox is ready"
-msgstr "Veuillez vérifier que la POSBox est prête"
-
-#: ../../point_of_sale/overview/setup.rst:74
-msgid ""
-"Once powered, The POSBox needs a while to boot. Once the POSBox is ready, it"
-" should print a status receipt with its IP address. Also the status LED, "
-"just next to the red power LED, should be permanently lit green."
-msgstr ""
-"Une fois alimentée, la POSBox requiert un peu de temps avant de démarrer. "
-"Une fois que la POSBox est prête, une étiquette indiquant son statut et son "
-"adresse IP devrait s'imprimer. La LED qui se trouve juste à côté de la LED "
-"rouge d'alimentation devrait alors s'allumer de façon permanente en vert."
-
-#: ../../point_of_sale/overview/setup.rst:80
-#: ../../point_of_sale/overview/setup.rst:292
-msgid "Setup the Point of Sale"
-msgstr "Configurer le Point de Vente"
-
-#: ../../point_of_sale/overview/setup.rst:82
-msgid ""
-"To setup the POSBox in the Point of Sale go to :menuselection:`Point of Sale"
-" --> Configuration --> Point of Sale` and select your Point of Sale. Scroll "
-"down to the ``PoSBox / Hardware Proxy`` section and activate the options for"
-" the hardware you want to use through the POSBox. Specifying the IP of the "
-"POSBox is recommended (it is printed on the receipt that gets printed after "
-"booting up the POSBox). When the IP is not specified the Point of Sale will "
-"attempt to find it on the local network."
-msgstr ""
-"Pour installer la POSBox dans le Point de Vente, allez à :menuselection: "
-"`Point de Vente --> Configuration --> Point de Vente` et sélectionnez votre "
-"Point de Vente. Faites défiler jusqu'à la section `` PoSBox / Hardware "
-"Proxy`` et activez les options pour le matériel que vous souhaitez utiliser "
-"via la POSBox. Spécifiez l'adresse IP de la POSBox est recommandé (elle est "
-"imprimée sur le reçu qui est imprimé après le démarrage de la POSBox). "
-"Lorsque l'adresse IP n'est pas spécifiée, le Point de Vente tentera de la "
-"trouver sur le réseau local."
-
-#: ../../point_of_sale/overview/setup.rst:91
-msgid ""
-"If you are running multiple Point of Sale on the same POSBox, make sure that"
-" only one of them has Remote Scanning/Barcode Scanner activated."
-msgstr ""
-"Si vous exécutez plusieurs Points de Vente sur la même borne POSBox, "
-"assurez-vous que l'un d'entre eux a activé la fonction de numérisation à "
-"distance / scanner de codes-barres."
-
-#: ../../point_of_sale/overview/setup.rst:94
-msgid ""
-"It might be a good idea to make sure the POSBox IP never changes in your "
-"network. Refer to your router documentation on how to achieve this."
-msgstr ""
-"Il serait bon de vous assurer que l'adresse IP POSBox ne change jamais dans "
-"votre réseau. Reportez-vous à la documentation de votre routeur pour savoir "
-"comment y parvenir."
-
-#: ../../point_of_sale/overview/setup.rst:99
-msgid "Launch the Point of Sale"
-msgstr "Lancez le Point de Vente"
-
-#: ../../point_of_sale/overview/setup.rst:101
-msgid ""
-"If you didn't specify the POSBox's IP address in the configuration, the POS "
-"will need some time to perform a network scan to find the POSBox. This is "
-"only done once."
-msgstr ""
-"Si vous n'avez pas spécifié l'adresse IP de la POSBox dans la configuration,"
-" le POS aura besoin d'un certain temps pour effectuer une analyse réseau "
-"pour trouver la POSBox. Ceci ne sera fait qu'une fois."
-
-#: ../../point_of_sale/overview/setup.rst:105
-msgid ""
-"The Point of Sale is now connected to the POSBox and your hardware should be"
-" ready to use."
-msgstr ""
-"Le Point de Vente est désormais connecté à la POSBox et votre matériel est "
-"prêt à être utilisé."
-
-#: ../../point_of_sale/overview/setup.rst:109
-msgid "Wi-Fi configuration"
-msgstr "Configuration Wi-Fi"
-
-#: ../../point_of_sale/overview/setup.rst:111
-msgid ""
-"The most recent version of the POSBox has Wi-Fi built in. If you're using an"
-" older version you'll need a Linux compatible USB Wi-Fi adapter. Most "
-"commercially available Wi-Fi adapters are Linux compatible. Officially "
-"supported are Wi-Fi adapters with a Ralink 5370 chipset."
-msgstr ""
-"La version la plus récente de la POSBox intègre le Wi-Fi. Si vous utilisez "
-"une ancienne version, vous aurez besoin d'un adaptateur Wi-Fi USB compatible"
-" Linux. La plupart des adaptateurs Wi-Fi disponibles dans le commerce sont "
-"compatibles avec Linux. Les adaptateurs Wi-Fi officiellement pris en charge "
-"sont ceux munis d'un chipset Ralink 5370."
-
-#: ../../point_of_sale/overview/setup.rst:117
-msgid ""
-"Make sure not to plug in an Ethernet cable, as all Wi-Fi related "
-"functionality will be disabled when a wired network connection is available."
-msgstr ""
-"Assurez-vous que le câble Ethernet n'est pas connecté car toute "
-"fonctionnalité relative au Wi-Fi est désactivée si une connexion filaire est"
-" détectée."
-
-#: ../../point_of_sale/overview/setup.rst:121
-msgid ""
-"When the POSBox boots with a Wi-Fi adapter it will start its own Wi-Fi "
-"Access Point called \"Posbox\" you can connect to. The receipt that gets "
-"printed when the POSBox starts will reflect this. In order to make the "
-"POSBox connect to an already existing Wi-Fi network, go to the homepage of "
-"the POSBox (indicated on the receipt) and go to the Wi-Fi configuration "
-"page. On there you can choose a network to connect to. Note that we only "
-"support open and WPA(2)-PSK networks. When connecting to a WPA-secured "
-"network, fill in the password field. The POSBox will attempt to connect to "
-"the specified network and will print a new POSBox status receipt after it "
-"has connected."
-msgstr ""
-"Lorsque la POSBox démarre avec un adaptateur Wi-Fi, son propre point d'accès"
-" Wi-Fi -nommé \"Posbox\"- est proposé et sur lequel vous pouvez-vous "
-"connecter. L'étiquette qui est imprimée au démarrage de la POSBox "
-"l'indiquera. Avant de connecter la POSBox à un réseau existant, aller à la "
-"page d'accueil de la POSBox (adresse indiquée sur l'étiquette) et aller sur "
-"la page de configuration Wi-Fi. Sur cette page vous pouvez sélectionner le "
-"réseau sur lequel vous souhaiter vous connecter. Veuillez noter que nous ne "
-"supportons que les réseaux de type \"open\" et WPA(2)-PSK. Renseignez le mot"
-" de passe si vous vous connectez à un réseau sécurisé WPA. La POSBox "
-"essaiera de se connecter au réseau sélectionné et imprimer une nouvelle "
-"étiquette avec ses nouveaux paramètres."
-
-#: ../../point_of_sale/overview/setup.rst:132
-msgid ""
-"If you plan on permanently setting up the POSBox with Wi-Fi, you can use the"
-" \"persistent\" checkbox on the Wi-Fi configuration page when connecting to "
-"a network. This will make the network choice persist across reboots. This "
-"means that instead of starting up its own \"Posbox\" network it will always "
-"attempt to connect to the specified network after it boots."
-msgstr ""
-"Si vous envisagez de configurer de manière permanente la borne POSBox avec "
-"Wi-Fi, vous pouvez utiliser la case à cocher \"persistante\" sur la page de "
-"configuration Wi-Fi lors de la connexion à un réseau. Cela rendra le choix "
-"du réseau persistant lors des redémarrages. Cela signifie qu'au lieu de "
-"démarrer son propre réseau \"Posbox\", il tentera toujours de se connecter "
-"au réseau spécifié après son démarrage."
-
-#: ../../point_of_sale/overview/setup.rst:139
-msgid ""
-"When the POSBox fails to connect to a network it will fall back to starting "
-"it's own \"Posbox\" Access Point. If connection is lost with a Wi-Fi network"
-" after connecting to it, the POSBox will attempt to re-establish connection "
-"automatically."
-msgstr ""
-"Lorsque la POSBox ne parvient pas à se connecter à un réseau, elle se remet "
-"à lancer son propre point d'accès \"Posbox\". Si la connexion est perdue "
-"avec un réseau Wi-Fi après la connexion, la POSBox tentera de rétablir la "
-"connexion automatiquement."
-
-#: ../../point_of_sale/overview/setup.rst:145
-msgid "Multi-POS Configuration"
-msgstr "Configuration multi-POS"
-
-#: ../../point_of_sale/overview/setup.rst:147
-msgid ""
-"The advised way to setup a multi Point of Sale shop is to have one POSBox "
-"per Point of Sale. In this case it is mandatory to manually specify the IP "
-"address of each POSBox in each Point of Sale. You must also configure your "
-"network to make sure the POSBox's IP addresses don't change. Please refer to"
-" your router documentation."
-msgstr ""
-"Le moyen conseillé pour installer un magasin multi-points de vente est "
-"d'avoir une POSBox par Point de Vente. Dans ce cas, il est obligatoire de "
-"spécifier manuellement l'adresse IP de chaque POSBox dans chaque Point de "
-"Vente. Vous devez également configurer votre réseau pour vous assurer que "
-"les adresses IP de la POSBox ne changent pas. Veuillez vous référer à la "
-"documentation de votre routeur."
-
-#: ../../point_of_sale/overview/setup.rst:154
-msgid "POSBoxless Guide (advanced)"
-msgstr "Guide \"Sans POSBox\" (Avancé)"
-
-#: ../../point_of_sale/overview/setup.rst:158
-msgid ""
-"If you are running your Point of Sale on a Debian-based Linux distribution, "
-"you do not need the POSBox as you can run its software locally. However the "
-"installation process is not foolproof. You'll need at least to know how to "
-"install and run Odoo. You may also run into issues specific to your "
-"distribution or to your particular setup and hardware configuration."
-msgstr ""
-"Si vous exécutez votre Point de Vente sur une distribution Linux basée sur "
-"Debian, vous n'avez pas besoin de la POSBox car vous pouvez exécuter son "
-"logiciel localement. Cependant, le processus d'installation n'est pas "
-"infaillible. Vous devez au moins savoir comment installer et exécuter Odoo. "
-"Vous pouvez également rencontrer des problèmes spécifiques à votre "
-"distribution ou à votre configuration matérielle et configuration "
-"particulière."
-
-#: ../../point_of_sale/overview/setup.rst:165
-msgid ""
-"Drivers for the various types of supported hardware are provided as Odoo "
-"modules. In fact, the POSBox runs an instance of Odoo that the Point of Sale"
-" communicates with. The instance of Odoo running on the POSBox is very "
-"different from a 'real' Odoo instance however. It does not handle *any* "
-"business data (eg. POS orders), but only serves as a gateway between the "
-"Point of Sale and the hardware."
-msgstr ""
-"Les pilotes pour les différents types de matériel pris en charge sont "
-"fournis en tant que modules Odoo. En fait, la POSBox exécute une instance "
-"d'Odoo avec laquelle le Point de Vente communique. L'instance d'Odoo "
-"s'exécutant sur la POSBox est très différente d'une \"vraie\" instance "
-"d'Odoo. Il ne gère *aucune* donnée commerciale (par exemple, les commandes "
-"PdV), mais sert uniquement de passerelle entre le Point de Vente et le "
-"matériel."
-
-#: ../../point_of_sale/overview/setup.rst:172
-msgid ""
-"The goal of this section will be to set up a local Odoo instance that "
-"behaves like the Odoo instance running on the POSBox."
-msgstr ""
-"Le but de cette section sera de configurer une instance Odoo locale qui se "
-"comporte comme l'instance Odoo s'exécutant sur la POSBox."
-
-#: ../../point_of_sale/overview/setup.rst:176
-msgid "Image building process"
-msgstr "Processus de création d'image"
-
-#: ../../point_of_sale/overview/setup.rst:178
-msgid ""
-"We generate the official POSBox images using the scripts in "
-"https://github.com/odoo/odoo/tree/11.0/addons/point_of_sale/tools/posbox. "
-"More specifically, we run `posbox_create_image.sh "
-"<https://github.com/odoo/odoo/blob/11.0/addons/point_of_sale/tools/posbox/posbox_create_image.sh>`_."
-" This builds an image called ``posbox.img``, which we zip and upload to "
-"`nightly.odoo.com <https://nightly.odoo.com>`_ for users to download."
-msgstr ""
-"Nous générons les images POSBox officielles en utilisant les scripts sur "
-"https://github.com/odoo/odoo/tree/11.0/addons/point_of_sale/tools/posbox. "
-"More specifically, we run `posbox_create_image.sh "
-"<https://github.com/odoo/odoo/blob/11.0/addons/point_of_sale/tools/posbox/posbox_create_image.sh>`_."
-" Cela crée une image appelée `` posbox.img``, que nous compressons et "
-"téléchargeons sur `nightly.odoo.com <https://nightly.odoo.com>` _ pour que "
-"les utilisateurs puissent les télécharger."
-
-#: ../../point_of_sale/overview/setup.rst:186
-msgid ""
-"The scripts in this directory might be useful as a reference if you get "
-"stuck or want more detail about something."
-msgstr ""
-"Les scripts dans ce répertoire peuvent être utiles comme référence si vous "
-"êtes bloqué ou si vous voulez plus de détails sur quelque chose."
-
-#: ../../point_of_sale/overview/setup.rst:190
-msgid "Summary of the image creation process"
-msgstr "Résumé du processus de création d'image"
-
-#: ../../point_of_sale/overview/setup.rst:192
-msgid ""
-"The image creation process starts by downloading the latest `Raspbian "
-"<https://www.raspbian.org/>`_ image. It then locally mounts this Raspbian "
-"image and copies over some files and scripts that will make the Raspbian "
-"image turn itself into a POSBox when it boots. These scripts will update "
-"Raspbian, remove non-essential packages and install required packages. In "
-"order to boot Raspbian we use qemu, which is capable of providing ARM "
-"emulation. After this, the emulated Raspbian OS will shut itself down. We "
-"then once again locally mount the image, remove the scripts that were used "
-"to initialize the image at boot and we copy over some extra configuration "
-"files. The resulting image is then ready to be tested and used."
-msgstr ""
-"Le processus de création d'image commence par télécharger la dernière image "
-"`Raspbian <https://www.raspbian.org/>` _. Il monte ensuite localement cette "
-"image Raspbian et copie sur certains fichiers et scripts qui feront que "
-"l'image Raspbian se transformera elle-même en une POSBox quand elle "
-"démarrera. Ces scripts mettront à jour Raspbian, supprimeront les paquets "
-"non essentiels et installeront les paquets requis. Afin de démarrer Raspbian"
-" nous utilisons qemu, qui est capable de fournir une émulation ARM. Après "
-"cela, le système d'exploitation Raspbian émulé se fermera. Nous montons à "
-"nouveau localement l'image, supprimons les scripts qui ont été utilisés pour"
-" initialiser l'image au démarrage et nous copions des fichiers de "
-"configuration supplémentaires. L'image résultante est alors prête à être "
-"testée et utilisée."
-
-#: ../../point_of_sale/overview/setup.rst:207
-msgid "A Debian-based Linux distribution (Debian, Ubuntu, Mint, etc.)"
-msgstr "Une distribution Linux basée sur Debian (Debian, Ubuntu, Mint, etc.)"
-
-#: ../../point_of_sale/overview/setup.rst:208
-msgid "A running Odoo instance you connect to load the Point of Sale"
-msgstr ""
-"Une instance Odoo en cours d'exécution à laquelle vous vous connectez pour "
-"charger le Point de Vente"
-
-#: ../../point_of_sale/overview/setup.rst:209
-msgid ""
-"You must uninstall any ESC/POS printer driver as it will conflict with "
-"Odoo's built-in driver"
-msgstr ""
-"Vous devez désinstaller tout pilote d'imprimante ESC / POS car cela "
-"entrerait en conflit avec le pilote intégré d'Odoo"
-
-#: ../../point_of_sale/overview/setup.rst:216
-msgid "Extra dependencies"
-msgstr "Dépendances supplémentaires"
-
-#: ../../point_of_sale/overview/setup.rst:218
-msgid ""
-"Because Odoo runs on Python 2, you need to check which version of pip you "
-"need to use."
-msgstr ""
-"Parce qu'Odoo fonctionne sur Python 2, vous devez vérifier quelle version de"
-" pip vous devez utiliser."
-
-#: ../../point_of_sale/overview/setup.rst:221
-msgid "``# pip --version``"
-msgstr "``# pip --version``"
-
-#: ../../point_of_sale/overview/setup.rst:223
-#: ../../point_of_sale/overview/setup.rst:229
-msgid "If it returns something like::"
-msgstr "Si cela retourne quelque chose comme :"
-
-#: ../../point_of_sale/overview/setup.rst:227
-msgid "You need to try pip2 instead."
-msgstr "Vous devez essayer pip2 à la place."
-
-#: ../../point_of_sale/overview/setup.rst:233
-msgid "You can use pip."
-msgstr "Vous pouvez utiliser pip."
-
-#: ../../point_of_sale/overview/setup.rst:235
-msgid "The driver modules requires the installation of new python modules:"
-msgstr ""
-"Les modules du pilote nécessitent l'installation de nouveaux modules python:"
-
-#: ../../point_of_sale/overview/setup.rst:237
-msgid "``# pip install pyserial``"
-msgstr "``# pip install pyserial``"
-
-#: ../../point_of_sale/overview/setup.rst:239
-msgid "``# pip install pyusb==1.0.0b1``"
-msgstr "``# pip install pyusb==1.0.0b1``"
-
-#: ../../point_of_sale/overview/setup.rst:241
-msgid "``# pip install qrcode``"
-msgstr "``# pip install qrcode``"
-
-#: ../../point_of_sale/overview/setup.rst:244
-msgid "Access Rights"
-msgstr "Droits d'accès"
-
-#: ../../point_of_sale/overview/setup.rst:246
-msgid ""
-"The drivers need raw access to the printer and barcode scanner devices. "
-"Doing so requires a bit system administration. First we are going to create "
-"a group that has access to USB devices"
-msgstr ""
-"Les pilotes ont besoin d'un accès brut à l'imprimante et aux lecteurs de "
-"codes-barres. Cela nécessite un peu d'administration du système. Nous allons"
-" d'abord créer un groupe qui a accès aux périphériques USB"
-
-#: ../../point_of_sale/overview/setup.rst:250
-msgid "``# groupadd usbusers``"
-msgstr "``# groupadd usbusers``"
-
-#: ../../point_of_sale/overview/setup.rst:252
-msgid "Then we add the user who will run the OpenERP server to ``usbusers``"
-msgstr ""
-"Ensuite, nous ajoutons l'utilisateur qui va lancer le serveur OpenERP à "
-"`usbusers``"
-
-#: ../../point_of_sale/overview/setup.rst:254
-msgid "``# usermod -a -G usbusers USERNAME``"
-msgstr "``# usermod -a -G usbusers USERNAME``"
-
-#: ../../point_of_sale/overview/setup.rst:256
-msgid ""
-"Then we need to create a udev rule that will automatically allow members of "
-"``usbusers`` to access raw USB devices. To do so create a file called "
-"``99-usbusers.rules`` in the ``/etc/udev/rules.d/`` directory with the "
-"following content::"
-msgstr ""
-"Ensuite, nous devons créer une règle udev qui permettra automatiquement aux "
-"membres des «usbusers» d'accéder aux périphériques USB bruts. Pour ce faire,"
-" créez un fichier appelé `` 99-usbusers.rules`` dans le répertoire `` "
-"/etc/udev/rules.d/ `` avec le contenu suivant ::"
-
-#: ../../point_of_sale/overview/setup.rst:264
-msgid "Then you need to reboot your machine."
-msgstr "Ensuite, vous devez redémarrer votre machine."
-
-#: ../../point_of_sale/overview/setup.rst:267
-msgid "Start the local Odoo instance"
-msgstr "Démarrer l'instance locale Odoo"
-
-#: ../../point_of_sale/overview/setup.rst:269
-msgid "We must launch the Odoo server with the correct settings"
-msgstr "Nous devons lancer le serveur Odoo avec les paramètres corrects"
-
-#: ../../point_of_sale/overview/setup.rst:271
-msgid ""
-"``$ ./odoo.py "
-"--load=web,hw_proxy,hw_posbox_homepage,hw_posbox_upgrade,hw_scale,hw_scanner,hw_escpos``"
-msgstr ""
-"``$ ./odoo.py "
-"--load=web,hw_proxy,hw_posbox_homepage,hw_posbox_upgrade,hw_scale,hw_scanner,hw_escpos``"
-
-#: ../../point_of_sale/overview/setup.rst:274
-msgid "Test the instance"
-msgstr "Testez l'instance"
-
-#: ../../point_of_sale/overview/setup.rst:276
-msgid ""
-"Plug all your hardware to your machine's USB ports, and go to "
-"``http://localhost:8069/hw_proxy/status`` refresh the page a few times and "
-"see if all your devices are indicated as *Connected*. Possible source of "
-"errors are: The paths on the distribution differ from the paths expected by "
-"the drivers, another process has grabbed exclusive access to the devices, "
-"the udev rules do not apply or a superseded by others."
-msgstr ""
-"Branchez tout votre matériel sur les ports USB de votre machine, et allez à "
-"``http://localhost:8069/hw_proxy/status`` , rafraîchissez la page plusieurs "
-"fois et voir si tous vos périphériques sont indiqués comme * Connectés *. "
-"Les sources possibles d'erreurs sont les suivantes: Les chemins de la "
-"distribution diffèrent des chemins attendus par les pilotes, un autre "
-"processus a obtenu un accès exclusif aux périphériques, les règles udev ne "
-"s'appliquent pas ou sont remplacées par d'autres."
-
-#: ../../point_of_sale/overview/setup.rst:284
-msgid "Automatically start Odoo"
-msgstr "Démarrez automatiquement Odoo"
-
-#: ../../point_of_sale/overview/setup.rst:286
-msgid ""
-"You must now make sure that this Odoo install is automatically started after"
-" boot. There are various ways to do so, and how to do it depends on your "
-"particular setup. Using the init system provided by your distribution is "
-"probably the easiest way to accomplish this."
-msgstr ""
-"Vous devez maintenant vous assurer que cette installation Odoo est "
-"automatiquement lancée après le démarrage. Il existe plusieurs façons de le "
-"faire en fonction de votre configuration particulière. L'utilisation du "
-"système init fourni par votre distribution est probablement le moyen le plus"
-" simple d'y parvenir."
-
-#: ../../point_of_sale/overview/setup.rst:294
-msgid ""
-"The IP address field in the POS configuration must be either ``127.0.0.1`` "
-"or ``localhost`` if you're running the created Odoo server on the machine "
-"that you'll use as the Point of Sale device. You can also leave it empty."
-msgstr ""
-"Le champ d'adresse IP dans la configuration PdV doit être soit `` "
-"127.0.0.1`` ou `` localhost`` si vous exécutez le serveur Odoo créé sur la "
-"machine que vous utiliserez comme périphérique de Point de Vente. Vous "
-"pouvez également le laisser vide."
-
-#: ../../point_of_sale/overview/setup.rst:300
-msgid "POSBox Technical Documentation"
-msgstr "Documentation technique POSBox"
-
-#: ../../point_of_sale/overview/setup.rst:303
-msgid "Technical Overview"
-msgstr "Présentation technique"
-
-#: ../../point_of_sale/overview/setup.rst:306
-msgid "The POSBox Hardware"
-msgstr "Le matériel POSBox"
-
-#: ../../point_of_sale/overview/setup.rst:308
-msgid ""
-"The POSBox's Hardware is based on a `Raspberry Pi 2 "
-"<https://www.raspberrypi.org/products/raspberry-pi-2-model-b/>`_, a popular "
-"single-board computer. The Raspberry Pi 2 is powered with a 2A micro-usb "
-"power adapter. 2A is needed to give enough power to the barcode scanners. "
-"The Software is installed on a 8Gb Class 10 or Higher SD Card. All this "
-"hardware is easily available worldwide from independent vendors."
-msgstr ""
-"Le matériel POSBox est basé sur un `Raspberry Pi 2 "
-"<https://www.raspberrypi.org/products/raspberry-pi-2-model-b/>`_, un "
-"ordinateur monocarte populaire. Le Raspberry Pi 2 est alimenté par un "
-"adaptateur secteur 2A micro-usb. 2A est nécessaire pour donner suffisamment "
-"de puissance aux scanners de codes-barres. Le logiciel est installé sur une "
-"carte SD 8 Go de classe 10 ou supérieure. Tout ce matériel est facilement "
-"disponible dans le monde entier auprès de fournisseurs indépendants."
-
-#: ../../point_of_sale/overview/setup.rst:317
-msgid "Compatible Peripherals"
-msgstr "Périphériques compatibles"
-
-#: ../../point_of_sale/overview/setup.rst:319
-msgid ""
-"Officially supported hardware is listed on the `POS Hardware page "
-"<https://www.odoo.com/page/pos-ipad-android-hardware>`_."
-msgstr ""
-"Le matériel officiellement pris en charge est répertorié sur la page "
-"`Matériel PdV <https://www.odoo.com/page/pos-ipad-android-hardware>`_."
-
-#: ../../point_of_sale/overview/setup.rst:323
-msgid "The POSBox Software"
-msgstr "Le logiciel de la POSBox"
-
-#: ../../point_of_sale/overview/setup.rst:325
-msgid ""
-"The POSBox runs a heavily modified Raspbian Linux installation, a Debian "
-"derivative for the Raspberry Pi. It also runs a barebones installation of "
-"Odoo which provides the webserver and the drivers. The hardware drivers are "
-"implemented as Odoo modules. Those modules are all prefixed with ``hw_*`` "
-"and they are the only modules that are running on the POSBox. Odoo is only "
-"used for the framework it provides. No business data is processed or stored "
-"on the POSBox. The Odoo instance is a shallow git clone of the ``8.0`` "
-"branch."
-msgstr ""
-"Le POSBox exécute une installation Linux Raspbian fortement modifiée, un "
-"dérivé de Debian pour le Raspberry Pi. Il exécute également une installation"
-" barebones de Odoo qui fournit le serveur web et les pilotes. Les pilotes "
-"matériels sont implémentés en tant que modules Odoo. Ces modules ont tous le"
-" préfixe `` hw_* `` et sont les seuls modules qui s'exécutent sur la POSBox."
-" Odoo est seulement utilisé pour le framework qu'il fournit. Aucune donnée "
-"d'entreprise n'est traitée ou stockée sur la POSBox. L'instance d'Odoo est "
-"un clone git peu profond de la branche `` 8.0``."
-
-#: ../../point_of_sale/overview/setup.rst:334
-msgid ""
-"The root partition on the POSBox is mounted read-only, ensuring that we "
-"don't wear out the SD card by writing to it too much. It also ensures that "
-"the filesystem cannot be corrupted by cutting the power to the POSBox. Linux"
-" applications expect to be able to write to certain directories though. So "
-"we provide a ramdisk for /etc and /var (Raspbian automatically provides one "
-"for /tmp). These ramdisks are setup by ``setup_ramdisks.sh``, which we run "
-"before all other init scripts by running it in ``/etc/init.d/rcS``. The "
-"ramdisks are named /etc_ram and /var_ram respectively. Most data from /etc "
-"and /var is copied to these tmpfs ramdisks. In order to restrict the size of"
-" the ramdisks, we do not copy over certain things to them (eg. apt related "
-"data). We then bind mount them over the original directories. So when an "
-"application writes to /etc/foo/bar it's actually writing to "
-"/etc_ram/foo/bar. We also bind mount / to /root_bypass_ramdisks to be able "
-"to get to the real /etc and /var during development."
-msgstr ""
-"La partition racine de la POSBox est montée en lecture seule, ce qui "
-"garantit que nous n'usons pas la carte SD en lui écrivant trop. Il garantit "
-"également que le système de fichiers ne peut pas être corrompu en coupant "
-"l'alimentation de la POSBox. Les applications Linux s'attendent cependant à "
-"pouvoir écrire dans certains répertoires. Nous fournissons donc un disque "
-"virtuel pour / etc et / var (Raspbian en fournit automatiquement un pour / "
-"tmp). Ces ramdisks sont configurés par `` setup_ramdisks.sh``, que nous "
-"exécutons avant tous les autres scripts init en l'exécutant dans `` "
-"/etc/init.d/rcS``. Les ramdisks sont nommés /etc_ram et /var_ram "
-"respectivement. La plupart des données de /etc et /var sont copiées dans ces"
-" ramdisks tmpfs. Afin de restreindre la taille des disques virtuels, nous ne"
-" leur copions pas certaines choses (par exemple, les données relatives à "
-"apt). Nous lions ensuite les monter sur les répertoires d'origine. Ainsi, "
-"lorsqu'une application écrit dans /etc/foo/bar, elle écrit dans "
-"/etc_ram/foo/bar. Nous lions aussi mount /to/root_bypass_ramdisks pour "
-"pouvoir accéder au réel /etc et /var pendant le développement."
-
-#: ../../point_of_sale/overview/setup.rst:350
-msgid "Logs of the running Odoo server can be found at:"
-msgstr ""
-"Les journaux du serveur Odoo en cours d'exécution peuvent être trouvés sur:"
-
-#: ../../point_of_sale/overview/setup.rst:352
-msgid "``/var/log/odoo/odoo.log``"
-msgstr "``/var/log/odoo/odoo.log``"
-
-#: ../../point_of_sale/overview/setup.rst:354
-msgid ""
-"Various POSBox related scripts (eg. wifi-related scripts) running on the "
-"POSBox will log to /var/log/syslog and those messages are tagged with "
-"``posbox_*``."
-msgstr ""
-"Divers scripts liés à la POSBox (par exemple, des scripts liés à la "
-"connexion Wi-Fi) s'exécutant sur la POSBox seront enregistrés dans "
-"/var/log/syslog et ces messages seront étiquetés avec \"posbox_*\"."
-
-#: ../../point_of_sale/overview/setup.rst:359
-msgid "Accessing the POSBox"
-msgstr "Accédez à la POSBox"
-
-#: ../../point_of_sale/overview/setup.rst:362
-msgid "Local Access"
-msgstr "Accès local"
-
-#: ../../point_of_sale/overview/setup.rst:364
-msgid ""
-"If you plug a QWERTY USB keyboard into one of the POSBox's USB ports, and if"
-" you connect a computer monitor to the *HDMI* port of the POSBox, you can "
-"use it as a small GNU/Linux computer and perform various administration "
-"tasks, like viewing some logs."
-msgstr ""
-"Si vous branchez un clavier USB QWERTY dans l'un des ports USB de la POSBox "
-"et si vous connectez un écran d'ordinateur au port *HDMI* de la POSBox, vous"
-" pouvez l'utiliser comme un petit ordinateur GNU/Linux et effectuer diverses"
-" tâches d'administration, comme Regarder quelques journaux."
-
-#: ../../point_of_sale/overview/setup.rst:369
-msgid "The POSBox will automatically log in as root on the default tty."
-msgstr ""
-"La POSBox se connecte automatiquement en tant que root sur le tty par "
-"défaut."
-
-#: ../../point_of_sale/overview/setup.rst:372
-msgid "Remote Access"
-msgstr "Accès distant"
-
-#: ../../point_of_sale/overview/setup.rst:374
-msgid ""
-"If you have the POSBox's IP address and an SSH client you can access the "
-"POSBox's system remotely. The login credentials are ``pi``/``raspberry``."
-msgstr ""
-"Si vous avez l'adresse IP de la POSBox et un client SSH, vous pouvez accéder"
-" au système de la POSBox à distance. Les informations de connexion sont "
-"``pi``/` raspberry``."
-
-#: ../../point_of_sale/overview/setup.rst:379
-msgid "Updating The POSBox Software"
-msgstr "Mise à jour du logiciel POSBox"
-
-#: ../../point_of_sale/overview/setup.rst:381
-msgid ""
-"Only upgrade the POSBox if you experience problems or want to use newly "
-"implemented features."
-msgstr ""
-"Ne mettez à niveau la POSBox que si vous rencontrez des problèmes ou "
-"souhaitez utiliser des fonctionnalités nouvellement implémentées."
-
-#: ../../point_of_sale/overview/setup.rst:384
-msgid ""
-"The best way to update the POSBox software is to download a new version of "
-"the image and flash the SD-Card with it. This operation is described in "
-"detail in `this tutorial <http://elinux.org/RPi_Easy_SD_Card_Setup>`_, just "
-"replace the standard Raspberry Pi image with the latest one found at `the "
-"official POSBox image page <http://nightly.odoo.com/master/posbox/>`_. This "
-"method of upgrading will ensure that you're running the latest version of "
-"the POSBox software."
-msgstr ""
-"La meilleure façon de mettre à jour le logiciel POSBox est de télécharger "
-"une nouvelle version de l'image et de la flasher avec la carte SD. Cette "
-"opération est décrite en détail dans `ce tutoriel "
-"<http://elinux.org/RPi_Easy_SD_Card_Setup>`_, il suffit de remplacer l'image"
-" Raspberry Pi standard par la plus récente trouvée sur `la page d'image "
-"POSBox officielle <http://nightly.odoo.com/master/posbox/>`_.  Cette méthode"
-" de mise à niveau garantit que vous exécutez la dernière version du logiciel"
-" POSBox."
-
-#: ../../point_of_sale/overview/setup.rst:393
-msgid ""
-"The second way of upgrading is through the built in upgrade interface that "
-"can be reached through the POSBox homepage. The nice thing about upgrading "
-"like this is that you don't have to flash a new image. This upgrade method "
-"is limited to what it can do however. It can not eg. update installed "
-"configuration files (like eg. /etc/hostapd.conf). It can only upgrade:"
-msgstr ""
-"La deuxième méthode de mise à niveau est l'interface intégrée de mise à "
-"niveau accessible via la page d'accueil de POSBox. La bonne chose à propos "
-"de la mise à niveau comme ceci est que vous n'avez pas besoin de flasher une"
-" nouvelle image. Cette méthode de mise à niveau est limitée à ce qu'elle "
-"peut faire cependant. Il ne peut pas, par exemple mettre à jour les fichiers"
-" de configuration installés (par exemple, /etc/hostapd.conf). Il ne peut que"
-" mettre à jour:"
-
-#: ../../point_of_sale/overview/setup.rst:400
-msgid "The internal Odoo application"
-msgstr "L'application interne Odoo"
-
-#: ../../point_of_sale/overview/setup.rst:401
-msgid ""
-"Scripts in the folder "
-"``odoo/addons/point_of_sale/tools/posbox/configuration/``"
-msgstr ""
-"Scripts dans le dossier "
-"``odoo/addons/point_of_sale/tools/posbox/configuration/``"
-
-#: ../../point_of_sale/overview/setup.rst:403
-msgid "When in doubt, always use the first method of upgrading."
-msgstr ""
-"En cas de doute, utilisez toujours la première méthode de mise à niveau."
-
-#: ../../point_of_sale/overview/setup.rst:406
-msgid "Troubleshoot"
-msgstr "Problèmes"
-
-#: ../../point_of_sale/overview/setup.rst:409
-msgid "The POS cannot connect to the POSBox"
-msgstr "Le PdV ne se connecte pas à la POSBox"
-
-#: ../../point_of_sale/overview/setup.rst:411
-msgid ""
-"The easiest way to make sure the POSBox is properly set-up is to turn it on "
-"with the printer plugged in as it will print a receipt indicating any error "
-"if encountered or the POSBox's IP address in case of success. If no receipt "
-"is printed, check the following steps:"
-msgstr ""
-"La façon la plus simple de savoir si la POSBox est correctement configurée "
-"est de la démarrer avec une imprimante connectée. Cela va imprimer un reçu "
-"indiquant toute erreur le cas échéant ou l'adresse IP de la POSBox en cas de"
-" succès. Si aucun reçu n'est imprimé, procédez aux étapes suivantes:"
-
-#: ../../point_of_sale/overview/setup.rst:415
-msgid ""
-"Make sure the POSBox is powered on, indicated by a brightly lit red status "
-"LED."
-msgstr "Assurez-vous que la POSBox est allumée, indiquée par une LED rouge."
-
-#: ../../point_of_sale/overview/setup.rst:417
-msgid ""
-"Make sure the POSBox is ready, this is indicated by a brightly lit green "
-"status LED just next to the red power status LED. The POSBox should be ready"
-" ~2 minutes after it is started."
-msgstr ""
-"Assurez-vous que la POSBox est prête, cela est indiqué par une LED verte "
-"juste à coté de la LED rouge. La POSBox devrait être prête environ 2 minutes"
-" après le démarrage."
-
-#: ../../point_of_sale/overview/setup.rst:420
-msgid ""
-"Make sure the POSBox is connected to the same network as your POS device. "
-"Both the device and the POSBox should be visible in the list of connected "
-"devices on your network router."
-msgstr ""
-"Assurez-vous que la POSBox est connectée au même réseau que votre PdV. Le "
-"PdV et la POSBox doivent tout deux être visibles dans la liste des appareils"
-" connectés sur votre réseau."
-
-#: ../../point_of_sale/overview/setup.rst:423
-msgid ""
-"Make sure that your LAN is set up with DHCP, and gives IP addresses in the "
-"range 192.168.0.X, 192.168.1.X, 10.0.0.X. If you cannot setup your LAN that "
-"way, you must manually set up your POSBox's IP address."
-msgstr ""
-"Assurez-vous que votre LAN est configurée en DHCP and donne une adresse IP "
-"parmi 192.168.0.X, 192.168.1.X, 10.0.0.X. Si vous ne pouvez pas configurer "
-"votre LAN de cette façon, vous devez manuellement assigner une adresse IP à "
-"la POSBox."
-
-#: ../../point_of_sale/overview/setup.rst:427
-msgid ""
-"If you have specified the POSBox's IP address in the configuration, make "
-"sure it correspond to the printed on the POSBox's status receipt."
-msgstr ""
-"Si vous avez spécifié l'adresse IP de la POSBox dans la configuration, "
-"assurez-vous qu'elle corresponde à l'adresse imprimée sur le reçu de status "
-"imprimé au démarrage."
-
-#: ../../point_of_sale/overview/setup.rst:430
-msgid "Make sure that the POS is not loaded over HTTPS."
-msgstr "Assurez-vous que la page du PdV n'est pas chargé en HTTPS."
-
-#: ../../point_of_sale/overview/setup.rst:431
-msgid ""
-"A bug in Firefox's HTTP implementation prevents the autodiscovery from "
-"working reliably. When using Firefox you should manually set up the POSBox's"
-" IP address in the POS configuration."
-msgstr ""
-"La fonctionnalité de découverte automatique peut ne pas fonctionner dans "
-"Firefox. Nous conseillons de spécifier l'adresse IP de la POSBox dans la "
-"configuration du point de vente par sécurité."
-
-#: ../../point_of_sale/overview/setup.rst:436
-msgid "The Barcode Scanner is not working"
-msgstr "Le scanner de code barre ne fonctionne pas correctement"
-
-#: ../../point_of_sale/overview/setup.rst:438
-msgid ""
-"The barcode scanner must be configured in US QWERTY and emit an Enter after "
-"each barcode. This is the default configuration of most barcode readers. "
-"Refer to the barcode reader documentation for more information."
-msgstr ""
-"Le scanner doit être configuré en US QWERTY et doit émettre un caractère "
-"ENTER après chaque code barre scanné. C'est la configuration par défaut sur "
-"la plupart des scanners. Vérifiez le manuel du scanner pour plus "
-"d'information."
-
-#: ../../point_of_sale/overview/setup.rst:442
-msgid ""
-"The POSBox needs a 2A power supply to work with some barcode scanners. If "
-"you are not using the provided power supply, make sure the one you use has "
-"enough power."
-msgstr ""
-"La POSBox a besoin d'une alimentation 2A pour fonctionner avec certains "
-"scanners. Si vous n'utilisez pas l'alimentation fournie avec la POSBox, "
-"assurez-vous d'avoir assez de courant."
-
-#: ../../point_of_sale/overview/setup.rst:445
-msgid ""
-"Some barcode scanners will need more than 2A and will not work, or will work"
-" unreliably, even with the provided power supply. In those case you can plug"
-" the barcode scanner in a self-powered USB hub."
-msgstr ""
-"Certains scanners vont demander plus de 2A et ne fonctionneront pas or de "
-"façon instable, même avec l'alimentation fournie. Dans ce cas, vous devrez "
-"utiliser une alimentation externe pour le scanner."
-
-#: ../../point_of_sale/overview/setup.rst:448
-msgid ""
-"Some poorly built barcode scanners do not advertise themselves as barcode "
-"scanners but as a usb keyboard instead, and will not be recognized by the "
-"POSBox."
-msgstr ""
-"Des scanners bon marché ne sont pas détectés comme un scanner de code barre "
-"mais comme un clavier USB. Ceux-ci ne fonctionneront pas avec la POSBox."
-
-#: ../../point_of_sale/overview/setup.rst:453
-msgid "The Barcode Scanner is not working reliably"
-msgstr "Le scanner de codes-barres ne fonctionne pas de manière fiable"
-
-#: ../../point_of_sale/overview/setup.rst:455
-msgid ""
-"Make sure that no more than one device with 'Scan via Proxy'/'Barcode "
-"Scanner' enabled are connected to the POSBox at the same time."
-msgstr ""
-"Assurez-vous que pas plus d'un périphérique avec «Scan via Proxy» / «Scanner"
-" de Code-Barres» activé sont connectés à la POSBox en même temps."
-
-#: ../../point_of_sale/overview/setup.rst:460
-msgid "Printing the receipt takes too much time"
-msgstr "L'impression du reçu prend trop de temps"
-
-#: ../../point_of_sale/overview/setup.rst:462
-msgid ""
-"A small delay before the first print is expected, as the POSBox will do some"
-" preprocessing to speed up the next printings. If you suffer delays "
-"afterwards it is most likely due to poor network connection between the POS "
-"and the POSBox."
-msgstr ""
-"Un petit délai avant la première impression est normal, car la POSBox "
-"effectuera un pré-traitement pour accélérer les prochaines impressions. Si "
-"vous subissez des retards par la suite, cela est probablement dû à une "
-"mauvaise connexion réseau entre le PdV et le POSBox."
-
-#: ../../point_of_sale/overview/setup.rst:468
-msgid "Some characters are not correctly printed on the receipt"
-msgstr "Certains caractères ne sont pas correctement imprimés sur le reçu"
-
-#: ../../point_of_sale/overview/setup.rst:470
-msgid ""
-"The POSBox does not support all languages and characters. It currently "
-"supports Latin and Cyrillic based scripts, with basic Japanese support."
-msgstr ""
-"La POSBox ne prend pas en charge tous les langages et caractères. Il "
-"supporte actuellement les scripts basés en latin et en cyrillique, avec un "
-"support japonais basique."
-
-#: ../../point_of_sale/overview/setup.rst:475
-msgid "The printer is offline"
-msgstr "L'imprimante est hors ligne"
-
-#: ../../point_of_sale/overview/setup.rst:477
-msgid ""
-"Make sure the printer is connected, powered, has enough paper and has its "
-"lid closed, and is not reporting an error. If the error persists, please "
-"contact support."
-msgstr ""
-"Assurez-vous que l'imprimante est connectée, sous tension, qu'elle contient "
-"suffisamment de papier, que son couvercle est fermé et qu'elle ne signale "
-"aucune erreur. Si l'erreur persiste, contactez le support technique."
-
-#: ../../point_of_sale/overview/setup.rst:482
-msgid "The cashdrawer does not open"
-msgstr "Le tiroir caisse n'ouvre pas"
-
-#: ../../point_of_sale/overview/setup.rst:484
-msgid ""
-"The cashdrawer should be connected to the printer and should be activated in"
-" the POS configuration."
-msgstr ""
-"Le tiroir-caisse doit être connecté à l'imprimante et doit être activé dans "
-"la configuration PdV."
-
-#: ../../point_of_sale/overview/setup.rst:488
-msgid "Credits"
-msgstr "Crédits"
-
-#: ../../point_of_sale/overview/setup.rst:489
-msgid ""
-"The POSBox project was developed by Frédéric van der Essen with the kind "
-"help of Gary Malherbe, Fabien Meghazi, Nicolas Wisniewsky, Dimitri Del "
-"Marmol, Joren Van Onder and Antony Lesuisse."
-msgstr ""
-"Le projet POSBox à été développé par Frédéric van der Essen avec l'aide "
-"amicale de Gary Malherbe, Fabien Meghazi, Nicolas Wisniewsky, Dimitri Del "
-"Marmol, Joren Van Onder and Antony Lesuisse."
-
-#: ../../point_of_sale/overview/setup.rst:493
-msgid ""
-"This development would not have been possible without the Indiegogo campaign"
-" and those who contributed to it. Special thanks goes to the partners who "
-"backed the campaign with founding partner bundles:"
-msgstr ""
-"Ce développement n'aurait pas été possible sans la campagne Indiegogo et "
-"ceux qui y ont contribué. Remerciements particuliers aux partenaires qui ont"
-" soutenu la campagne ainsi que l'ensemble des partenaires fondateurs:"
-
-#: ../../point_of_sale/overview/setup.rst:497
-msgid "Camptocamp"
-msgstr "Camptocamp"
-
-#: ../../point_of_sale/overview/setup.rst:498
-msgid "BHC"
-msgstr "BHC"
-
-#: ../../point_of_sale/overview/setup.rst:499
-msgid "openBig"
-msgstr "openBig"
-
-#: ../../point_of_sale/overview/setup.rst:500
-msgid "Eeezee-IT"
-msgstr "Eeezee-IT"
-
-#: ../../point_of_sale/overview/setup.rst:501
-msgid "Solarsis LDA"
-msgstr "Solarsis LDA"
-
-#: ../../point_of_sale/overview/setup.rst:502
-msgid "ACSONE"
-msgstr "ACSONE"
-
-#: ../../point_of_sale/overview/setup.rst:503
-msgid "Vauxoo"
-msgstr "Vauxoo"
-
-#: ../../point_of_sale/overview/setup.rst:504
-msgid "Ekomurz"
-msgstr "Ekomurz"
-
-#: ../../point_of_sale/overview/setup.rst:505
-msgid "Datalp"
-msgstr "Datalp"
-
-#: ../../point_of_sale/overview/setup.rst:506
-msgid "Dao Systems"
-msgstr "Dao Systems"
-
-#: ../../point_of_sale/overview/setup.rst:507
-msgid "Eggs Solutions"
-msgstr "Eggs Solutions"
-
-#: ../../point_of_sale/overview/setup.rst:508
-msgid "OpusVL"
-msgstr "OpusVL"
-
-#: ../../point_of_sale/overview/setup.rst:510
-msgid ""
-"And also the partners who've backed the development with the Founding POSBox"
-" Bundle:"
-msgstr ""
-"Et aussi les partenaires qui ont soutenu le développement avec le bundle "
-"POSBox fondateur:"
-
-#: ../../point_of_sale/overview/setup.rst:513
-msgid "Willow IT"
-msgstr "Willow IT"
-
-#: ../../point_of_sale/overview/setup.rst:514
-msgid "E\\. Akhalwaya & Sons"
-msgstr "E\\. Akhalwaya & Sons"
-
-#: ../../point_of_sale/overview/setup.rst:515
-msgid "Multibase"
-msgstr "Multibase"
-
-#: ../../point_of_sale/overview/setup.rst:516
-msgid "Mindesa"
-msgstr "Mindesa"
-
-#: ../../point_of_sale/overview/setup.rst:517
-msgid "bpso.biz"
-msgstr "bpso.biz"
-
-#: ../../point_of_sale/overview/setup.rst:518
-msgid "Shine IT."
-msgstr "Shine IT."
-
 #: ../../point_of_sale/overview/start.rst:3
 msgid "Getting started with Odoo Point of Sale"
 msgstr "Démarrer avec le Point de Vente Odoo"
@@ -2167,6 +1032,12 @@ msgstr ""
 msgid "It's done, you have now closed your first PoS session."
 msgstr "C'est fait, vous avez maintenant fermé votre première session de PdV."
 
+#: ../../point_of_sale/overview/start.rst:133
+msgid ""
+"To connect the PoS to hardware with an Odoo IoT Box, please see the section "
+":doc:`../../../iot/connect` and :doc:`../../../iot/pos`"
+msgstr ""
+
 #: ../../point_of_sale/restaurant.rst:3
 msgid "Advanced Restaurant Features"
 msgstr "Caractéristiques avancées du restaurant"
@@ -2181,9 +1052,9 @@ msgid ""
 "is useful if the bill is still subject to evolve and is thus not the "
 "definitive ticket."
 msgstr ""
-"Utilisez la fonction * Impression de factures * pour imprimer la facture "
-"avant le paiement. Ceci est utile si la facture est encore sujette à "
-"évolution et n'est donc pas le ticket définitif."
+"Utilisez la fonction *Impression de factures* pour imprimer la facture avant"
+" le paiement. Ceci est utile si la facture est encore sujette à évolution et"
+" n'est donc pas le ticket définitif."
 
 #: ../../point_of_sale/restaurant/bill_printing.rst:10
 msgid "Configure Bill Printing"
@@ -2194,7 +1065,7 @@ msgid ""
 "To activate *Bill Printing*, go to :menuselection:`Point of Sale --> "
 "Configuration --> Point of sale` and select your PoS interface."
 msgstr ""
-"Pour activer *Impression de factures*, allez à :menuselection: `Point de "
+"Pour activer *Impression de factures*, allez à :menuselection:`Point de "
 "Vente --> Configuration --> Point de Vente` et sélectionnez votre interface "
 "PdV."
 
@@ -2202,8 +1073,8 @@ msgstr ""
 msgid ""
 "Under the Bills & Receipts category, you will find *Bill Printing* option."
 msgstr ""
-"Sous la catégorie Factures & Reçus, vous trouverez l'option * Impression de "
-"factures *."
+"Sous la catégorie Factures & Reçus, vous trouverez l'option *Impression de "
+"factures*."
 
 #: ../../point_of_sale/restaurant/bill_printing.rst:22
 msgid "Split a Bill"
@@ -2246,7 +1117,7 @@ msgstr ""
 
 #: ../../point_of_sale/restaurant/kitchen_printing.rst:16
 msgid ""
-"Under the PosBox / Hardware Proxy category, you will find *Order Printers*."
+"Under the IoT Box / Hardware Proxy category, you will find *Order Printers*."
 msgstr ""
 
 #: ../../point_of_sale/restaurant/kitchen_printing.rst:19
@@ -2258,8 +1129,8 @@ msgid ""
 "In your configuration menu you will now have a *Order Printers* option where"
 " you can add the printer."
 msgstr ""
-"Dans votre menu de configuration, vous aurez maintenant une option * "
-"Imprimantes de Commandes* où vous pouvez ajouter l'imprimante."
+"Dans votre menu de configuration, vous aurez maintenant une option "
+"*Imprimantes de Commandes* où vous pouvez ajouter l'imprimante."
 
 #: ../../point_of_sale/restaurant/kitchen_printing.rst:28
 msgid "Print a kitchen/bar order"
@@ -2275,7 +1146,7 @@ msgstr "Imprimer la commande dans la cuisine /le bar"
 
 #: ../../point_of_sale/restaurant/kitchen_printing.rst:38
 msgid "On your PoS interface, you now have a *Order* button."
-msgstr "Sur votre interface PdV, vous avez maintenant un bouton * Commande *."
+msgstr "Sur votre interface PdV, vous avez maintenant un bouton *Commande*."
 
 #: ../../point_of_sale/restaurant/kitchen_printing.rst:43
 msgid ""
@@ -2305,7 +1176,7 @@ msgid ""
 "When you are registering any order, you can use the *+* button to add a new "
 "order."
 msgstr ""
-"Lorsque vous enregistrez une commande, vous pouvez utiliser le bouton * + * "
+"Lorsque vous enregistrez une commande, vous pouvez utiliser le bouton *+* "
 "afin d'en ajouter une nouvelle."
 
 #: ../../point_of_sale/restaurant/multi_orders.rst:14
@@ -2320,7 +1191,7 @@ msgstr ""
 msgid ""
 "By using the *-* button, you can remove the order you are currently on."
 msgstr ""
-"En utilisant le bouton * - *, vous pouvez supprimer la commande en cours."
+"En utilisant le bouton *-*, vous pouvez supprimer la commande en cours."
 
 #: ../../point_of_sale/restaurant/setup.rst:3
 msgid "Setup PoS Restaurant/Bar"
@@ -2339,13 +1210,13 @@ msgid ""
 "To activate the *Bar/Restaurant* features, go to :menuselection:`Point of "
 "Sale --> Configuration --> Point of sale` and select your PoS interface."
 msgstr ""
-"Pour activer les fonctionnalités *Bar / Restaurant*, allez à :menuselection:"
-" `Point de Vente --> Configuration --> Point de Vente` et sélectionnez votre"
-" interface PdV."
+"Pour activer les fonctionnalités *Bar / Restaurant*, allez à "
+":menuselection:`Point de Vente --> Configuration --> Point de Vente` et "
+"sélectionnez votre interface PdV."
 
 #: ../../point_of_sale/restaurant/setup.rst:15
 msgid "Select *Is a Bar/Restaurant*"
-msgstr "Sélectionnez * Est un bar / restaurant *"
+msgstr "Sélectionnez *Est un bar / restaurant*"
 
 #: ../../point_of_sale/restaurant/setup.rst:20
 msgid ""
@@ -2376,7 +1247,7 @@ msgid ""
 "Sales --> Configuration --> Point of sale` and select your PoS interface."
 msgstr ""
 "Pour activer la fonctionnalité *Partage d'addition*, accédez à "
-":menuselection: `Point de Vente -> Configuration -> Point de Vente` et "
+":menuselection:`Point de Vente -> Configuration -> Point de Vente` et "
 "sélectionnez votre interface PdV."
 
 #: ../../point_of_sale/restaurant/split.rst:16
@@ -2393,8 +1264,7 @@ msgstr "Partager l'addition"
 
 #: ../../point_of_sale/restaurant/split.rst:25
 msgid "In your PoS interface, you now have a *Split* button."
-msgstr ""
-"Dans votre interface PdV, vous avez maintenant un bouton * Partager *."
+msgstr "Dans votre interface PdV, vous avez maintenant un bouton *Partager*."
 
 #: ../../point_of_sale/restaurant/split.rst:30
 msgid ""
@@ -2428,8 +1298,8 @@ msgid ""
 "When you select *Table management* you can manage your floors by clicking on"
 " *Floors*"
 msgstr ""
-"Lorsque vous sélectionnez * Gestion des tables *, vous pouvez gérer vos "
-"étages en cliquant sur * Étages *"
+"Lorsque vous sélectionnez *Gestion des tables*, vous pouvez gérer vos étages"
+" en cliquant sur *Étages*"
 
 #: ../../point_of_sale/restaurant/table.rst:18
 msgid "Add tables"
@@ -2508,7 +1378,7 @@ msgid ""
 "To activate the *Tips* feature, go to :menuselection:`Point of Sale --> "
 "Configuration --> Point of sale` and select your PoS."
 msgstr ""
-"Pour activer la fonctionnalité *Pourboires*, allez à :menuselection: `Point "
+"Pour activer la fonctionnalité *Pourboires*, allez à :menuselection:`Point "
 "de vente --> Configuration --> Point de vente` et sélectionnez votre PdV."
 
 #: ../../point_of_sale/restaurant/tips.rst:14
@@ -2516,9 +1386,9 @@ msgid ""
 "Under the Bills & Receipts category, you will find *Tips*. Select it and "
 "create a *Tip Product* such as *Tips* in this case."
 msgstr ""
-"Sous la catégorie Factures & Reçus, vous trouverez * Pourboires *. "
-"Sélectionnez-le et créez un * Produit nommé Pourboires * tel que * "
-"Pourboires* dans le cas présent."
+"Sous la catégorie Factures & Reçus, vous trouverez *Pourboires*. "
+"Sélectionnez-le et créez un *Produit de pourboires* tel que *Pourboires* "
+"dans le cas présent."
 
 #: ../../point_of_sale/restaurant/tips.rst:21
 msgid "Add Tips to the bill"
@@ -2595,9 +1465,9 @@ msgid ""
 "To activate the *Cash Control* feature, go to :menuselection:`Point of Sales"
 " --> Configuration --> Point of sale` and select your PoS interface."
 msgstr ""
-"Pour activer la fonction *Contrôle de la Caisse*, accédez à :menuselection: "
-"`Point de vente --> Configuration --> Point de vente` et sélectionnez votre "
-"interface PdV."
+"Pour activer la fonction *Contrôle de la Caisse*, accédez à "
+":menuselection:`Point de vente --> Configuration --> Point de vente` et "
+"sélectionnez votre interface PdV."
 
 #: ../../point_of_sale/shop/cash_control.rst:16
 msgid "Under the payments category, you will find the cash control setting."
@@ -2615,11 +1485,9 @@ msgstr ""
 
 #: ../../point_of_sale/shop/cash_control.rst:24
 msgid ""
-"When clicking on *->Opening/Closing Values* you will be able to create those"
+"When clicking on **Opening/Closing Values** you will be able to create those"
 " values."
 msgstr ""
-"En cliquant sur * -> Valeurs d'ouverture / fermeture * vous serez capable de"
-" créer ces valeurs."
 
 #: ../../point_of_sale/shop/cash_control.rst:31
 msgid "Start a session"
@@ -2631,7 +1499,7 @@ msgid ""
 "Balance*"
 msgstr ""
 "Vous avez maintenant ajouté un nouveau bouton visible lorsque vous ouvrez "
-"une session, * Définir le solde d'ouverture *"
+"une session, *Définir le solde d'ouverture*"
 
 #: ../../point_of_sale/shop/cash_control.rst:42
 msgid ""
@@ -2667,10 +1535,10 @@ msgid ""
 "this session, you now have a zero-sum difference and the same closing "
 "balance as your opening balance. You cashbox is ready for the next session."
 msgstr ""
-"Si vous utilisez l'option * Sortir de l'argent * pour prendre vos "
-"transactions pour cette session, vous avez maintenant une différence à somme"
-" nulle et le même solde de clôture que votre solde d'ouverture. Votre caisse"
-" est prête pour la prochaine session."
+"Si vous utilisez l'option *Sortir de l'argent* pour prendre vos transactions"
+" pour cette session, vous avez maintenant une différence à somme nulle et le"
+" même solde de clôture que votre solde d'ouverture. Votre caisse est prête "
+"pour la prochaine session."
 
 #: ../../point_of_sale/shop/invoice.rst:3
 msgid "Invoice from the PoS interface"
@@ -2694,17 +1562,16 @@ msgid ""
 "Go to :menuselection:`Point of Sale --> Configuration --> Point of Sale` and"
 " select your Point of Sale:"
 msgstr ""
-"Allez à :menuselection: `Point de vente --> Configuration --> Point de "
-"vente` et sélectionnez votre point de vente:"
+"Allez à :menuselection:`Point de vente --> Configuration --> Point de vente`"
+" et sélectionnez votre point de vente:"
 
 #: ../../point_of_sale/shop/invoice.rst:17
 msgid ""
 "Under the *Bills & Receipts* you will see the invoicing option, tick it. "
 "Don't forget to choose in which journal the invoices should be created."
 msgstr ""
-"Sous les * Factures & Reçus * vous verrez l'option de facturation, cochez-"
-"la. N'oubliez pas de choisir dans quel journal les factures doivent être "
-"créées."
+"Sous les *Factures & Reçus* vous verrez l'option de facturation, cochez-la. "
+"N'oubliez pas de choisir dans quel journal les factures doivent être créées."
 
 #: ../../point_of_sale/shop/invoice.rst:25
 msgid "Select a customer"
@@ -2758,10 +1625,10 @@ msgid ""
 " have been invoiced. When clicking on a order you can then access the "
 "invoice."
 msgstr ""
-"Une fois sorti de l'interface PoS (:menuselection: `Fermer --> Confirmer` "
+"Une fois sorti de l'interface PdV (:menuselection:`Fermer --> Confirmer` "
 "dans le coin supérieur droit) vous trouverez toutes vos commandes dans: "
-"menuselection:` Point de vente --> Commandes --> Commandes` et sous l'onglet"
-" statut vous verrez ceux qui ont été facturés. Lorsque vous cliquez sur une "
+"menuselection:`Point de vente --> Commandes --> Commandes` et sous l'onglet "
+"statut vous verrez ceux qui ont été facturés. Lorsque vous cliquez sur une "
 "commande, vous pouvez accéder à la facture."
 
 #: ../../point_of_sale/shop/refund.rst:3
@@ -2776,7 +1643,7 @@ msgid ""
 msgstr ""
 "Avoir une politique de retour réfléchie est la clé pour attirer et fidéliser"
 " vos clients. Faciliter l'acceptation et le remboursement de ces retours est"
-" donc également un aspect clé de votre interface * Point de Vente *."
+" donc également un aspect clé de votre interface *Point de Vente*."
 
 #: ../../point_of_sale/shop/refund.rst:10
 msgid ""
@@ -2784,10 +1651,10 @@ msgid ""
 "to return, use the +/- button and enter the quantity they need to return. If"
 " they need to return multiple products, repeat the process."
 msgstr ""
-"Depuis votre interface * Point de Vente *, sélectionnez le produit que votre"
-" client souhaite renvoyer, utilisez le bouton +/- et entrez la quantité "
-"qu'il doit retourner. S'ils ont besoin de retourner plusieurs produits, "
-"répétez le processus."
+"Depuis votre interface *Point de Vente*, sélectionnez le produit que votre "
+"client souhaite renvoyer, utilisez le bouton +/- et entrez la quantité qu'il"
+" doit retourner. S'ils ont besoin de retourner plusieurs produits, répétez "
+"le processus."
 
 #: ../../point_of_sale/shop/refund.rst:17
 msgid ""
@@ -2817,9 +1684,9 @@ msgid ""
 "To activate the *Pricelists* feature, go to :menuselection:`Point of Sales "
 "--> Configuration --> Point of sale` and select your PoS interface."
 msgstr ""
-"Pour activer la fonction *Liste de Prix*, accédez à :menuselection: `Point "
-"de vente --> Configuration --> Point de vente` et sélectionnez votre "
-"interface PoS."
+"Pour activer la fonction *Liste de Prix*, accédez à :menuselection:`Point de"
+" vente --> Configuration --> Point de vente` et sélectionnez votre interface"
+" PoS."
 
 #: ../../point_of_sale/shop/seasonal_discount.rst:18
 msgid ""
@@ -2829,7 +1696,7 @@ msgid ""
 msgstr ""
 "Choisissez les listes de prix que vous souhaitez mettre à disposition dans "
 "ce Point de Vente et définissez la liste de prix par défaut. Vous pouvez "
-"accéder à tous vos Listes de Prix en cliquant sur * Liste de prix *."
+"accéder à toutes vos Listes de Prix en cliquant sur *Liste de prix*."
 
 #: ../../point_of_sale/shop/seasonal_discount.rst:23
 msgid "Create a pricelist"
@@ -2865,5 +1732,5 @@ msgid ""
 "You now have a new button above the *Customer* one, use it to instantly "
 "select the right pricelist."
 msgstr ""
-"Vous avez maintenant un nouveau bouton au-dessus de celui nommé * Client *, "
+"Vous avez maintenant un nouveau bouton au-dessus de celui nommé *Client*, "
 "utilisez-le pour sélectionner instantanément la bonne liste de prix."
diff --git a/locale/fr/LC_MESSAGES/practical.po b/locale/fr/LC_MESSAGES/practical.po
index 93dfd504c..3db4e5625 100644
--- a/locale/fr/LC_MESSAGES/practical.po
+++ b/locale/fr/LC_MESSAGES/practical.po
@@ -1,14 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2015-TODAY, Odoo S.A.
-# This file is distributed under the same license as the Odoo Business package.
+# This file is distributed under the same license as the Odoo package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 10.0\n"
+"Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-07 09:30+0200\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n"
 "MIME-Version: 1.0\n"
diff --git a/locale/fr/LC_MESSAGES/project.po b/locale/fr/LC_MESSAGES/project.po
index 600e29def..635ca4c73 100644
--- a/locale/fr/LC_MESSAGES/project.po
+++ b/locale/fr/LC_MESSAGES/project.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-26 12:01+0200\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Frédéric LIETART <stuff@tifred.fr>, 2017\n"
+"Last-Translator: Mensanh Dodji Anani LAWSON <omolowo73@gmail.com>, 2018\n"
 "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -131,7 +131,7 @@ msgstr ""
 
 #: ../../project/advanced/feedback.rst:79
 msgid "Reporting"
-msgstr "Rapport"
+msgstr "Analyse"
 
 #: ../../project/advanced/feedback.rst:81
 msgid ""
@@ -164,10 +164,6 @@ msgid ""
 " end of the website."
 msgstr ""
 
-#: ../../project/advanced/feedback.rst:111
-msgid ":doc:`claim_issue`"
-msgstr ""
-
 #: ../../project/advanced/so_to_task.rst:3
 msgid "How to create tasks from sales orders?"
 msgstr ""
diff --git a/locale/fr/LC_MESSAGES/purchase.po b/locale/fr/LC_MESSAGES/purchase.po
index 1bec6ed94..4df7bb694 100644
--- a/locale/fr/LC_MESSAGES/purchase.po
+++ b/locale/fr/LC_MESSAGES/purchase.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2015-TODAY, Odoo S.A.
-# This file is distributed under the same license as the Odoo Business package.
+# This file is distributed under the same license as the Odoo package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 10.0\n"
+"Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-22 15:27+0100\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Fabrice Henrion <fhe@odoo.com>, 2017\n"
+"Last-Translator: Jérôme Tanché <jerome.tanche@ouest-dsi.fr>, 2018\n"
 "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,436 +22,6 @@ msgstr ""
 msgid "Purchase"
 msgstr "Achats"
 
-#: ../../purchase/overview.rst:3
-#: ../../purchase/replenishment/flows/dropshipping.rst:6
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:6
-#: ../../purchase/replenishment/flows/warning_triggering.rst:6
-#: ../../purchase/replenishment/multicompany/setup.rst:6
-msgid "Overview"
-msgstr "Vue d'ensemble"
-
-#: ../../purchase/overview/process.rst:3
-msgid "Process Overview"
-msgstr "Vue d'ensemble des processus"
-
-#: ../../purchase/overview/process/difference.rst:3
-msgid "Request for Quotation, Purchase Tender or Purchase Order?"
-msgstr "Demande de prix, appel d'offre ou commande d'achat?"
-
-#: ../../purchase/overview/process/difference.rst:5
-msgid ""
-"Although they are intimately related, Requests for Quotation, Purchase "
-"Tenders and Purchase Orders are not the same."
-msgstr ""
-"Bien qu'ils soient intimement liés, les demandes de prix, appels d'offres et"
-" commandes d'achats ne sont pas la même chose."
-
-#: ../../purchase/overview/process/difference.rst:8
-msgid ""
-"A **Request for Quotation** (RfQ) is used when you plan to purchase some "
-"products and you would like to receive a quote for those products. In Odoo, "
-"the Request for Quotation is used to send your list of desired products to "
-"your supplier. Once your supplier has answered your request, you can choose "
-"to go ahead with the offer and purchase or to turn down the offer."
-msgstr ""
-"Une **demande de prix** (DP) est utilisée quand vous envisagez l'achat de "
-"certains articles, et vous souhaitez obtenir une offre pour ces articles. "
-"Dans Odoo, les demandes de prix sont utilisées quand vous envoyez la liste "
-"des articles que vous désirez à votre fournisseur. Une fois que votre "
-"fournisseur a donné sa réponse, vous pouvez choisir de confirmer l'offre, ou"
-" de la refuser."
-
-#: ../../purchase/overview/process/difference.rst:15
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:5
-msgid ""
-"A **Purchase Tender** (PT), also known as Call for Bids, is used to drive "
-"competition between several suppliers in order to get the best offer for a "
-"list of products. In comparison to the RfQ, a Purchase Tender is sent to "
-"multiple suppliers, stating each are competing with one another, and that "
-"the best offer will win. The main interest is that it usually leads to "
-"better offers."
-msgstr ""
-"Un **appel d'offre** (AO) est utilisé pour mener la compétition entre "
-"plusieurs fournisseurs dans le but d'obtenir la meilleur offre pour une "
-"liste d'articles. En comparaison avec la DP, un appel d'offre est envoyé à "
-"plusieurs fournisseurs, annonçant qu'ils sont en compétition l'un avec "
-"l'autre, et que la meilleur offre l'emportera. L'intérêt principal est que "
-"cela mène généralement à de meilleurs offres."
-
-#: ../../purchase/overview/process/difference.rst:22
-msgid ""
-"The **Purchase Order** (PO) is the actual order that you place to the "
-"supplier that you chose, either through a RfQ, a Purchase Tender, or simply "
-"when you already know which supplier to order from."
-msgstr ""
-"La **commande d'achats** (CA) est la commande effective que vous offrez au "
-"fournisseur que vous avez choisi, soit par une DP, un AO, ou simplement "
-"lorsque vous savez déjà à quel fournisseur commander."
-
-#: ../../purchase/overview/process/difference.rst:27
-msgid "When to use?"
-msgstr "Quand l'utiliser ?"
-
-#: ../../purchase/overview/process/difference.rst:29
-msgid ""
-"A **RfQ** is interesting when you have never purchased the products with "
-"that supplier before and therefore don't know their price. It is also useful"
-" if you want to challenge your suppliers once you have a well-established "
-"relationship with them. You can also use it to assess the cost of a project "
-"and see if it makes it feasible."
-msgstr ""
-"Une **DP** est intéressante lorsque vous n'avez jamais acheté l'article avec"
-" ce fournisseur et ne connaissez donc pas ses prix. C'est aussi utile si "
-"vous souhaitez défier vos fournisseurs lorsque vous avez une relation bien "
-"établie avec eux. Vous pouvez également l'utiliser pour évaluer les coûts "
-"d'un projet et voir si cela le rend possible."
-
-#: ../../purchase/overview/process/difference.rst:35
-msgid ""
-"A **Purchase Tender** is used for public offers that require an open "
-"offering from several suppliers. It is also useful when you need to make a "
-"one-off order for a product and you would like to get the best offer, no "
-"matter which supplier it is. It may be used when your supplier has not been "
-"up to your standards and you would like to either push them to deliver a "
-"better service, or find a replacement in their competitors."
-msgstr ""
-"Un **AO** est employé pour les demandes publiques qui requièrent une offre "
-"publique de plusieurs fournisseurs. C'est aussi utile lorsque vous désirez "
-"faire une commande unique d'article et souhaitez obtenir le meilleur prix, "
-"peu importe le fournisseur. Il peut être aussi utilisé lorsque votre "
-"fournisseur ne correspond plus à vos standards, et vous souhaitez soit le "
-"pousser à offrir un meilleur service, soit à trouver un remplaçant parmi ses"
-" compétiteurs."
-
-#: ../../purchase/overview/process/difference.rst:43
-msgid "When not to use?"
-msgstr "Quand ne pas l'utiliser?"
-
-#: ../../purchase/overview/process/difference.rst:45
-msgid ""
-"**RfQ**\\ s become unnecessary once you have established your favorite "
-"supplier for each item, and will only increase the delay in the delivery of "
-"your items. In that case, the process will be simpler by starting straight "
-"from a Purchase Order."
-msgstr ""
-"Les **DP**s deviennent inutiles lorsque vous avez établi votre fournisseur "
-"préféré pour chaque objet, et ne fait que prolonger la livraison de vos "
-"objets. Dans ce cas, le processus sera simplifié en commençant directement "
-"depuis une PO."
-
-#: ../../purchase/overview/process/difference.rst:50
-msgid ""
-"**Purchase Tenders** are a long and tedious process that will likely take "
-"more than several weeks in the best cases. If you need a quick delivery, "
-"this is not the way to go. Also, if you have a well-established relationship"
-" with one supplier, think twice before you initiate a PT with them as it "
-"might tear the relationship and finally lead to less interesting deals."
-msgstr ""
-"Les **appels d'offres** sont des processus long et complexes qui vont "
-"probablement prendre plusieurs semaines dans les meilleurs cas. Si vous avez"
-" besoin d'une livraison rapide, ce n'est pas la meilleure façon de procéder."
-" De plus, si vous possédez une relation bien établie avec un fournisseur, "
-"pensez-y à deux fois avant d'initier un AO avec eux puisque cela risque de "
-"fragiliser votre relation et de vous mener à des offres moins intéressantes."
-
-#: ../../purchase/overview/process/difference.rst:58
-#: ../../purchase/replenishment/flows/compute_date.rst:139
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:39
-msgid "Example"
-msgstr "Exemple"
-
-#: ../../purchase/overview/process/difference.rst:60
-msgid ""
-"My company builds wooden furniture. For the new series of table we are "
-"designing, we need some screws, metal frames and rubber protections."
-msgstr ""
-"Ma société construit des meubles en bois. Pour la nouvelle collection de "
-"tables que nous concevons, nous avons besoin de quelques vis, des cadres en "
-"métal et des protections en caoutchouc."
-
-#: ../../purchase/overview/process/difference.rst:63
-msgid ""
-"I create a Request for Quotation in Odoo with those products to my usual "
-"supplier, and send it by email. He answers back with an offer. However, I am"
-" not convinced by the offer, and I want to see if anyone can give a better "
-"one."
-msgstr ""
-"Je crée une demande de prix à mon fournisseur habituel dans Odoo avec ces "
-"produits, et je lui l'envoie par email. Il me répond avec une offre. "
-"Cependant, je ne suis pas satisfait par l'offre, et je veux vérifier si "
-"quelqu'un peut en proposer une meilleure."
-
-#: ../../purchase/overview/process/difference.rst:68
-msgid ""
-"I decide to push competition a bit and set up a Purchase Tender, that Odoo "
-"will send to a list of suppliers I specified. Out of the 8 offers I receive,"
-" one gets my attention and I decide to go ahead with that one."
-msgstr ""
-"Je décide de faire jouer la concurrence, alors je crée un Appel d'Offre, "
-"qu'Odoo enverra à une liste de fournisseurs que je choisis. Parmi les 8 "
-"offres que je reçois, une retient mon attention et je décide de continuer "
-"avec elle."
-
-#: ../../purchase/overview/process/difference.rst:72
-msgid ""
-"I confirm the order to the supplier by creating a Purchase Order from the "
-"PT, and Odoo automatically asks delivery of the items to the supplier."
-msgstr ""
-"Je confirme la commande au fournisseur en créant une commande d'achat depuis"
-" l'appel d'offre, et Odoo demande automatiquement au fournisseur la "
-"livraison des objets."
-
-#: ../../purchase/overview/process/difference.rst:77
-#: ../../purchase/purchases/master/suppliers.rst:16
-#: ../../purchase/purchases/master/uom.rst:22
-#: ../../purchase/purchases/rfq/3_way_matching.rst:18
-#: ../../purchase/purchases/rfq/analyze.rst:24
-#: ../../purchase/purchases/rfq/bills.rst:31
-#: ../../purchase/purchases/rfq/create.rst:16
-#: ../../purchase/purchases/rfq/reception.rst:14
-#: ../../purchase/purchases/tender/partial_purchase.rst:14
-#: ../../purchase/replenishment/flows/dropshipping.rst:13
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:58
-#: ../../purchase/replenishment/flows/warning_triggering.rst:21
-msgid "Configuration"
-msgstr "Configuration"
-
-#: ../../purchase/overview/process/difference.rst:79
-msgid ""
-"If you want to know how to create a **Purchase Order**, read the "
-"documentation on :doc:`from_po_to_invoice`"
-msgstr ""
-"Si vous voulez savoir comment créer un **Bon de Commande**, lisez la "
-"documentation :doc:'from_po_to_invoice'"
-
-#: ../../purchase/overview/process/difference.rst:82
-msgid ""
-"If you want to know how to create a **RfQ**, read the documentation on "
-":doc:`../../purchases/rfq/create`"
-msgstr ""
-"Si vous voulez savoir comment créer une **DP**, lisez la documentation "
-":doc:`../../purchases/rfq/create`"
-
-#: ../../purchase/overview/process/difference.rst:85
-msgid ""
-"If you want to know how to create a **Purchase Tender**, read the "
-"documentation on :doc:`../../purchases/tender/manage_multiple_offers`"
-msgstr ""
-"Si vous voulez savoir comment créer un **Appel d'Offre**, lisez la "
-"documentation :doc:`../../purchases/tender/manage_multiple_offers`"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:3
-msgid "From purchase order to invoice and receptions"
-msgstr "Du bon de commande à la facture et à la réception"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:5
-msgid ""
-"For most of your everyday purchases, chances are you already know where to "
-"purchase and at what price. For these cases, a simple Purchase Order (PO) "
-"will allow you to handle the whole process."
-msgstr ""
-"Pour la plupart de vos achats quotidiens, vous savez généralement déjà où "
-"acheter et à quel prix. Dans ce cas, une simple Bon de Commande (BC) vous "
-"permettra de gérer l'ensemble du processus."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:9
-msgid ""
-"In Odoo, a purchase order can be created as is, but can also be the result "
-"of a Request for Quotation or of a Purchase Tender. Therefore, every "
-"purchase made in Odoo has a PO."
-msgstr ""
-"Dans Odoo, le bon de commande peut être créé telle quelle, mais aussi  être "
-"le résultat d'une demande de prix ou d'un appel d'offre. Par conséquent, "
-"tout achat effectué dans Odoo a un BC."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:13
-msgid ""
-"The PO will generate an invoice, and depending on the contract with your "
-"supplier, you will be required to pay the invoice before or after delivery."
-msgstr ""
-"Le BC génèrera la facture, et selon l'accord avec votre fournisseur, vous "
-"devrez payer la facture avant ou après la livraison."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:18
-msgid "Install the Purchase Management application"
-msgstr "Installez l'application de Gestion des achats"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:20
-msgid ""
-"From the **Apps** application, search and install the **Purchase "
-"Management** application."
-msgstr ""
-"Depuis le module **Applications**, recherchez et installez l'application de "
-"**Gestion des achats**."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:27
-msgid "Creating a Purchase Order"
-msgstr "Création d'un Bon de Commande"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:29
-msgid ""
-"In the **Purchases** app, open the **Purchase** menu and click on **Purchase"
-" Orders**."
-msgstr ""
-"Dans l'application **Achats**, ouvrez le menu **Achat** et cliquez sur **Bon"
-" de Commande**"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:32
-msgid "In the **Purchase Orders** window, click on **Create**."
-msgstr "Dans la fenêtre **Bon de Commande**, cliquez sur **Créer**."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:37
-msgid ""
-"From the new window, insert the **Vendor** and type in the **Order Date**."
-msgstr ""
-"Dans la nouvelle fenêtre, saisissez le **Fournisseur** et la **Date de "
-"commande**. "
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:40
-msgid "In the **Products** section, click on **Add an item**."
-msgstr "Dans la section **Articles**, cliquez sur **Ajouter un élément**."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:45
-msgid "Select your product from the list and add a description if necessary."
-msgstr ""
-"Sélectionnez votre produit dans la liste et ajoutez si besoin une "
-"description."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:47
-msgid "The **Scheduled Date** menu corresponds to the expected delivery date."
-msgstr "Le menu **Date prévue** correspond à la date de livraison attendue."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:49
-msgid ""
-"Type in the quantity which you wish to purchase, then click on **Save** and "
-"on **Confirm Order**."
-msgstr ""
-"Saisissez la quantité que vous souhaitez acheter, cliquez sur "
-"**Sauvegarder**, puis sur **Confirmer la Commande**."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:53
-msgid ""
-"If you wish to go through the complete flow and create a **Request for "
-"Quotation** for this order, refer to the document on "
-":doc:`../../purchases/rfq/create`"
-msgstr ""
-"Si vous souhaitez passer par le cycle complet et créer une **Demande de "
-"Prix** pour cette commande, reportez-vous au document "
-":doc:`../../purchases/rfq/create`create`"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:57
-msgid ""
-"As you can see, the status of the PO has switched to ``Purchase Order``."
-msgstr ""
-"Comme vous pouvez le voir, l'état du bon de commande est passé à **Commande "
-"Fournisseur**."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:63
-msgid "Registering invoice, payments and receiving products"
-msgstr "Enregistrement de facture, paiement et réception des produits"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:65
-msgid ""
-"Depending on the contract you have with your supplier, you can either pay "
-"for the purchase upon delivery of the goods, or get the goods delivered "
-"after payment."
-msgstr ""
-"Selon les accords que vous avez avec votre fournisseur, vous pouvez soit "
-"payer une fois que les marchandises sont livrées, soit n'obtenir les "
-"marchandises qu'après le paiement effectué."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:70
-msgid "Payment upon or after reception"
-msgstr "Paiement à la réception ou après"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:72
-msgid "Still from your purchase order, click on **Receive Products**."
-msgstr ""
-"Toujours à partir du bon de commande, cliquez sur **Réception par article**."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:74
-msgid ""
-"In the next page, check that the number of products received corresponds to "
-"the number ordered, then manually enter the delivered quantity and click on "
-"**Validate**."
-msgstr ""
-"A la page suivante, vérifiez que la quantité de produits reçus correspond à "
-"la quantité commandée, puis saisissez manuellement la quantité livrée et "
-"cliquez sur **Valider**."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:81
-msgid ""
-"Go back to the PO. In the PO, a **Shipment** and an **Invoice** button have "
-"appeared."
-msgstr ""
-"Revenez au BC. Sur le BC, deux boutons **Expédition** et **Facture** sont "
-"apparus."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:87
-msgid ""
-"Click on the **Invoices** button, then click on **Validate**. The invoice is"
-" now registered in the system. Click on **Register Payment**, insert the "
-"detail of the payment, and click on **Validate**."
-msgstr ""
-"Cliquez sur le  bouton  **Facture**, cliquez ensuite sur **Valider**. La "
-"facture est maintenant enregistrée dans le système. Cliquez sur "
-"**Enregistrer le paiement**, saisissez les détails du paiement et cliquez "
-"sur **Valider**."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:94
-#: ../../purchase/overview/process/from_po_to_invoice.rst:124
-msgid ""
-"Your products are now ready for picking and storage, and the invoice is "
-"marked as paid."
-msgstr ""
-"Vos produits sont maintenant prêts pour l'entreposage, et la facture est "
-"marquée comme payée."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:98
-msgid "Upfront payment"
-msgstr "Paiement à l'avance"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:100
-msgid ""
-"From the **Purchase Order** page, open the **Invoices** tab, then click on "
-"**Create**."
-msgstr ""
-"Depuis le **Bon de Commande**, cliquez sur le bouton **Factures** et cliquez"
-" sur **Créer**."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:103
-msgid ""
-"In the next page, click on **Validate**. The invoice is now registered in "
-"the system. Click on **Register Payment**, insert the detail of the payment,"
-" and click on **Validate**."
-msgstr ""
-"Sur la page suivante, cliquez sur **Valider**. La facture est maintenant "
-"enregistrée dans le système . Cliquez sur **Enregistrer un paiement**, "
-"saisissez les détails du paiement, et cliquez sur **Valider**"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:110
-msgid ""
-"Go back to the PO. In the PO, a **Shipment** tab and an **Invoice** tab have"
-" appeared."
-msgstr ""
-"Revenez sur le BC. Dans le BC, les boutons **Expédition** et **Factures** "
-"sont apparus."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:116
-msgid ""
-"Click on **Receive Products**, then in the new page, click on **Validate**."
-msgstr ""
-"Cliquez sur **Réception par articles**, puis sur la nouvelle page, cliquez "
-"sur **Valider**."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:121
-msgid ""
-"A window will appear, asking if you wish to process every item at once. "
-"Click on **Apply**."
-msgstr ""
-"Une fenêtre devrait apparaître, vous demandant si vous désirez traiter tous "
-"les articles en une fois. Cliquez sur **Appliquer**."
-
 #: ../../purchase/purchases.rst:3
 msgid "Purchases"
 msgstr "Achats"
@@ -461,465 +31,92 @@ msgid "Master Data"
 msgstr "Données de base"
 
 #: ../../purchase/purchases/master/import.rst:3
-msgid "How to import supplier pricelists?"
-msgstr "Comment importer les listes de prix des fournisseurs ?"
+msgid "Import vendors pricelists"
+msgstr ""
 
-#: ../../purchase/purchases/master/import.rst:6
-msgid "Introduction"
-msgstr "Introduction"
-
-#: ../../purchase/purchases/master/import.rst:8
+#: ../../purchase/purchases/master/import.rst:5
 msgid ""
-"Big companies use to import supplier pricelists day to day. Indeed, prices "
-"are always changing and you need to get price up to date to deal with a high"
-" number of products."
+"It is key for companies to be able to import vendors pricelists to stay up "
+"to date on products pricing."
 msgstr ""
-"Les grandes entreprises ont l'habitude d'importer des listes de prix de "
-"fournisseurs quotidiennement. En effet, les prix changent constamment et "
-"vous devez les tenir à jour même avec un grand nombre d'articles."
 
-#: ../../purchase/purchases/master/import.rst:12
+#: ../../purchase/purchases/master/import.rst:9
+#: ../../purchase/purchases/master/uom.rst:22
+#: ../../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/create.rst:13
+#: ../../purchase/purchases/rfq/lock_orders.rst:9
+#: ../../purchase/purchases/rfq/reception.rst:14
+#: ../../purchase/purchases/rfq/warning.rst:14
+#: ../../purchase/purchases/tender/blanket_orders.rst:10
+#: ../../purchase/purchases/tender/call_for_tender.rst:9
+#: ../../purchase/replenishment/flows/dropshipping.rst:13
+msgid "Configuration"
+msgstr "Configuration"
+
+#: ../../purchase/purchases/master/import.rst:11
 msgid ""
-"To manage supplier prices on product form, read this document "
-"(:doc:`suppliers`). Here we will show you how to import customer prices."
+"For this feature to work, go to :menuselection:`Purchases --> Configuration "
+"--> Settings` and tick the box in front of \"Vendor Pricelists\"."
 msgstr ""
-"Pour gérer les prix des fournisseurs sur la fiche article, lisez ce document"
-" (:doc:`suppliers`). Ici, nous vous montrons comment importer les prix des "
-"fournisseurs."
 
-#: ../../purchase/purchases/master/import.rst:16
-msgid "Required configuration"
-msgstr "Configuration requise"
-
-#: ../../purchase/purchases/master/import.rst:18
-msgid "In purchase settings, you have 2 options:"
-msgstr "Dans la configuration des Achats, vous disposez de 2 options :"
-
-#: ../../purchase/purchases/master/import.rst:20
-msgid "Manage vendor price on the product form"
-msgstr "Gérez les prix fournisseurs sur la fiche produit"
-
-#: ../../purchase/purchases/master/import.rst:22
-msgid "Allow using and importing vendor pricelists"
+#: ../../purchase/purchases/master/import.rst:15
+msgid "Don't forget to save your settings in the top left corner."
 msgstr ""
-"Autorise l'utilisation et l'importation des listes de prix de fournisseurs"
 
-#: ../../purchase/purchases/master/import.rst:24
-msgid "Here we are selecting: **Allow using and importing vendor pricelists**"
+#: ../../purchase/purchases/master/import.rst:21
+msgid "Import a pricelist"
 msgstr ""
-"Ici, nous avons sélectionné : **Autorise l'utilisation et l'importation des "
-"liste de prix de fournisseurs**"
 
-#: ../../purchase/purchases/master/import.rst:30
-msgid "Import vendor pricelists"
-msgstr "Importez les listes de prix de fournisseurs"
+#: ../../purchase/purchases/master/import.rst:23
+msgid "To import go to :menuselection:`Purchase --> Vendor Pricelists`"
+msgstr ""
 
-#: ../../purchase/purchases/master/import.rst:32
+#: ../../purchase/purchases/master/import.rst:25
 msgid ""
-"There are 2 scenarios: import the vendor pricelist for the first time, or "
-"update an existing vendor pricelist. In both scenarios, we assume your "
-"product list and vendor list is updated and you want to import the price "
-"list of vendors for a given product."
+"Load your file, then you can check if everything is correct before clicking "
+"import."
 msgstr ""
-"Il y a 2 scénarios : importer la liste de prix du fournisseur pour la "
-"première fois, ou mettre à jour une liste de prix existante. Dans les 2 cas,"
-" nous partons du principe que vos listes d'articles et de fournisseurs sont "
-"à jour, et que vous désirez importer les listes de prix de fournisseurs pour"
-" un article donné."
 
-#: ../../purchase/purchases/master/import.rst:40
+#: ../../purchase/purchases/master/import.rst:28
+msgid "See below a template of the columns used."
+msgstr ""
+
+#: ../../purchase/purchases/master/import.rst:33
 msgid ""
-"To import a list from a document, the best pratice is to export first to get"
-" an example of data formating and a proper header to reimport."
+"`Template download "
+"<https://docs.google.com/spreadsheets/d/1N8c_eejLV_8NhYMGCfZau_oGCnRkUIT9nwdX7n0shhY/edit#gid=964193981>`__"
 msgstr ""
-"Pour importer une liste depuis un document, une bonne méthode est de d'abord"
-" réaliser un export, afin d'obtenir un exemple de format des données et "
-"d'entêtes, pour ensuite ré-importer."
-
-#: ../../purchase/purchases/master/import.rst:50
-msgid "Import the list for the first time"
-msgstr "Importez la liste pour la première fois."
-
-#: ../../purchase/purchases/master/import.rst:53
-msgid "Prepare the document"
-msgstr "Préparez le document"
-
-#: ../../purchase/purchases/master/import.rst:55
-msgid ""
-"In :menuselection:`Purchase --> Purchase --> Supplier Pricelists`, export a "
-"template of document to get import/export compatible and get the right "
-"format to import in mass. Create manually a data and export it "
-"(:menuselection:`select --> Action --> Export`)"
-msgstr ""
-"Dans l'application Achats, dans :menuselection:`Achat --> Liste de prix du "
-"fournisseur`, exportez un modèle de document, de type compatible avec "
-"l'import, afin d'obtenir le bon format pour réaliser ensuite l'import. Créez"
-" manuellement des données et exportez-les (:menuselection:`Action --> "
-"Exporter`)"
-
-#: ../../purchase/purchases/master/import.rst:63
-msgid "Here is the list of fields you can import:"
-msgstr "Voici la liste des champs que vous pouvez importer :"
-
-#: ../../purchase/purchases/master/import.rst:66
-msgid "**Header of the document to import (csv, xls)**"
-msgstr "**En-tête du document à importer (csv, xls)**"
-
-#: ../../purchase/purchases/master/import.rst:66
-msgid "**Meaning and how to get it**"
-msgstr "**Signification et comment l'obtenir**"
-
-#: ../../purchase/purchases/master/import.rst:66
-msgid "**Example**"
-msgstr "**Exemple**"
-
-#: ../../purchase/purchases/master/import.rst:68
-msgid "name_id"
-msgstr "nom_ID"
-
-#: ../../purchase/purchases/master/import.rst:68
-msgid "Vendor ID -> export supplier list to get it"
-msgstr "Identifiant vendeur->liste des fournisseurs exportateur à récolter "
-
-#: ../../purchase/purchases/master/import.rst:68
-msgid "\\_\\_export\\_\\_.res\\_partner\\_12"
-msgstr "\\_\\_export\\_\\_.res\\_partenaire\\_12"
-
-#: ../../purchase/purchases/master/import.rst:70
-msgid "product_code"
-msgstr "Code_produit "
-
-#: ../../purchase/purchases/master/import.rst:70
-msgid "Vendor product Code -> free text"
-msgstr "Code produit vendeur -> commentaire "
-
-#: ../../purchase/purchases/master/import.rst:70
-msgid "569874"
-msgstr "569874"
-
-#: ../../purchase/purchases/master/import.rst:72
-msgid "price"
-msgstr "prix"
-
-#: ../../purchase/purchases/master/import.rst:72
-msgid "Vendor Price -> free text"
-msgstr "Prix du Vendeur -> texte gratuit"
-
-#: ../../purchase/purchases/master/import.rst:72
-msgid "1500"
-msgstr "1500"
-
-#: ../../purchase/purchases/master/import.rst:74
-msgid "product_tmpl_id.id"
-msgstr "produit_format_id.id"
-
-#: ../../purchase/purchases/master/import.rst:74
-msgid "Product Template ID -> export you product list to get it"
-msgstr "Identifiant vendeur->liste des fournisseurs exportateur à récolter "
-
-#: ../../purchase/purchases/master/import.rst:74
-msgid "\\_\\_export\\_\\_.product_template_13"
-msgstr "\\_\\_export\\_\\_.product_template_13"
-
-#: ../../purchase/purchases/master/import.rst:76
-msgid "currency_id.id"
-msgstr "currency_id.id"
-
-#: ../../purchase/purchases/master/import.rst:76
-msgid "Currency -> to get it export the currency list"
-msgstr "Devise -> pour l'obtenir exportez la liste des devises"
-
-#: ../../purchase/purchases/master/import.rst:78
-msgid "date_end"
-msgstr "date_fin"
-
-#: ../../purchase/purchases/master/import.rst:78
-msgid "End date of the price validity"
-msgstr "Date de fin de la validité du prix"
-
-#: ../../purchase/purchases/master/import.rst:78
-msgid "2015-10-22"
-msgstr "2015-10-22"
-
-#: ../../purchase/purchases/master/import.rst:80
-msgid "min_qty"
-msgstr "min_qty"
-
-#: ../../purchase/purchases/master/import.rst:80
-msgid "Minimal quantity to purchase from this vendor"
-msgstr "Quantité minimale à acheter chez ce fournisseur"
-
-#: ../../purchase/purchases/master/import.rst:80
-msgid "2"
-msgstr "2"
-
-#: ../../purchase/purchases/master/import.rst:82
-msgid "product_id.id"
-msgstr "product_id.id"
-
-#: ../../purchase/purchases/master/import.rst:82
-msgid "Product Variante name -> export your variant list to get it"
-msgstr ""
-"Nom de la variante d'article -> exportez la liste des variantes pour "
-"l'obtenir"
-
-#: ../../purchase/purchases/master/import.rst:82
-msgid "\\_\\_export\\_\\_.product\\_13"
-msgstr "\\_\\_export\\_\\_.product\\_13"
-
-#: ../../purchase/purchases/master/import.rst:84
-msgid "date_start"
-msgstr "date_start"
-
-#: ../../purchase/purchases/master/import.rst:84
-msgid "Start date of price validity"
-msgstr "Date de validité de début du prix"
-
-#: ../../purchase/purchases/master/import.rst:84
-msgid "2015-12-31"
-msgstr "2015-12-31"
-
-#: ../../purchase/purchases/master/import.rst:87
-msgid "You obtain a document which can be imported, fill in your vendor pices"
-msgstr ""
-"Vous obtenez un document qui peut être importé, remplissez-le avec les prix "
-"de vos fournisseurs"
-
-#: ../../purchase/purchases/master/import.rst:92
-msgid ""
-"Import this document in Odoo. Click on **Import** in the list view and "
-"upload your document. You can validate and check error. Once the system "
-"tells you everything is ok, you can import the list."
-msgstr ""
-"Importez ce document dans Odoo. Cliquez sur **Importer** depuis la vue liste"
-" et téléchargez votre document. Vous pouvez le valider et vérifier les "
-"erreurs. Une fois que le système vous indique que tout est correct, vous "
-"pouvez importer la liste."
-
-#: ../../purchase/purchases/master/import.rst:102
-msgid ""
-"After the import, the **Vendors** section in **Inventory** tab of the "
-"product form is filled in."
-msgstr ""
-"Après l'import, la section **Fournisseurs** dans l'onglet **Inventaire** de "
-"la fiche article est remplie."
-
-#: ../../purchase/purchases/master/import.rst:106
-msgid "Update the vendor pricelist"
-msgstr "Mettez à jour la liste de prix du vendeur"
-
-#: ../../purchase/purchases/master/import.rst:108
-msgid ""
-"When the pricelist of your suppliers change, it is necessary to update "
-"existing prices."
-msgstr ""
-"Quand les listes de prix de vos fournisseur changent, il faut mettre à jour "
-"les prix existants"
-
-#: ../../purchase/purchases/master/import.rst:111
-msgid ""
-"Follow the procedure of the first scenario in order to export existing data "
-"from :menuselection:`Purchases --> Purchase --> Vendor Pricelist`. Select "
-"everything, and export from the **Action** menu."
-msgstr ""
-"Suivez la procédure du premier scénario pour exporter la liste de données "
-"existante par :menuselection:`Achat --> Liste de prix du fournisseur`. "
-"Sélectionnez tout, et exportez par le menu **Action**."
-
-#: ../../purchase/purchases/master/import.rst:115
-msgid ""
-"Change price, end date, add a line, change a supplier, ... and then reimport"
-" in Odoo. Thanks to the ID, the list will be updated. Either the id is "
-"recognized and the line is updated or the ID is not known by Odoo and it "
-"will create a new pricelist line."
-msgstr ""
-"Changez le prix, la date de fin, ajoutez une ligne, changez un "
-"fournisseur,... et réimportez le fichier dans Odoo. Grâce à l'ID, la liste "
-"sera mise à jour. Soit l'ID est reconnu et la ligne est mise à jour, soit "
-"l'ID n'est pas connu par Odoo et une nouvelle ligne de liste de prix sera "
-"créée."
-
-#: ../../purchase/purchases/master/import.rst:120
-msgid ""
-"After the import, the **Vendors** section in **Inventory** tab of the "
-"product form is updated."
-msgstr ""
-"Après l'import, la section **Fournisseurs** dans l'onglet  **Inventaire** de"
-" l'article est mise à jour. "
 
 #: ../../purchase/purchases/master/suppliers.rst:3
-msgid "How to set several suppliers on a product?"
-msgstr "Comment configurer plusieurs fournisseurs pour un article ?"
+msgid "Set multiple vendors on a product"
+msgstr ""
 
 #: ../../purchase/purchases/master/suppliers.rst:5
 msgid ""
-"Keeping track of your vendors can be a real burden in day-to-day business "
-"life. Prices can change and you might have several suppliers for one "
-"product. With Odoo you have the possibility to directly link vendors with "
-"the corresponding product and specify prices automatically the first time "
-"you purchase them."
+"If you find yourself with the need to buy from multiple vendors for one "
+"product, Odoo can let you directly link them with a single product."
+msgstr ""
+
+#: ../../purchase/purchases/master/suppliers.rst:9
+msgid "Add vendors in a product"
 msgstr ""
-"Faire le suivi de vos fournisseurs peut être une vraie charge dans le "
-"quotidien d'une entreprise. Les  prix peuvent changer et  vous pouvez avoir "
-"plusieurs fournisseurs pour le même article. Avec Odoo, vous avez la "
-"possibilité de relier directement les fournisseurs aux articles et "
-"configurer automatiquement les prix au premier achat ."
 
 #: ../../purchase/purchases/master/suppliers.rst:11
 msgid ""
-"We will take the following example: We need to buy ``5 t-shirts``. We found "
-"a **Vendor**; called ``Bob&Jerry's`` and we want to issue a request for "
-"quotation."
+"To use this feature, go to :menuselection:`Purchases --> Products`, then "
+"select a product."
 msgstr ""
-"Nous allons prendre l'exemple suivant : Nous avons besoin d'acheter ``5 "
-"t-shirts``. Nous avons trouvé un **Fournisseur** appelé ``Bob&Jerry's``, et "
-"nous voulons faire une demande de prix."
 
-#: ../../purchase/purchases/master/suppliers.rst:19
-msgid "Install the purchase module"
-msgstr "Installez le module d'achat"
-
-#: ../../purchase/purchases/master/suppliers.rst:21
+#: ../../purchase/purchases/master/suppliers.rst:14
 msgid ""
-"The first step to set your suppliers on your products is to install the "
-"purchase module. Go into your **App** module and install the **Purchase** "
-"module."
+"From there you can add existing vendors to your product or create a new one "
+"on the fly."
 msgstr ""
-"La première étape pour définir vos fournisseurs sur vos articles est "
-"d'installer le module Achats. Allez dans le module **Applications** et "
-"installez le module **Gestion des achats**."
 
-#: ../../purchase/purchases/master/suppliers.rst:29
-msgid ""
-"By installing the purchase module, the inventory and invoicing module will "
-"be installed as well."
-msgstr ""
-"En installant le module Gestion des achats, les modules Gestion de "
-"l'inventaire et Facturation seront aussi installés."
-
-#: ../../purchase/purchases/master/suppliers.rst:33
-msgid "Create a Vendor"
-msgstr "Créez un fournisseur"
-
-#: ../../purchase/purchases/master/suppliers.rst:35
-msgid ""
-"The second step is to create a vendor. In this case we'll create the vendor "
-"``Bob&Jerry's``. Enter the purchase module, select :menuselection:`Purchase "
-"--> Vendors` and create a new vendor."
-msgstr ""
-"La seconde étape est de créer un fournisseur. Dans cet exemple, nous allons "
-"créer le fournisseur ``Bob&Jerry's``. Dans le module Achats, sélectionnez "
-":menuselection:`Achat --> Fournisseurs` et créez un nouveau fournisseur. "
-
-#: ../../purchase/purchases/master/suppliers.rst:39
-msgid ""
-"You can choose if the contact is a company or a person, fill in basic "
-"information such as address, phone, email,..."
-msgstr ""
-"Vous pouvez sélectionner si le contact est une société ou une personne, et "
-"saisir les informations de base telles que l'adresse, le téléphone, "
-"l'email,..."
-
-#: ../../purchase/purchases/master/suppliers.rst:42
-msgid ""
-"If you did not create the contact from the purchase module you will need to "
-"go in the **Sales and Purchases** tab as well and indicate that the contact "
-"is a **Vendor** (see picture below). If the contact is created from the "
-"purchase module this box will be ticked automatically."
-msgstr ""
-"Si vous ne créez pas le contact depuis le module Achats, vous devrez aller "
-"dans l'onglet **Ventes & Achats** pour indiquer que le contact est un "
-"**Fournisseur** (voir illustration ci-dessous). Si le contact est créé "
-"depuis le module Achats, cette option sera activée automatiquement."
-
-#: ../../purchase/purchases/master/suppliers.rst:51
-msgid "Create a product"
-msgstr "Créer un article"
-
-#: ../../purchase/purchases/master/suppliers.rst:53
-msgid ""
-"Next we can create the product we want to buy. We don't know the price of "
-"the t-shirt yet because we still need to issue our **Request for "
-"Quotation**."
-msgstr ""
-"Ensuite, nous pouvons créer l'article que nous voulons acheter. Nous ne "
-"connaissons pas encore le prix du t-shirt parce que nous devons d'abord "
-"envoyer notre **Demande de Prix**."
-
-#: ../../purchase/purchases/master/suppliers.rst:57
-msgid ""
-"To create a product enter your purchase module select "
-":menuselection:`Purchase --> Products` and create a new product."
-msgstr ""
-"Pour créer un article, dans le module Achats, sélectionner "
-":menuselection:`Achat --> Articles` et créer un nouvel article."
-
-#: ../../purchase/purchases/master/suppliers.rst:60
-msgid ""
-"We will call our product ``T-shirt`` and specify that the product can be "
-"sold and purchased."
-msgstr ""
-"Nous appellerons notre article ``T-shirt`` et préciserons qu'il peut être "
-"vendu et acheté."
-
-#: ../../purchase/purchases/master/suppliers.rst:67
-msgid "Add Vendors to the product"
-msgstr "Ajoutez des fournisseurs à l'article"
-
-#: ../../purchase/purchases/master/suppliers.rst:69
-msgid ""
-"The next action is to add vendors to the product. There are two ways to "
-"handle this. If you issue a purchase order for the first time Odoo will "
-"automatically link the vendor and its price to the product. You can also add"
-" vendors manually"
-msgstr ""
-"L'action suivante consiste à ajouter des fournisseurs à l'article. Il y a "
-"deux façons de gérer cela. Si vous passez une commande pour la première fois"
-" Odoo reliera automatiquement le fournisseur et son prix à l'article. Vous "
-"pouvez également ajouter des fournisseurs manuellement."
-
-#: ../../purchase/purchases/master/suppliers.rst:75
-msgid "By issuing a first Purchase Order to new vendor"
-msgstr "En passant une première commande à un nouveau fournisseur"
-
-#: ../../purchase/purchases/master/suppliers.rst:77
-msgid ""
-"When issuing a purchase order for the first time to a vendor, he will "
-"automatically be linked to the product by Odoo. For our example let's say "
-"that we issue a first purchase order to ``Bob&Jerry's`` for ``5 t-shirts`` "
-"at ``12.35 euros / piece``."
-msgstr ""
-"En passant une commande pour la première fois à un fournisseur, ce dernier "
-"sera automatiquement relié au produit par Odoo. Dans notre exemple, disons "
-"que nous passons une première commande à ``Bob&Jerry's`` de ``5 t-shirts`` à"
-" ``12,35 euros / pièce``."
-
-#: ../../purchase/purchases/master/suppliers.rst:82
-msgid ""
-"First create your purchase order with the correct product and supplier (see "
-"picture below, or the documentation page :doc:`../rfq/create` for more "
-"information)"
-msgstr ""
-"Créez d'abord votre bon de commande avec le l'article et le fournisseur "
-"appropriés (voir illustration ci-dessous, ou la page de documentation "
-":doc:`../rfq/create` pour plus d'informations)"
-
-#: ../../purchase/purchases/master/suppliers.rst:89
-msgid ""
-"When we save and validate the purchase order the vendor will automatically "
-"be added to the product's vendors list. To check this enter the purchase "
-"module, select :menuselection:`Purchase --> Products` and select our T-shirt"
-" product. By opening the **Inventory** tab we notice that our vendor and its"
-" price has automatically been added."
-msgstr ""
-"Lorsque nous sauvegardons et validons le bon de commande, le fournisseur "
-"sera automatiquement ajouté à la liste des fournisseurs de l'article. Pour "
-"vérifier cela entrez dans le module Achats, sélectionnez "
-":menuselection:`Achat --> Articles` et sélectionnez notre l'article T-shirt."
-" En ouvrant l'onglet **Inventaire** nous constatons que le fournisseur et "
-"son tarif ont été automatiquement ajoutés."
-
-#: ../../purchase/purchases/master/suppliers.rst:98
+#: ../../purchase/purchases/master/suppliers.rst:17
 msgid ""
 "Note that every first time the product is purchased from a new vendor, Odoo "
 "will automatically link the contact and price with the product."
@@ -928,39 +125,26 @@ msgstr ""
 "d'un nouveau fournisseur, Odoo reliera automatiquement le fournisseur et le "
 "prix à l'article."
 
-#: ../../purchase/purchases/master/suppliers.rst:103
-msgid "By adding manually"
-msgstr "En l'ajoutant manuellement"
-
-#: ../../purchase/purchases/master/suppliers.rst:105
-msgid ""
-"We can of course also add vendors and vendors information manually. On the "
-"same page than previously, simply click on **Edit** and click the **Add an "
-"item** button."
+#: ../../purchase/purchases/master/suppliers.rst:24
+msgid "Add price & quantity as well as a validity period"
 msgstr ""
-"Nous pouvons bien sûr ajouter également les fournisseurs et leurs "
-"informations manuellement. Sur la même page que précédemment, cliquez "
-"simplement sur **Modifier**, et dans l'onglet Inventaire, cliquez sur le "
-"lien **Ajouter un élément**."
 
-#: ../../purchase/purchases/master/suppliers.rst:112
+#: ../../purchase/purchases/master/suppliers.rst:26
 msgid ""
-"When adding a new **Vendor** you are also able to add extra information such"
-" as the vendor product name or code, the validity of the price and the "
-"eventual minimum quantity required. These informations can be added and "
-"modified for existing vendors by simply clicking on the vendors line."
+"When you're adding a vendor to a product, you're able to add the vendor "
+"product name & code as well as set the minimal quantity, price and validity "
+"period."
+msgstr ""
+
+#: ../../purchase/purchases/master/suppliers.rst:34
+msgid ""
+"This Odoo feature also works with variants of your products, such as one "
+"t-shirt in different sizes!"
 msgstr ""
-"Lors de l'ajout d'un nouveau **Fournisseur** vous pouvez également ajouter "
-"des informations supplémentaires telles que le nom ou le code article du "
-"fournisseur, la période de validité du prix et l'éventuelle quantité "
-"minimale par commande. Ces informations peuvent être ajoutées et modifiées "
-"pour les fournisseurs existants simplement en cliquant sur la ligne du "
-"fournisseur."
 
 #: ../../purchase/purchases/master/uom.rst:3
-msgid "How to purchase in different unit of measures than sales?"
+msgid "Purchase in different unit of measures than sales"
 msgstr ""
-"Comment acheter en unités de mesure différentes de celles des ventes ?"
 
 #: ../../purchase/purchases/master/uom.rst:5
 msgid ""
@@ -1197,75 +381,65 @@ msgstr ""
 "l'article."
 
 #: ../../purchase/purchases/rfq.rst:3
-msgid "Request for Quotations"
-msgstr "Demande de Prix"
+msgid "Request for Quotation and Purchase Orders"
+msgstr ""
 
 #: ../../purchase/purchases/rfq/3_way_matching.rst:3
-msgid "How to determine if a vendor bill should be paid (3-way matching)"
+msgid "Determine when to pay a vendor bill with 3-way matching"
 msgstr ""
 
 #: ../../purchase/purchases/rfq/3_way_matching.rst:5
 msgid ""
 "In some industries, you may receive a bill from a vendor before receiving "
-"the ordered products. However, the bill should maybe not be paid until the "
-"products have actually been received."
+"the ordered products. However, you might not want to pay it until the "
+"products have been received."
 msgstr ""
 
 #: ../../purchase/purchases/rfq/3_way_matching.rst:9
 msgid ""
-"To define whether the vendor bill should be paid or not, you can use what is"
-" called the **3-way matching**. It refers to the comparison of the "
-"information appearing on the Purchase Order, the Vendor Bill and the "
-"Receipt."
+"To define whether the vendor bill should be paid or not, you can use what we"
+" call *3-way matching*. It refers to the comparaison of the information "
+"appearing on the *Purchase Order*, the *Vendor Bill* and the *Receipt*."
 msgstr ""
 
 #: ../../purchase/purchases/rfq/3_way_matching.rst:14
 msgid ""
-"The 3-way matching helps you to avoid paying incorrect or fraudulent vendor "
+"The 3-way matching helps you avoid paying incorrect or fraudulent vendor "
 "bills."
 msgstr ""
 
 #: ../../purchase/purchases/rfq/3_way_matching.rst:20
 msgid ""
-"Go in :menuselection:`Purchase --> Configuration --> Settings` and activate "
-"the 3-way matching."
+"For this feature to work, go to :menuselection:`Purchases --> Configuration "
+"--> Settings` and activate the *3-way matching* feature"
 msgstr ""
 
-#: ../../purchase/purchases/rfq/3_way_matching.rst:30
-msgid "Should I pay this vendor bill?"
+#: ../../purchase/purchases/rfq/3_way_matching.rst:27
+msgid "Should I pay the vendor bill?"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/3_way_matching.rst:29
+msgid ""
+"With the feature activated you will have a new *Should be paid* line appear "
+"on the vendor bill under the *Other info* tab."
 msgstr ""
 
 #: ../../purchase/purchases/rfq/3_way_matching.rst:32
 msgid ""
-"Once this setting has been activated, a new information appears on the "
-"vendor bill, defining whether the bill should be paid or not. There are "
-"three possible values:"
+"That way Odoo let's you easily know if you should pay the vendor bill or "
+"not."
 msgstr ""
 
-#: ../../purchase/purchases/rfq/3_way_matching.rst:36
-msgid "*Use case 1*: I have received the ordered products."
-msgstr ""
-
-#: ../../purchase/purchases/rfq/3_way_matching.rst:43
-msgid "*Use case 2*: I have not received the ordered products."
-msgstr ""
-
-#: ../../purchase/purchases/rfq/3_way_matching.rst:50
-msgid ""
-"*Use case 3*: the quantities do not match across the Purchase Order, Vendor "
-"Bill and Receipt."
-msgstr ""
-
-#: ../../purchase/purchases/rfq/3_way_matching.rst:59
+#: ../../purchase/purchases/rfq/3_way_matching.rst:39
 msgid ""
 "The status is defined automatically by Odoo. However, if you want to define "
-"this status manually, you can tick the box *Force Status* and then you will "
-"be able to set manually whether the vendor bill should be paid or not."
+"this status manually, you can tick the box Force Status and then you will be"
+" able to set manually whether the vendor bill should be paid or not."
 msgstr ""
 
 #: ../../purchase/purchases/rfq/analyze.rst:3
-msgid "How to analyze the performance of my vendors?"
-msgstr "Comment analyser les performances de mes fournisseurs ?"
+msgid "Analyze the performance of my vendors"
+msgstr ""
 
 #: ../../purchase/purchases/rfq/analyze.rst:5
 msgid ""
@@ -1310,7 +484,6 @@ msgstr ""
 "analyser, prévoir et planifier les futures commandes."
 
 #: ../../purchase/purchases/rfq/analyze.rst:27
-#: ../../purchase/purchases/tender/partial_purchase.rst:17
 msgid "Install the Purchase Management module"
 msgstr "Installez le module Gestion des achats"
 
@@ -1329,25 +502,18 @@ msgstr "Emettez quelques bons de commande"
 #: ../../purchase/purchases/rfq/analyze.rst:38
 msgid ""
 "Of course, in order to analyze your vendors' performance, you need to issue "
-"some **Request For Quotations** (RfQ) and confirm some **Purchase Orders**. "
-"If you want to know how to generate a purchase order, please read the "
-"documentation :doc:`../../overview/process/from_po_to_invoice`."
+"some **Request For Quotations** (RfQ) and confirm some **Purchase Orders**."
 msgstr ""
-"Bien sûr, afin d'analyser les performances de vos fournisseurs, vous avez "
-"besoin d'émettre quelques **Demande de Prix** (DP) et de confirmer quelques "
-"**Bons de Commande **. Si vous voulez savoir comment générer un bon de "
-"commande, lisez la documentation "
-":doc:`../../overview/process/from_po_to_invoice`."
 
-#: ../../purchase/purchases/rfq/analyze.rst:44
+#: ../../purchase/purchases/rfq/analyze.rst:43
 msgid "Analyzing your vendors"
 msgstr "Analysez vos fournisseurs"
 
-#: ../../purchase/purchases/rfq/analyze.rst:47
+#: ../../purchase/purchases/rfq/analyze.rst:46
 msgid "Generate flexible reports"
 msgstr "Générer des rapports dynamiques"
 
-#: ../../purchase/purchases/rfq/analyze.rst:49
+#: ../../purchase/purchases/rfq/analyze.rst:48
 msgid ""
 "You have access to your vendors' performances on the Reports menu. By "
 "default, the report groups all your purchase orders on a pivot table by "
@@ -1364,7 +530,7 @@ msgstr ""
 "performances actuelles. Vous pouvez ajouter un grand nombre de données "
 "supplémentaires à votre rapport en cliquant sur l'icône **Mesures**."
 
-#: ../../purchase/purchases/rfq/analyze.rst:60
+#: ../../purchase/purchases/rfq/analyze.rst:59
 msgid ""
 "By clicking on the **+** and **-** icons, you can drill up and down your "
 "report in order to change the way your information is displayed. For "
@@ -1378,7 +544,7 @@ msgstr ""
 "pour le mois en cours, vous devez cliquer sur l'icône **+** sur l'axe "
 "vertical, puis sur \"Articles\"."
 
-#: ../../purchase/purchases/rfq/analyze.rst:67
+#: ../../purchase/purchases/rfq/analyze.rst:66
 msgid ""
 "Depending on the data you want to highlight, you may need to display your "
 "reports in a more visual view. You can transform your report in just a click"
@@ -1393,7 +559,7 @@ msgstr ""
 " vues sont accessibles via les icônes entourés en rouge dans la capture "
 "d'écran ci-dessous ."
 
-#: ../../purchase/purchases/rfq/analyze.rst:77
+#: ../../purchase/purchases/rfq/analyze.rst:76
 msgid ""
 "On the contrary to the pivot table, a graph can only be computed with one "
 "dependent and one independent measure."
@@ -1401,11 +567,11 @@ msgstr ""
 "Contrairement à un tableau croisé dynamique, un graphique ne peut être "
 "calculé qu'avec une mesure dépendante et une mesure indépendante."
 
-#: ../../purchase/purchases/rfq/analyze.rst:81
+#: ../../purchase/purchases/rfq/analyze.rst:80
 msgid "Customize reports"
 msgstr "Rapports personnalisés"
 
-#: ../../purchase/purchases/rfq/analyze.rst:83
+#: ../../purchase/purchases/rfq/analyze.rst:82
 msgid ""
 "You can easily customize your purchase reports depending on your needs. To "
 "do so, use the **Advanced search view** located in the right hand side of "
@@ -1426,7 +592,7 @@ msgstr ""
 "pouvez filtrer et grouper par n'importe quel champ existant, ce qui rend "
 "votre personnalisation très flexible et puissante."
 
-#: ../../purchase/purchases/rfq/analyze.rst:97
+#: ../../purchase/purchases/rfq/analyze.rst:96
 msgid ""
 "You can save and reuse any customized filter by clicking on **Favorites** "
 "from the **Advanced search view** and then on **Save current search**. The "
@@ -1437,74 +603,52 @@ msgstr ""
 "recherche actuelle**. Le filtre sera alors accessible depuis le menu "
 "**Favoris**."
 
-#: ../../purchase/purchases/rfq/analyze.rst:103
-#: ../../purchase/purchases/rfq/create.rst:76
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:86
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:81
-#: ../../purchase/purchases/tender/partial_purchase.rst:77
-msgid ":doc:`../../overview/process/from_po_to_invoice`"
-msgstr ":doc:`../../overview/process/from_po_to_invoice`"
-
 #: ../../purchase/purchases/rfq/approvals.rst:3
-msgid "How to setup two levels of approval for purchase orders?"
+msgid "Request managers approval for expensive orders"
 msgstr ""
-"Comment configurer deux niveaux d'approbation pour les commandes d'achat ?"
 
-#: ../../purchase/purchases/rfq/approvals.rst:6
-msgid "Two level approval setup"
-msgstr "Configurez deux niveaux d'approbation"
-
-#: ../../purchase/purchases/rfq/approvals.rst:8
+#: ../../purchase/purchases/rfq/approvals.rst:5
 msgid ""
-"Double validation on purchases forces a validation when the purchased amount"
-" exceeds a certain limit."
+"In case of expensive purchases you may want a manager approval to validate "
+"the orders, Odoo let's you easily set that up."
 msgstr ""
-"La double validation sur les achats oblige à une validation hiérarchique "
-"lorsque le montant de l'achat dépasse une certaine limite."
 
 #: ../../purchase/purchases/rfq/approvals.rst:11
 msgid ""
-"Install **Purchase Management** module and then go to **General Settings** "
-"to configure the company data."
+"For this feature to work, go to :menuselection:`Purchases --> Configuration "
+"--> Settings` and activate the *Order Approval* feature. From there you can "
+"also set the minimum amount required to activate this feature."
 msgstr ""
-"Installez le module **Gestion des achats**, puis allez dans "
-":menuselection:`Configuration --> General Settings` pour **Configurer les "
-"données de la société**."
 
-#: ../../purchase/purchases/rfq/approvals.rst:17
+#: ../../purchase/purchases/rfq/approvals.rst:20
+msgid "Create a new Request for Quotation"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/approvals.rst:22
 msgid ""
-"Set here the amount limit for second approval and set approval from manager "
-"side."
+"While working on a new RfQ, if the order is made by a user and not a manager"
+" and the amount of the order is above the minimum amount you specified, a "
+"new *To Approve* status will be introduced in the process."
 msgstr ""
-"Définissez ici le montant limite pour la deuxième approbation et définissez "
-"l'approbation côté gestionnaire."
 
-#: ../../purchase/purchases/rfq/approvals.rst:21
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:47
-msgid "Process"
-msgstr "Processus"
+#: ../../purchase/purchases/rfq/approvals.rst:31
+msgid "Approve the order"
+msgstr ""
 
-#: ../../purchase/purchases/rfq/approvals.rst:23
+#: ../../purchase/purchases/rfq/approvals.rst:33
 msgid ""
-"Logged as a purchase user, create a purchase order for more than the amount "
-"set above, and confirm it. The purchase order is set in a state **To "
-"Approve**"
+"If you are a purchase manager, you can now go to the purchase order and "
+"approve the order if everything is alright with it. Giving you full control "
+"of what your users can or can't do."
 msgstr ""
-"Connecté en tant qu'acheteur, créez une commande d'achat avec un montant "
-"supérieur à celui défini ci-dessus, puis confirmez-la. Le bon de commande "
-"passe à l'état **À Approuver**"
 
-#: ../../purchase/purchases/rfq/approvals.rst:29
-msgid "The manager gets the order to approve and validates the final order."
-msgstr "Le gestionnaire reçoit la commande à approuver et la valide."
-
-#: ../../purchase/purchases/rfq/approvals.rst:34
+#: ../../purchase/purchases/rfq/approvals.rst:37
 msgid "Once approved, the purchase order follows the normal process."
 msgstr "Une fois approuvé, le bon de commande suit le processus normal."
 
 #: ../../purchase/purchases/rfq/bills.rst:3
-msgid "How to control supplier bills?"
-msgstr "Comment contrôler les factures fournisseurs ?"
+msgid "Control supplier bills"
+msgstr ""
 
 #: ../../purchase/purchases/rfq/bills.rst:5
 msgid ""
@@ -1956,8 +1100,8 @@ msgstr ""
 " de commande sélectionnés."
 
 #: ../../purchase/purchases/rfq/cancel.rst:3
-msgid "How to cancel a purchase order?"
-msgstr "Comment annuler un bon de commande ?"
+msgid "Cancel a purchase order"
+msgstr ""
 
 #: ../../purchase/purchases/rfq/cancel.rst:5
 msgid ""
@@ -2000,22 +1144,14 @@ msgstr ""
 "Demande de prix`. Confirmez votre DP pour avoir un bon de commande confirmé"
 
 #: ../../purchase/purchases/rfq/cancel.rst:25
-msgid ""
-"To learn more about the purchase order process, read the documentation page "
-":doc:`../../overview/process/from_po_to_invoice`"
-msgstr ""
-"Pour en savoir plus sur le processus de commande, lisez la page de "
-"documentation :doc:`../../overview/process/from_po_to_invoice`"
-
-#: ../../purchase/purchases/rfq/cancel.rst:30
 msgid "Cancel your Purchase Order"
 msgstr "Annulez votre commande"
 
-#: ../../purchase/purchases/rfq/cancel.rst:33
+#: ../../purchase/purchases/rfq/cancel.rst:28
 msgid "Use case 1 : you didn't receive your goods yet"
 msgstr "Cas 1 : vous n'avez pas encore reçu vos marchandises"
 
-#: ../../purchase/purchases/rfq/cancel.rst:35
+#: ../../purchase/purchases/rfq/cancel.rst:30
 msgid ""
 "If you confirmed your purchase order and did not received your goods yet, "
 "you can simply cancel the PO it by clicking the cancel button."
@@ -2024,7 +1160,7 @@ msgstr ""
 "marchandises, vous pouvez simplement annuler la commande en cliquant sur le "
 "bouton Annuler."
 
-#: ../../purchase/purchases/rfq/cancel.rst:41
+#: ../../purchase/purchases/rfq/cancel.rst:36
 msgid ""
 "Odoo will automatically cancel the outstanding shipments related to this PO "
 "and the status bar will switch from **Purchase order** to **Cancelled**."
@@ -2033,11 +1169,11 @@ msgstr ""
 "commande et la barre d'état passera de **Commande Fournisseur** à "
 "**Annulé**."
 
-#: ../../purchase/purchases/rfq/cancel.rst:48
+#: ../../purchase/purchases/rfq/cancel.rst:43
 msgid "Use case 2 : partially delivered goods"
 msgstr "Cas 2 : produits partiellement livrés"
 
-#: ../../purchase/purchases/rfq/cancel.rst:50
+#: ../../purchase/purchases/rfq/cancel.rst:45
 msgid ""
 "In this case, **2** of the **3 iPad Mini** arrived before you needed to "
 "cancel the PO."
@@ -2045,11 +1181,11 @@ msgstr ""
 "Dans ce cas, **2** des **3 iPad Mini** sont arrivés avant que vous décidiez "
 "d'annuler la commande."
 
-#: ../../purchase/purchases/rfq/cancel.rst:54
+#: ../../purchase/purchases/rfq/cancel.rst:49
 msgid "Register good received and cancel backorder"
 msgstr "Enregistrez la marchandise reçue et annuler les reliquats"
 
-#: ../../purchase/purchases/rfq/cancel.rst:56
+#: ../../purchase/purchases/rfq/cancel.rst:51
 msgid ""
 "The first thing to do will be to register the goods received and to cancel "
 "the arrival of the **third iPad Mini** that is still supposed to be shipped."
@@ -2062,11 +1198,11 @@ msgstr ""
 "et, sur la ligne de commande **iPad Mini**, modifiez manuellement les "
 "quantités reçues dans la colonne **Fait**."
 
-#: ../../purchase/purchases/rfq/cancel.rst:66
+#: ../../purchase/purchases/rfq/cancel.rst:61
 msgid "To learn more, see :doc:`reception`"
 msgstr "Pour en savoir plus, voir :doc:`reception`"
 
-#: ../../purchase/purchases/rfq/cancel.rst:68
+#: ../../purchase/purchases/rfq/cancel.rst:63
 msgid ""
 "When clicking on **Validate**, Odoo will warn you that you have processed "
 "less products than the initial demand (2 instead of 3 in our case) and will "
@@ -2076,7 +1212,7 @@ msgstr ""
 "traité moins de produits que la demande initiale (2 au lieu de 3 dans notre "
 "cas) et vous demandera la permission de créer un reliquat."
 
-#: ../../purchase/purchases/rfq/cancel.rst:75
+#: ../../purchase/purchases/rfq/cancel.rst:70
 msgid ""
 "Click on **No backorder** to cancel the supply of the remaining product. You"
 " will notice than the quantity to receive has been changed accordingly and, "
@@ -2086,11 +1222,11 @@ msgstr ""
 "restant. Notez que la quantité à recevoir a été modifiée en conséquence, et "
 "le statut de livraison est donc passé à **Fait**."
 
-#: ../../purchase/purchases/rfq/cancel.rst:83
+#: ../../purchase/purchases/rfq/cancel.rst:78
 msgid "Create reverse transfer"
 msgstr "Créez une rétrocession"
 
-#: ../../purchase/purchases/rfq/cancel.rst:85
+#: ../../purchase/purchases/rfq/cancel.rst:80
 msgid ""
 "Now, you need to return the iPad Minis that you have received to your vendor"
 " location. To do so, click on the **Reverse** button from the same document."
@@ -2102,7 +1238,7 @@ msgstr ""
 "même document. Une fenêtre de retour apparaîtra. Saisissez la quantité à "
 "renvoyer et l'emplacement correspondant, et cliquez sur **Retourner**."
 
-#: ../../purchase/purchases/rfq/cancel.rst:93
+#: ../../purchase/purchases/rfq/cancel.rst:88
 msgid ""
 "Process the return shipment and control that the stock move is from your "
 "stock to your vendor location."
@@ -2110,7 +1246,7 @@ msgstr ""
 "Procédez à l'expédition de retour et contrôlez que le mouvement de stock va "
 "de votre entrepôt à celui de votre fournisseur."
 
-#: ../../purchase/purchases/rfq/cancel.rst:99
+#: ../../purchase/purchases/rfq/cancel.rst:94
 msgid ""
 "When the reverse transfer is done, the status of your purchase order will be"
 " automatically set to done, meaning that your PO has been completely "
@@ -2120,18 +1256,18 @@ msgstr ""
 "mis à Terminé, ce qui signifie que votre commande a été complètement "
 "annulée."
 
-#: ../../purchase/purchases/rfq/cancel.rst:104
-#: ../../purchase/purchases/rfq/reception.rst:120
+#: ../../purchase/purchases/rfq/cancel.rst:99
+#: ../../purchase/purchases/rfq/reception.rst:116
 msgid ":doc:`bills`"
 msgstr ":doc:`bills`"
 
-#: ../../purchase/purchases/rfq/cancel.rst:105
+#: ../../purchase/purchases/rfq/cancel.rst:100
 msgid ":doc:`reception`"
 msgstr ":doc:`reception`"
 
 #: ../../purchase/purchases/rfq/create.rst:3
-msgid "How to create a Request for Quotation?"
-msgstr "Comment créer une Demande de Prix ?"
+msgid "Create a Request for Quotation"
+msgstr ""
 
 #: ../../purchase/purchases/rfq/create.rst:5
 msgid ""
@@ -2148,19 +1284,11 @@ msgstr ""
 "fournisseur a donné sa réponse, vous pouvez choisir de confirmer l'offre, ou"
 " de la refuser."
 
-#: ../../purchase/purchases/rfq/create.rst:12
-msgid ""
-"For more information on best uses, please read the chapter "
-":doc:`../../overview/process/difference`"
-msgstr ""
-"Pour plus d'informations sur les meilleures utilisations, lisez le chapitre "
-":doc:`../../overview/process/difference`"
-
-#: ../../purchase/purchases/rfq/create.rst:19
+#: ../../purchase/purchases/rfq/create.rst:16
 msgid "Creating a Request for Quotation"
 msgstr "Créez une Demande de Prix"
 
-#: ../../purchase/purchases/rfq/create.rst:21
+#: ../../purchase/purchases/rfq/create.rst:18
 msgid ""
 "In the Purchases module, open :menuselection:`Purchase --> Requests for "
 "Quotation` and click on **Create**."
@@ -2168,7 +1296,7 @@ msgstr ""
 "Dans le module Achats, ouvrez :menuselection:`Achat --> Demande de prix` et "
 "cliquez sur **Créer**."
 
-#: ../../purchase/purchases/rfq/create.rst:27
+#: ../../purchase/purchases/rfq/create.rst:24
 msgid ""
 "Select your supplier in the **Vendor** menu, or create it on-the-fly by "
 "clicking on **Create and Edit**. In the **Order Date** field, select the "
@@ -2179,98 +1307,11 @@ msgstr ""
 "commande**, sélectionnez la date à laquelle vous souhaitez passer la "
 "commande."
 
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid "Shipment"
-msgstr "Expédition"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid "Incoming Shipments"
-msgstr "Réceptions"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid "Vendor Reference"
-msgstr "Référence fournisseur"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid ""
-"Reference of the sales order or bid sent by the vendor. It's used to do the "
-"matching when you receive the products as this reference is usually written "
-"on the delivery order sent by your vendor."
-msgstr ""
-"Référence du bon de commande ou offre envoyée par le fournisseur. Utilisé "
-"principalement pour faire la correspondance lors de la réception des "
-"articles, puisque cette référence est généralement écrite sur le bon de "
-"livraison envoyé par votre fournisseur."
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid "Order Date"
-msgstr "Date de la commande"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid ""
-"Depicts the date where the Quotation should be validated and converted into "
-"a purchase order."
-msgstr ""
-"Représente la date où le devis devrait être validé et le converti en bon "
-"d'achat."
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid "Source Document"
-msgstr "Document d'origine"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid ""
-"Reference of the document that generated this purchase order request (e.g. a"
-" sales order)"
-msgstr ""
-"Référence du document qui a généré cette demande de bon de commande (p. ex. "
-"un ordre de vente)"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid "Deliver To"
-msgstr "Livrer à"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid "This will determine operation type of incoming shipment"
-msgstr "Cela déterminera le type d'opération des réceptions"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid "Drop Ship Address"
-msgstr "Adresse de livraison directe"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid ""
-"Put an address if you want to deliver directly from the vendor to the "
-"customer. Otherwise, keep empty to deliver to your own company."
-msgstr ""
-"Ajoutez une adresse si vous voulez livrer directement du fournisseur au "
-"client. Sinon, laissez vide pour vous faire livrer à votre société."
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid "Destination Location Type"
-msgstr "Type d'emplacement de destination"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid "Technical field used to display the Drop Ship Address"
-msgstr "Champ technique utilisé pour afficher l'adresse de livraison directe."
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid "Incoterm"
-msgstr "Incoterm"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid ""
-"International Commercial Terms are a series of predefined commercial terms "
-"used in international transactions."
-msgstr ""
-"Les Incoterms sont une série de termes commerciaux prédéfinie utilisés dans "
-"les transactions internationales."
-
-#: ../../purchase/purchases/rfq/create.rst:35
+#: ../../purchase/purchases/rfq/create.rst:32
 msgid "View *Request for Quotation* in our Online Demonstration"
 msgstr "Voir *Demande de Prix* dans notre Démonstration en Ligne"
 
-#: ../../purchase/purchases/rfq/create.rst:37
+#: ../../purchase/purchases/rfq/create.rst:34
 msgid ""
 "In **Products**, click on Add an item. Select the product you wish to order "
 "in the **Product** menu. Specify the **Quantity** by inserting the number "
@@ -2291,7 +1332,7 @@ msgstr ""
 "Prix** ou ** Envoyer la Demande de Prix par Courriel** (assurez-vous qu'une "
 "adresse email est définie pour ce fournisseur ou entrez-en une nouvelle)."
 
-#: ../../purchase/purchases/rfq/create.rst:51
+#: ../../purchase/purchases/rfq/create.rst:48
 msgid ""
 "After having clicked on **Send**, you will notice that the RFQ's status will"
 " switch from **Draft** to **RFQ Sent**."
@@ -2299,7 +1340,7 @@ msgstr ""
 "Après avoir cliqué sur **Envoyer...**, vous constaterez que le statut de la "
 "Demande de Prix est passé de **Brouillon** à **Demande de Prix Envoyée**."
 
-#: ../../purchase/purchases/rfq/create.rst:57
+#: ../../purchase/purchases/rfq/create.rst:54
 msgid ""
 "Once your supplier has replied with an offer, update the RfQ by clicking on "
 "**Edit** to fit the quotation (prices, taxes, expected delivery lead time, "
@@ -2310,7 +1351,7 @@ msgstr ""
 "l'offre (prix, taxes, délai de livraison prévu, conditions de paiement, "
 "etc.), puis cliquez sur **Enregistrer** pour émettre un Bon de Commande."
 
-#: ../../purchase/purchases/rfq/create.rst:62
+#: ../../purchase/purchases/rfq/create.rst:59
 msgid ""
 "To proceed with the order, click on **Confirm Order** to send the order to "
 "the supplier. The RfQ's status will switch to **Purchase Order**."
@@ -2319,7 +1360,7 @@ msgstr ""
 "la commande au fournisseur. Le statut de la Demande de Prix passera à "
 "**Commande Fournisseur**."
 
-#: ../../purchase/purchases/rfq/create.rst:68
+#: ../../purchase/purchases/rfq/create.rst:65
 msgid ""
 "The status of the RfQ will change to PURCHASE ORDER. Tabs in the upper right"
 " corner of the order will show 1 Shipment and 0 Invoice."
@@ -2328,9 +1369,100 @@ msgstr ""
 "boutons dans le coin supérieur droit de la commande afficheront 1 expédition"
 " et 0 facture."
 
+#: ../../purchase/purchases/rfq/dropshipping.rst:3
+msgid "Dropship products"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/dropshipping.rst:5
+msgid ""
+"Dropshipping is a method in which the vendor does not keep products in stock"
+" but instead transfers the products directly from the supplier to the "
+"customer."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/dropshipping.rst:10
+msgid ""
+"You need the *Sales*, *Inventory* and *Purchases* modules for this feature "
+"to work."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/dropshipping.rst:14
+msgid "Activate the dropshipping feature"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/dropshipping.rst:16
+msgid ""
+"Go to :menuselection:`Purchases --> Configuration --> Settings` and select "
+"*Dropshipping*."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/dropshipping.rst:22
+msgid ""
+"A new route *Dropshipping* has been created. You can go on a product and "
+"tick the dropshipping route. You also need to define to which vendor you "
+"will buy the product. Now, each time this product will be sold, it will be "
+"drop shipped."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/dropshipping.rst:30
+msgid ""
+"If you don't always dropship that product, you can go to "
+":menuselection:`Sales --> Configuration --> Settings` and tick the box in "
+"front of *Order-Specific Routes*."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/dropshipping.rst:37
+msgid ""
+"When you create a quotation or sales order, you can now decide, order line "
+"per order line, which products should be drop shipped by selecting the "
+"dropship route on the SO line."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/dropshipping.rst:45
+msgid "Drop ship a product"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/dropshipping.rst:47
+msgid ""
+"Once a sale order with products to dropship is confirmed, a request for "
+"quotation is generated by Odoo to buy the product to the vendor. If you "
+"confirm that request for quotation into a purchase order, it will create a "
+"transfer from your vendor directly to your customer. The products doesn't go"
+" through your own stock."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/lock_orders.rst:3
+msgid "Lock a purchase order"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/lock_orders.rst:5
+msgid ""
+"Once an order is confirmed, you can lock it preventing any further editing."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/lock_orders.rst:11
+msgid ""
+"For this feature to work, go to :menuselection:`Purchases --> Configuration "
+"--> Settings` and activate the *Lock Confirmed Orders* feature"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/lock_orders.rst:19
+msgid "Lock an order"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/lock_orders.rst:21
+msgid ""
+"While working on a purchase order, when you confirm it, you can then lock "
+"the order preventing any further modification on the document."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/lock_orders.rst:28
+msgid "You can unlock the document if you need to make additional changes"
+msgstr ""
+
 #: ../../purchase/purchases/rfq/reception.rst:3
-msgid "How to control product received? (entirely & partially)"
-msgstr "Comment contrôler les produits reçus ? (en totalité ou en partie)"
+msgid "Control product received (entirely & partially)"
+msgstr ""
 
 #: ../../purchase/purchases/rfq/reception.rst:5
 msgid ""
@@ -2438,19 +1570,10 @@ msgstr ""
 "probablement la référence fournisseur)"
 
 #: ../../purchase/purchases/rfq/reception.rst:67
-msgid ""
-"See the documentation page :doc:`../../overview/process/from_po_to_invoice` "
-"for a full overview of the purchase process."
-msgstr ""
-"Consultez la page  de documentation "
-":doc:`../../overview/process/from_po_to_invoice` pour une vue d'ensemble "
-"complète du processus d'achat."
-
-#: ../../purchase/purchases/rfq/reception.rst:71
 msgid "Receive Products"
 msgstr "Réception par article"
 
-#: ../../purchase/purchases/rfq/reception.rst:73
+#: ../../purchase/purchases/rfq/reception.rst:69
 msgid ""
 "If you purchased physical goods (stockable or consumable products), you can "
 "receive the products from the **Inventory** application. From the "
@@ -2462,7 +1585,7 @@ msgstr ""
 "tableau de bord de l'**Inventaire** , vous devriez voir un bouton **X à "
 "recevoir**, dans la boîte de réception de l'entrepôt concerné."
 
-#: ../../purchase/purchases/rfq/reception.rst:81
+#: ../../purchase/purchases/rfq/reception.rst:77
 msgid ""
 "Click on this button and you access a list of all awaiting orders for this "
 "warehouse."
@@ -2470,7 +1593,7 @@ msgstr ""
 "Cliquez sur ce bouton et vous accédez à une liste de toutes les commandes en"
 " attente pour cet entrepôt."
 
-#: ../../purchase/purchases/rfq/reception.rst:87
+#: ../../purchase/purchases/rfq/reception.rst:83
 msgid ""
 "If you have a lot of awaiting orders, you can use the filter bar to search "
 "on the **Vendor** (also called **Partner** in Odoo), the product or the "
@@ -2485,7 +1608,7 @@ msgstr ""
 "correspond au bordereau de livraison et traiter toutes les lignes qu'il "
 "contient."
 
-#: ../../purchase/purchases/rfq/reception.rst:96
+#: ../../purchase/purchases/rfq/reception.rst:92
 msgid ""
 "You may validate the whole document at once by clicking on the **Validate** "
 "button or you can control all products, one by one, by manually change the "
@@ -2498,7 +1621,7 @@ msgstr ""
 "été effectivement reçu). Quand une ligne est verte, cela signifie que la "
 "quantité reçue correspond à ce qui était attendu."
 
-#: ../../purchase/purchases/rfq/reception.rst:103
+#: ../../purchase/purchases/rfq/reception.rst:99
 msgid ""
 "If you work with lots or serial numbers, you can not set the processed "
 "quantity, but you have to provide all the lots or serial numbers to record "
@@ -2508,7 +1631,7 @@ msgstr ""
 " pouvez pas saisir la quantité traitée, mais vous devez fournir tous les "
 "numéros de lots ou numéros de série pour enregistrer la quantité reçue."
 
-#: ../../purchase/purchases/rfq/reception.rst:107
+#: ../../purchase/purchases/rfq/reception.rst:103
 msgid ""
 "When you validate the reception, if you have received less products than the"
 " initial demand, Odoo will ask youthe permission to create a backorder."
@@ -2517,7 +1640,7 @@ msgstr ""
 "la demande initiale, Odoo vous demandera l'autorisation de créer un "
 "reliquat."
 
-#: ../../purchase/purchases/rfq/reception.rst:114
+#: ../../purchase/purchases/rfq/reception.rst:110
 msgid ""
 "If you plan to receive the remaining product in the future, select **Create "
 "Backorder**. Odoo will create a new documents for the awaiting products. If "
@@ -2528,376 +1651,222 @@ msgstr ""
 "en attente. Si vous choisissez **Pas de reliquat**, la commande est "
 "considérée comme complète."
 
-#: ../../purchase/purchases/rfq/reception.rst:121
+#: ../../purchase/purchases/rfq/reception.rst:117
 msgid ":doc:`cancel`"
 msgstr ":doc:`cancel`"
 
+#: ../../purchase/purchases/rfq/warning.rst:3
+msgid "Raise warnings on purchase orders"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/warning.rst:5
+msgid ""
+"The *Warnings* feature allows you to raise warnings or blocking messages on "
+"purchase orders based on a vendor or a product."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/warning.rst:8
+msgid ""
+"For example, if you often have a problem with a vendor, you might want to "
+"raise a warning when purchasing from that vendor. If a product is about to "
+"be discontinued, you may want to raise a blocking message on the purchase "
+"order."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/warning.rst:16
+msgid ""
+"For this feature to work, go to :menuselection:`Purchases --> Configuration "
+"--> Settings` and activate the *Warnings* feature."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/warning.rst:24
+msgid "Add a warning on a vendor"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/warning.rst:26
+msgid ""
+"When you activate the feature, you get a new option under the *Internal "
+"Notes* tab on vendors. You can decide to write a simple warning or a "
+"blocking message."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/warning.rst:34
+msgid "Add a warning on a product"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/warning.rst:36
+msgid ""
+"When you activate the feature, you get a new option under the *Purchase* tab"
+" on the product page where you can add a warning or a blocking message."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/warning.rst:44
+msgid "Trying to buy with warnings or blocking messages"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/warning.rst:46
+msgid ""
+"If you try to validate a *Purchase Order* from a vendor or with a product "
+"with a warning, a message will be raised. You can ignore it by clicking ok."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/warning.rst:53
+msgid "However, if it is a blocking message, you can not ignore it."
+msgstr ""
+
 #: ../../purchase/purchases/tender.rst:3
-msgid "Purchase Tenders"
-msgstr "Appels d'offre"
+msgid "Purchase Agreements"
+msgstr "Conventions d'achat"
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:3
-msgid "How to manage Blanket Orders"
+#: ../../purchase/purchases/tender/blanket_orders.rst:3
+msgid "Manage Blanket Orders"
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:5
+#: ../../purchase/purchases/tender/blanket_orders.rst:5
 msgid ""
-"A **Blanket Order** is a contract between you (the customer) and your "
-"supplier. It is used to negotiate a discounted price. The supplier is "
-"benefited by the economies of scale inherent in a large order. You are "
-"benefited by being allowed to take multiple smaller deliveries over a period"
-" of time, at a lower price, without paying for the large order immediately. "
-"Each small periodic delivery is called a release or call-off."
+"A Blanket Order is a purchase order which a customer places with its "
+"supplier to allow multiple delivery dates over a period of time, often "
+"negotiated to take advantage of predetermined pricing."
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:12
+#: ../../purchase/purchases/tender/blanket_orders.rst:12
 msgid ""
-"As the blanket order is a contract, it will have some prearranged "
-"conditions. These usually include:"
+"For this feature to work, go to :menuselection:`Purchases --> Configuration "
+"--> Settings` and activate the *Purchase Agreements* feature"
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:15
-msgid "Total quantity of each product to be delivered"
+#: ../../purchase/purchases/tender/blanket_orders.rst:20
+msgid "Start a Blanket Order"
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:17
+#: ../../purchase/purchases/tender/blanket_orders.rst:22
+#: ../../purchase/purchases/tender/call_for_tender.rst:21
 msgid ""
-"Completion deadline, by which you must take delivery of the total quantity"
-msgstr ""
-
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:19
-msgid "Unit price for each product"
-msgstr ""
-
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:21
-msgid "Delivery lead time in days for each release"
-msgstr ""
-
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:24
-msgid "Activate the Purchase Agreements"
-msgstr ""
-
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:26
-msgid ""
-"The Blanket Order function is provided by the Purchase Agreements feature. "
-"By default, the Purchase Agreements is not activated. To be able to use "
-"blanket orders, you must first activate the option."
-msgstr ""
-
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:30
-msgid ""
-"In the Purchases module, open the Configuration menu and click on Settings. "
-"In the **Orders** section, locate the **Purchase Agreements** and tick the "
-"box, then click on **Save**."
-msgstr ""
-
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:38
-msgid "Create a Blanket Order"
-msgstr ""
-
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:40
-msgid ""
-"To create a new blanket order, open :menuselection:`Purchase --> Purchase "
+"To use this feature go to :menuselection:`Purchases --> Purchase "
 "Agreements`."
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:45
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:39
+#: ../../purchase/purchases/tender/blanket_orders.rst:24
 msgid ""
-"In the Purchase Agreements window, click on **Create**. A new Purchase "
-"Agreement window opens."
+"Once you are creating the purchase agreement, access the *Agreement Type* "
+"drop down menu and select *Blanket Order*."
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:48
-msgid "In the **Agreement Type** field, choose Blanket Order."
-msgstr ""
-
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:50
-msgid "Choose the **Vendor** with whom you will make the agreement."
-msgstr ""
-
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:52
-msgid "Set the **Agreement Deadline** as per the conditions of the agreement."
-msgstr ""
-
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:54
-msgid "Set the **Ordering Date** to the starting date of the contract."
-msgstr ""
-
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:56
+#: ../../purchase/purchases/tender/blanket_orders.rst:30
 msgid ""
-"Leave the **Delivery Date** empty because we will have different delivery "
-"dates with each release."
+"You can then create your new blanket order, select your vendor, the "
+"product(s), agreement deadline, ordering date and delivery date."
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:59
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:52
+#: ../../purchase/purchases/tender/blanket_orders.rst:33
 msgid ""
-"In the **Products** section, click on **Add an item**. Select products in "
-"the Product list, then insert **Quantity**. You can add as many products as "
-"you wish."
+"When you are satisfied with your purchase agreement, confirm it. Its status "
+"will change from*Draft* to *Ongoing* and a new *RFQs/Orders* will appear in "
+"the top right corner of the document."
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:66
-msgid "Click on **Confirm**."
+#: ../../purchase/purchases/tender/blanket_orders.rst:41
+msgid "RFQ from the Blanket Order"
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:68
+#: ../../purchase/purchases/tender/blanket_orders.rst:43
 msgid ""
-"Now click on the button **New Quotation**. A RfQ is created for this vendor,"
-" with the products chosen on the PT. Repeat this operation for each release."
+"From your blanket order you can create a new quotation, Odoo will auto-fill "
+"the document with the product(s) from your blanket order, you only have to "
+"choose the quantity and confirm the order."
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:71
+#: ../../purchase/purchases/tender/blanket_orders.rst:47
 msgid ""
-"Be careful to change the **Quantity** field on the RFQ.  By default, the RFQ"
-" quantity will be for the entire remaining quantity. Your individual "
-"releases should be for some smaller quantity."
+"When you will go back on the blanket order, you will see how many quantities"
+" you have already ordered from your blanket order."
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:78
+#: ../../purchase/purchases/tender/blanket_orders.rst:51
+msgid "Vendors prices on your product"
+msgstr ""
+
+#: ../../purchase/purchases/tender/blanket_orders.rst:53
 msgid ""
-"When all of the releases (purchase orders) have been delivered and paid, you"
-" can click on **Validate** and **Done**."
+"When a blanket order is validated, a new vendor line is added in your "
+"product. You can see which one are linked to a blanket order and give "
+"priority to the ones you want with the arrows on the left of the vendor "
+"name."
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:81
+#: ../../purchase/purchases/tender/blanket_orders.rst:58
 msgid ""
-"View `Purchase Agreements "
-"<https://demo.odoo.com/?module=purchase_requisition.action_purchase_requisition>`__"
-" in our Online Demonstration."
+"Thanks to this, a blanket order can be used for automated replenishment "
+"(using *reordering rules* or *made to order* configuration)."
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:88
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:83
-msgid ":doc:`../../overview/process/difference`"
-msgstr ":doc:`../../overview/process/difference`"
-
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:3
-msgid "How to manage Purchase Tenders"
-msgstr ""
-
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:12
+#: ../../purchase/purchases/tender/blanket_orders.rst:65
 msgid ""
-"For more information on best uses, please read the chapter `Request for "
-"Quotation, Purchase Tender or Purchase Order? "
-"<https://www.odoo.com/documentation/user/11.0/purchase/overview/process/difference.html>`__"
+"You can also create a *Request for Quotation* from the classic RFQ Menu and "
+"link them with an existing *Blanket Order*"
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:17
-msgid "Activate the Purchase Tender function"
+#: ../../purchase/purchases/tender/call_for_tender.rst:3
+msgid "Manage Call for Tender"
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:19
+#: ../../purchase/purchases/tender/call_for_tender.rst:5
 msgid ""
-"By default, the Purchase Tender is not activated. To be able to use PTs, you"
-" must first activate the option."
+"A Call for Tender is a special procedure to request offers from multiple "
+"vendors to obtain the most interesting price."
 msgstr ""
-"Par défaut, les Appels d'Offres ne sont pas activés. Pour pouvoir utiliser "
-"les AOs, vous devez d'abord activer cette fonction."
 
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:22
+#: ../../purchase/purchases/tender/call_for_tender.rst:11
 msgid ""
-"In the Purchases module, open the Configuration menu and click on Settings. "
-"In the Purchase Order section, locate the **Calls for Tenders** and tick the"
-" box Allow using call for tenders... (advanced), then click on **Apply**."
+"For this feature to work, go to :menuselection:`Purchases --> Configuration "
+"--> Settings` and activate the *Purchase Agreements* feature."
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:31
-msgid "Create a Purchase Tender"
+#: ../../purchase/purchases/tender/call_for_tender.rst:19
+msgid "Create a Call for Tender"
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:33
+#: ../../purchase/purchases/tender/call_for_tender.rst:23
 msgid ""
-"To create a new Purchase Tender, open :menuselection:`Purchase --> Purchase "
-"Agreements (PA)`."
+"Create a new purchase agreement, access the *Agreement Type* drop down menu "
+"and select *Call for Tender*."
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:42
-msgid "In the **Agreement Type** field, choose Purchase Tender."
-msgstr ""
-
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:44
+#: ../../purchase/purchases/tender/call_for_tender.rst:26
 msgid ""
-"The **Agreement Deadline** field tells the vendors when to have their offers"
-" submitted."
+"When you are satisfied with your purchase agreement, confirm it will move "
+"from *Draft* to *Confirmed* and a new *RFQs/Orders* appeared in the top "
+"right corner of the document."
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:46
+#: ../../purchase/purchases/tender/call_for_tender.rst:34
+msgid "Request new quotations from the Call for Tender"
+msgstr ""
+
+#: ../../purchase/purchases/tender/call_for_tender.rst:36
 msgid ""
-"The **Ordering Date** field tells the vendors when we will submit a purchase"
-" order to the chosen vendor."
+"From the Call for Tender, Odoo will auto-fill the RFQ with the product(s) "
+"from your Call for Tender."
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:48
+#: ../../purchase/purchases/tender/call_for_tender.rst:40
+msgid "Select the best offer"
+msgstr ""
+
+#: ../../purchase/purchases/tender/call_for_tender.rst:42
 msgid ""
-"The **Delivery Date** field tells the vendors when the product will have to "
-"be delivered."
+"The various RFQs and orders linked to the Call for Tenders will be under the"
+" *RFQs/Orders* button where you can select and confirm the best offer."
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:50
-msgid "You do not have to define a **Vendor**."
+#: ../../purchase/purchases/tender/call_for_tender.rst:50
+msgid "Close the Call for Tender"
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:59
-msgid "Click on **Confirm Call**."
+#: ../../purchase/purchases/tender/call_for_tender.rst:52
+msgid "Once you're done with your *Call for Tender* don't forget to close it."
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:61
-msgid ""
-"Now click on the button **New Quotation**. A RfQ is created with the "
-"products chosen on the PT. Choose a **Vendor** and send the RfQ to the "
-"vendor. Repeat this operation for each vendor."
-msgstr ""
-
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:68
-msgid "Once all the RfQs are sent, you can click on **Validate** on the PT."
-msgstr ""
-
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:70
-msgid ""
-"The vendors will send their offers, you can update the RfQs accordingly. "
-"Then, choose the ones you want to accept by clicking on **Confirm Order** on"
-" the RfQs and **Cancel** the others."
-msgstr ""
-
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:74
-msgid "You can now click on **Done** on the PT."
-msgstr ""
-
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:76
-msgid ""
-"View `Purchase Tenders "
-"<https://demo.odoo.com/?module=purchase_requisition.action_purchase_requisition>`__"
-" in our Online Demonstration."
-msgstr ""
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:3
-msgid ""
-"How to purchase partially at two vendors for the same purchase tenders?"
-msgstr ""
-"Comment répartir les achats entre deux fournisseurs pour le même appel "
-"d'offres ?"
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:5
-msgid ""
-"For some Purchase Tenders (PT), you might sometimes want to be able to "
-"select only a part of some of the offers you received. In Odoo, this is made"
-" possible through the advanced mode of the **Purchase** module."
-msgstr ""
-"Pour certaines Appels d'Offres (AO), vous voudrez peut-être parfois "
-"sélectionner seulement une partie des offres que vous avez reçues. Dans "
-"Odoo, ceci est possible avec le mode avancé du module **Achat**."
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:10
-msgid ""
-"If you want to know how to handle a simple **Purchase Tender**, read the "
-"document on :doc:`manage_multiple_offers`."
-msgstr ""
-"Si vous voulez savoir comment gérer un **Appel d'Offres** simple, lisez la "
-"documention :doc:`manage_multiple_offers`."
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:19
-msgid "From the **Apps** menu, install the **Purchase Management** app."
-msgstr ""
-"Depuis le module **Applications**, installez l'application de **Gestion des "
-"achats**."
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:25
-msgid "Activating the Purchase Tender and Purchase Tender advanced mode"
-msgstr ""
-"Activation de la fonction Appel d'Offres et du mode Appel d'Offres avancés"
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:27
-msgid ""
-"In order to be able to select elements of an offer, you must activate the "
-"advanced mode."
-msgstr ""
-"Pour pouvoir sélectionner des éléments d'une offre, vous devez activer le "
-"mode avancé."
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:30
-msgid ""
-"To do so, go into the **Purchases** module, open the **Configuration** menu "
-"and click on **Settings**."
-msgstr ""
-"Pour ce faire, allez dans le module **Achats**, ouvrez le menu "
-"**Configuration** et cliquez sur **Configuration**."
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:33
-msgid ""
-"In the **Calls for Tenders** section, tick the option **Allow using call for"
-" tenders to get quotes from multiple suppliers(...)**, and in the **Advanced"
-" Calls for Tenders** section, tick the option **Advanced call for tender "
-"(...)** then click on **Apply**."
-msgstr ""
-"Dans la section **Appels d'offres**, cochez l'option **Autoriser le système "
-"d'appel d'offres...(avancé)**, et dans la section **Appels d'offres "
-"avancés**, cochez l'option **Appel d'offre avancé (...)**, puis cliquez sur "
-"**Appliquer**."
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:42
-msgid "Selecting elements of a RFQ/Bid"
-msgstr "Sélection d'éléments d'une DDP/Offre"
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:44
-msgid ""
-"Go to :menuselection:`Purchase --> Purchase Tenders`. Create a purchase "
-"tender containing several products, and follow the usual sequence all the "
-"way to the **Bid Selection** status."
-msgstr ""
-"Aller à :menuselection:`Achat --> Appel d'offres`. Créez un appel d'offres "
-"contenant plusieurs articles, et suivez la séquence habituelle jusqu'à "
-"l'état \"Sélection d'offre**."
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:49
-msgid ""
-"When you closed the call, click on **Choose Product Lines** to access the "
-"list of products and the bids received for all of them."
-msgstr ""
-"Lorsque vous clôturez l'appel d'offres, cliquez sur **Choisir des lignes "
-"d'articles** pour accéder à la liste des articles et des offres reçues pour "
-"chacun d'eux."
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:55
-msgid ""
-"Unroll the list of offers you received for each product, and click on the "
-"*v* symbol (**Confirm order**) next to the offers you wish to proceed with. "
-"The lines for which you've confirmed the order turn blue. When you're "
-"finished, click on **Generate PO** to create a purchase order for each "
-"product and supplier."
-msgstr ""
-"Déroulez la liste des offres que vous avez reçues pour chaque produit, et "
-"cliquez sur le symbole *v* (**Confirmer la commande**) à côté des offres que"
-" vous souhaitez choisir. Les lignes pour lesquelles vous avez confirmé la "
-"commande deviennent bleues. Lorsque vous avez terminé, cliquez sur **Générer"
-" le bon de commande** pour créer un bon de commande pour chaque article et "
-"chaque fournisseur."
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:64
-msgid ""
-"When you come back to you purchase tender, you can see that the status has "
-"switched to **PO Created** and that the **Requests for Quotations** now have"
-" a status of **Purchase Order** or **Cancelled**."
-msgstr ""
-"Lorsque vous revenez à l'appel d'offre, vous pouvez voir que le statut est "
-"passé à **Bon de commande Créé** et que les **Demandes de Prix** ont "
-"maintenant le statut **Bon de commande** ou **Annulé**."
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:72
-msgid ""
-"From there, follow the documentation "
-":doc:`../../overview/process/from_po_to_invoice` to proceed with the "
-"delivery and invoicing."
-msgstr ""
-"De là, suivez la documentation "
-":doc:`../../overview/process/from_po_to_invoice` pour procéder à la "
-"livraison et la facturation."
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:76
-msgid ":doc:`manage_multiple_offers`"
-msgstr ":doc:`manage_multiple_offers`"
-
 #: ../../purchase/replenishment.rst:3
 msgid "Replenishment"
 msgstr "Réapprovisionnement"
@@ -2907,283 +1876,152 @@ msgid "Replenishment Flows"
 msgstr "Règles de Réapprovisionnement"
 
 #: ../../purchase/replenishment/flows/compute_date.rst:3
-msgid "How are the order date and scheduled dates computed?"
-msgstr "Comment les dates de commande et de livraison sont-elles calculées ?"
+msgid "Schedule your receipts and deliveries"
+msgstr ""
 
 #: ../../purchase/replenishment/flows/compute_date.rst:5
 msgid ""
-"Scheduled dates are computed in order to be able to plan deliveries, "
-"receptions and so on. Depending on the habits of your company, Odoo "
-"automatically generates scheduled dates via the scheduler. The Odoo "
-"scheduler computes everything per line, whether it's a manufacturing order, "
-"a delivery order, a sale order, etc. The dates that are computed are "
-"dependent on the different leads times configured in Odoo."
+"To manage your supply chain scheduling, you will need to use Odoo *Lead "
+"Times*."
 msgstr ""
-"Les dates prévues sont calculées afin d'être en mesure de planifier les "
-"livraisons, réceptions et ainsi de suite. Selon les habitudes de votre "
-"entreprise, Odoo génère automatiquement les dates prévues par le "
-"planificateur. Le planificateur d'Odoo calcule tout par ligne, que ce soit "
-"un ordre de fabrication, un bon de livraison, une commande client, etc. Les "
-"dates sont calculées en fonction des différents délais configurés dans Odoo."
 
-#: ../../purchase/replenishment/flows/compute_date.rst:13
-msgid "Configuring lead times"
-msgstr "Configuration des délais de mise en œuvre"
+#: ../../purchase/replenishment/flows/compute_date.rst:8
+msgid ""
+"*Lead Times* are the expected times needed to receive, deliver or "
+"manufacture products."
+msgstr ""
+
+#: ../../purchase/replenishment/flows/compute_date.rst:12
+msgid "Configure Lead Times"
+msgstr ""
 
 #: ../../purchase/replenishment/flows/compute_date.rst:15
-msgid ""
-"Configuring **lead times** is an essential move in order to compute "
-"scheduled dates. Lead times are the delays (in term of delivery, "
-"manufacturing, ...) promised to your different partners and/or clients. "
-"Configuration of the different lead times are made as follows:"
+msgid "Vendor Lead Time"
 msgstr ""
-"La configuration des **délais** est une mesure essentielle pour pouvoir "
-"calculer les dates prévues. Les délais sont les retards (en terme de "
-"livraison, la fabrication, ...) promis à vos différents partenaires et/ou "
-"clients. La configuration des différents délais est effectuée comme suit :"
 
-#: ../../purchase/replenishment/flows/compute_date.rst:21
-msgid "On a product level"
-msgstr "Au niveau de l'article"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:24
-msgid "Supplier lead time:"
-msgstr "Délai du fournisseur :"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:26
+#: ../../purchase/replenishment/flows/compute_date.rst:17
 msgid ""
-"The supplier lead time is the time needed for the supplier to deliver your "
-"purchased product. To configure the Supplier lead time select a product "
-"(from the Purchase module, go to :menuselection:`Purchase --> Product`), and"
-" go in the **Inventory** tab. You will have to add a **Vendor** to your "
-"product in order to select a supplier lead time."
+"The vendor lead time is the time needed by your vendor to deliver the "
+"product to you."
 msgstr ""
-"Le délai fournisseur est le temps nécessaire au fournisseur pour vous livrer"
-" le produit acheté. Pour configurer le délai fournisseur, sélectionnez un "
-"article (dans le module d'achat, allez à :menuselection:`Achat --> "
-"Articles`), et allez dans l'onglet **Inventaire** . Vous devrez ajouter un "
-"**Fournisseur** à votre article pour sélectionner un délai fournisseur."
 
-#: ../../purchase/replenishment/flows/compute_date.rst:36
+#: ../../purchase/replenishment/flows/compute_date.rst:20
 msgid ""
-"It is possible to add more than one vendor per product and thus different "
-"delivery lead times depending on the vendor."
+"To configure your vendor lead times, go to a product page, under the "
+"purchase tab, click on a *Vendor* once there you can change the delivery "
+"lead time for that Vendor & Product."
 msgstr ""
-"Il est possible d'ajouter plus d'un fournisseur par article, et par "
-"conséquent différents délais de livraison en fonction du fournisseur."
 
-#: ../../purchase/replenishment/flows/compute_date.rst:39
+#: ../../purchase/replenishment/flows/compute_date.rst:28
+msgid "Customer Lead Time"
+msgstr "Délai de livraison au client"
+
+#: ../../purchase/replenishment/flows/compute_date.rst:30
 msgid ""
-"Once a vendor is selected, click on it to open its form and indicate its "
-"delivery lead time."
+"The customer lead time, on the other hand, is the time you need to deliver "
+"the product to your customer."
 msgstr ""
-"Une fois qu'un fournisseur est sélectionné, cliquez dessus pour ouvrir son "
-"formulaire et indiquer son délai de livraison."
 
-#: ../../purchase/replenishment/flows/compute_date.rst:46
+#: ../../purchase/replenishment/flows/compute_date.rst:33
 msgid ""
-"In this case security days have no influence, the scheduled delivery days "
-"will be equal to: Date of the purchase order + Delivery Lead Time."
+"To configure your customer lead time open a product and go under the "
+"*Inventory* tab. You can then add how many days you need."
 msgstr ""
-"Dans ce cas, les jours de sécurité n'ont aucune influence, la date prévue "
-"sera égale à : Date de la commande fournisseur + Délai de livraison."
 
-#: ../../purchase/replenishment/flows/compute_date.rst:50
-msgid "Customer lead time"
-msgstr "Délai du client"
+#: ../../purchase/replenishment/flows/compute_date.rst:40
+msgid "Manufacturing lead time"
+msgstr ""
+
+#: ../../purchase/replenishment/flows/compute_date.rst:42
+msgid ""
+"The manufacturing lead time is the time you need to manufacture the product."
+msgstr ""
+
+#: ../../purchase/replenishment/flows/compute_date.rst:45
+msgid ""
+"To configure your manufacturing lead time open a product and go under the "
+"*Inventory* tab. You can then add how many days you need."
+msgstr ""
 
 #: ../../purchase/replenishment/flows/compute_date.rst:52
-msgid ""
-"The customer lead time is the time needed to get your product from your "
-"store/warehouse to your customer. It can be configured for any product. "
-"Simply select a product (from the **Sales** module, go to "
-":menuselection:`Sales --> Product`), and go into the **Sales** tab to "
-"indicate your customer lead time."
+msgid "Configure Security Lead Times"
 msgstr ""
-"Le délai client est le temps nécessaire pour transférer vos articles de "
-"votre magasin/entrepôt à votre client. Il peut être configuré pour tout "
-"article. Il suffit de sélectionner un article (dans le module **Ventes**, "
-"allez à :menuselection:`Ventes --> Articles`), et d'aller dans l'onglet "
-"**Ventes** pour indiquer votre délai client."
 
-#: ../../purchase/replenishment/flows/compute_date.rst:62
-msgid "On the company level"
-msgstr "Au niveau de l'entreprise"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:64
+#: ../../purchase/replenishment/flows/compute_date.rst:54
 msgid ""
-"On company level, it is possible to parameter **security days** in order to "
-"cope with eventual delays and to be sure to meet your engagements. The idea "
-"is to subtract **backup** days from the computed scheduled date in case of "
-"delays."
+"Odoo also lets you configure *Security Days* allowing you to cope with "
+"potential delays along the supply chain and make sure you meet your "
+"engagements."
 msgstr ""
-"Au niveau de l'entreprise, il est possible de paramétrer des **jours de "
-"sécurité** afin de faire face à des retards éventuels et pour être sûr de "
-"répondre à vos engagements. L'idée est de soustraire des **jours de "
-"sécurité** à la date prévue calculée en cas de retard."
 
-#: ../../purchase/replenishment/flows/compute_date.rst:70
-msgid "Sales Safety days"
-msgstr "Jours de sécurité à la vente"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:72
+#: ../../purchase/replenishment/flows/compute_date.rst:58
 msgid ""
-"Sales Safety days are **back-up** days to ensure you will be able to deliver"
-" your clients engagements on time. They are margins of errors for delivery "
-"lead times. Security days are the same logic as the early wristwatch, in "
-"order to arrive on time. The idea is to subtract the numbers of security "
-"days from the calculation and thus to compute a scheduled date earlier than "
-"the one you promised to your client. That way you are sure to be able to "
-"keep your commitment."
+"The easiest way is to go to *Settings* from any module and type **Lead "
+"Time** in the search bar. From there, tick each box and configure your "
+"various *Security Lead Time* for your needs."
 msgstr ""
-"Les jours de sécurité à la vente sont des jours de **sauvegarde** pour faire"
-" en sorte que vous soyez en mesure de livrer vos clients à temps. Ce sont "
-"les marges d'erreurs pour les délais de livraison. Les jours de sécurité "
-"sont dans la même logique que les premières montres-bracelet, arriver à "
-"l'heure. L'idée est de soustraire le nombre de jours de sécurité du calcul "
-"et donc de calculer une date prévue plus tôt que celle que vous avez promis "
-"à votre client. De cette façon, vous êtes sûr d'être en mesure de tenir "
-"votre engagement."
 
-#: ../../purchase/replenishment/flows/compute_date.rst:80
+#: ../../purchase/replenishment/flows/compute_date.rst:65
 msgid ""
-"To set up your security dates, go to the app :menuselection:`Settings --> "
-"General settings`, and click on **Configure your company data**."
+"Alternatively, you can go in the settings of the *Inventory* module and "
+"*Manufacturing* module to configure those settings."
+msgstr ""
+
+#: ../../purchase/replenishment/flows/compute_date.rst:69
+msgid "Lead & security times in a use case"
+msgstr ""
+
+#: ../../purchase/replenishment/flows/compute_date.rst:71
+msgid ""
+"For example you sell a car today (January 1st), that is purchased on order, "
+"and you promise to deliver your customer within 20 days (January 20). Here "
+"is your product’s configuration:"
+msgstr ""
+
+#: ../../purchase/replenishment/flows/compute_date.rst:75
+msgid "Security lead time for sales : 1 day"
+msgstr ""
+
+#: ../../purchase/replenishment/flows/compute_date.rst:77
+msgid "Security lead time for purchase : 1 day"
+msgstr ""
+
+#: ../../purchase/replenishment/flows/compute_date.rst:79
+msgid "Vendor delivery lead time : 9 days"
+msgstr ""
+
+#: ../../purchase/replenishment/flows/compute_date.rst:81
+msgid ""
+"In such a scenario, the scheduler will trigger the following events based on"
+" your configuration."
+msgstr ""
+
+#: ../../purchase/replenishment/flows/compute_date.rst:84
+msgid ""
+"January 19: scheduled delivery date (20th January - 1 day of security lead "
+"time for Sales)"
 msgstr ""
-"Pour définir vos jours de sécurité, allez à :menuselection:`Configuration "
-"--> General settings`, et cliquez sur **Configurer les données de la "
-"société**."
 
 #: ../../purchase/replenishment/flows/compute_date.rst:87
-msgid "Go the **Configuration** tab to indicate the number of safety days"
-msgstr ""
-"Allez dans l'onglet **Configuration**, et saisissez le nombre de Jours de "
-"sécurité."
-
-#: ../../purchase/replenishment/flows/compute_date.rst:93
 msgid ""
-"Note that you can in this menu configure a default **Manufacturing** lead "
-"time."
+"January 18: scheduled receipt date (19th January - 1 day of security lead "
+"time for Purchase)"
 msgstr ""
-"Notez que vous pouvez dans ce menu configurer un délai de **Fabrication** "
-"par défaut."
 
-#: ../../purchase/replenishment/flows/compute_date.rst:97
-msgid "Purchase days"
-msgstr "Jours d'achat"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:99
-msgid "Purchase days response to the same logic than sales security days."
-msgstr ""
-"Les jours d'achat sont dans la même logique que les jours de sécurité à la "
-"vente."
-
-#: ../../purchase/replenishment/flows/compute_date.rst:101
+#: ../../purchase/replenishment/flows/compute_date.rst:90
 msgid ""
-"They are margins of error for vendor lead times. When the system generates "
-"purchase orders for procuring products, they will be scheduled in order to "
-"cope with unexpected vendor delays. Purchase lead time can be found in the "
-"same menu as the sales safety days (see screenshot above)."
+"January 10: order date = deadline to order from your vendor (19th January - "
+"9 days of vendor lead time)"
 msgstr ""
-"Ce sont les marges d'erreur pour les délais fournisseur. Lorsque le système "
-"génère des commandes pournisseurs pour l'acquisition de produits, ils seront"
-" programmés afin de faire face aux retards inattendus des fournisseurs. Les "
-"délais fournisseurs se trouvent dans le même menu que les jours de sécurité "
-"à la vente (voir capture d'écran ci-dessus)."
-
-#: ../../purchase/replenishment/flows/compute_date.rst:108
-msgid "On route level"
-msgstr "Au niveau du routage"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:110
-msgid ""
-"The internal transfers due to the movement of stocks can also influence the "
-"computed date."
-msgstr ""
-"Les transferts internes dus au mouvement des stocks peuvent également "
-"influer sur la date calculée."
-
-#: ../../purchase/replenishment/flows/compute_date.rst:113
-msgid ""
-"The delays due to internal transfers can be specified in the **Inventory** "
-"module when creating a new push rule for a new route."
-msgstr ""
-"Les retards dus à des transferts internes peuvent être spécifiés dans le "
-"module **Inventaire** lors de la création d'une nouvelle règle de flux "
-"poussé pour une nouvelle route."
-
-#: ../../purchase/replenishment/flows/compute_date.rst:117
-msgid ""
-"Read the documentation "
-":doc:`../../../../inventory/routes/concepts/push_rule` to learn more."
-msgstr ""
-"Lisez la documentation "
-":doc:`../../../../inventory/routes/concepts/push_rule` pour en savoir plus."
-
-#: ../../purchase/replenishment/flows/compute_date.rst:125
-msgid "On document level:"
-msgstr "Au niveau du document :"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:128
-msgid "Requested date"
-msgstr "Date demandée"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:130
-msgid ""
-"Odoo offers the possibility to indicate a requested date by the client "
-"straight on the sale order, under the tab **Other information**. If this "
-"date is earlier than the theoretically computed date, Odoo will "
-"automatically display a warning."
-msgstr ""
-"Odoo permet d'indiquer une date demandée par le client directement sur le "
-"bon de commande, sous l'onglet **Autres informations**. Si cette date est "
-"antérieure à la date théorique calculée, Odoo affiche automatiquement un "
-"avertissement."
-
-#: ../../purchase/replenishment/flows/compute_date.rst:141
-msgid ""
-"As an example, you may sell a car today (January 1st), that is purchased on "
-"order, and you promise to deliver your customer within 20 days (January 20)."
-" In such a scenario, the scheduler may trigger the following events, based "
-"on your configuration:"
-msgstr ""
-"A titre d'exemple, vous pouvez vendre une voiture aujourd'hui (1er Janvier),"
-" qui est achetée à la commande, et vous promettez de livrer votre client "
-"dans un délai de 20 jours (20 janvier). Dans un tel scénario, le "
-"planificateur peut déclencher les événements suivants, en fonction de votre "
-"configuration :"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:146
-msgid "January 19: actual scheduled delivery (1 day of Sales Safety days)"
-msgstr "19 Janvier : date de livraison réelle (1 jour de Sécurité à la Vente)"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:148
-msgid ""
-"January 18: receive the product from your supplier (1 day of Purchase days)"
-msgstr ""
-"18 Janvier : réception de l'article de votre fournisseur (1 jour de sécurité"
-" à l'Achat)"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:151
-msgid ""
-"January 10: deadline to order at your supplier (9 days of supplier delivery "
-"lead time)"
-msgstr ""
-"10 janvier : date limite pour passer la commande fournisseur (9 jours de "
-"délai fournisseur)"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:154
-msgid ""
-"January 8: trigger a purchase request to your purchase team, since the team "
-"needs on average 2 days to find the right supplier and order."
-msgstr ""
-"8 janvier: déclenchement d'une commande fournisseur à votre équipe d'achat, "
-"puisque l'équipe a besoin en moyenne de 2 jours pour trouver le bon "
-"fournisseur et commander."
 
 #: ../../purchase/replenishment/flows/dropshipping.rst:3
-msgid "How to setup drop-shipping?"
-msgstr "Comment configurer la livraison directe ?"
+msgid "Setup drop-shipping"
+msgstr ""
+
+#: ../../purchase/replenishment/flows/dropshipping.rst:6
+#: ../../purchase/replenishment/multicompany/setup.rst:6
+msgid "Overview"
+msgstr "Vue d'ensemble"
 
 #: ../../purchase/replenishment/flows/dropshipping.rst:8
 msgid ""
@@ -3249,642 +2087,144 @@ msgstr ""
 "politique de facturation de votre produit sur **Quantités commandées**."
 
 #: ../../purchase/replenishment/flows/purchase_triggering.rst:3
-msgid "How to trigger the purchase of products based on sales?"
-msgstr "Comment déclencher l'achat de produits en se basant sur les ventes ?"
+msgid "Trigger purchase of products based on sales (Make to Order)"
+msgstr ""
+
+#: ../../purchase/replenishment/flows/purchase_triggering.rst:5
+msgid ""
+"If you don't keep stock of your products, you may need to trigger purchase "
+"orders on each sale you make."
+msgstr ""
 
 #: ../../purchase/replenishment/flows/purchase_triggering.rst:8
 msgid ""
-"When you work in just-in-time, you don't manage stock so you directly order "
-"the product you need from your vendor."
+"Thanks to being a fully integrated solution, Odoo lets you do that easily in"
+" just one step."
 msgstr ""
-"Lorsque vous travaillez en juste-à-temps, vous ne gérez pas de stock donc "
-"vous commandez directement le produit dont vous avez besoin à votre "
-"fournisseur."
 
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:11
-msgid "The usual flow is:"
-msgstr "Le déroulement habituel est :"
+#: ../../purchase/replenishment/flows/purchase_triggering.rst:12
+msgid "Configure the product"
+msgstr ""
 
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:13
-msgid "Create a sale order"
-msgstr "Créer une commande client"
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:15
-msgid "Purchase the product"
-msgstr "Acheter le produit"
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:17
-msgid "Receive and pay the bill"
-msgstr "Recevoir et payer la facture"
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:19
-msgid "Deliver your product"
-msgstr "Livrer votre produit"
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:21
-msgid "Invoice your customer"
-msgstr "Facturer votre client"
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:24
-msgid "Product configuration"
-msgstr "Configuration d'article"
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:26
+#: ../../purchase/replenishment/flows/purchase_triggering.rst:14
 msgid ""
-"In the purchases application, open the **Purchase** menu and click on "
-"**Products**. Open the product on which you want to do your purchases based "
-"on sales."
+"Open a product form and, under the inventory tab, tick the routes *Buy* and "
+"*Make To Order*."
 msgstr ""
-"Dans le module Achats, ouvrez le menu Achat et cliquez sur Articles. Ouvrez "
-"l'article pour lequel vous voulez que les achats soient basés sur les "
-"ventes."
 
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:30
+#: ../../purchase/replenishment/flows/purchase_triggering.rst:20
+msgid "Don't forget to also set a vendor under the *Purchase* tab."
+msgstr ""
+
+#: ../../purchase/replenishment/flows/purchase_triggering.rst:23
 msgid ""
-"Next to Routes, tick **Buy** and **Make to order** as a procurement method. "
-"When you are generating sales order, Odoo will automatically reorder the "
-"same quantity through procurement."
+"The *Inventory*, *Sales* and *Purchases* modules have to be installed in "
+"Odoo for this feature to work."
 msgstr ""
-"Dans l'onglet Inventaire, dans la section Routes, cochez **Acheter** et "
-"**Approvisionnement à la commande** comme méthode d'approvisionnement. "
-"Lorsque vous générez des commandes client, Odoo recommandera automatiquement"
-" la même quantité par les approvisionnements."
 
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:37
-msgid "Don't forget to set a vendor otherwise the rule won't be triggered."
+#: ../../purchase/replenishment/flows/purchase_triggering.rst:27
+msgid "Create a sales order using Buy & MTO"
 msgstr ""
-"N'oubliez pas de définir un fournisseur sinon la règle ne se déclenchera "
-"pas."
 
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:39
+#: ../../purchase/replenishment/flows/purchase_triggering.rst:29
 msgid ""
-"You can also configure minimum stock rules that will trigger the purchase "
-"orders."
+"Create a new sales order with your product. When you confirm the order, a "
+"delivery order is created with the status *Waiting for another operation*."
 msgstr ""
-"Vous pouvez aussi définir des règles de stock minimum qui déclencheront des "
-"commandes fournisseurs"
 
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:43
+#: ../../purchase/replenishment/flows/purchase_triggering.rst:33
 msgid ""
-"To know how to configure a minimum stock rule, please read the document "
-":doc:`setup_stock_rule`."
+"A new RfQ will automatically be created in your *Purchases* module. Note "
+"that you can see for which SO this RfQ has been created thanks to the "
+"*Source Document* field, visible on the RfQ."
 msgstr ""
-"Pour savoir comment configurer une règle de stock minimum, lisez le document"
-" :doc:`setup_stock_rule`."
 
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:50
-msgid "Sale order"
-msgstr "Commande client"
+#: ../../purchase/replenishment/flows/purchase_triggering.rst:40
+msgid ""
+"When you confirm the RfQ into a purchase order, a receipt is automatically "
+"created and directly accessible from your purchase order with the use of the"
+" *Shipment* button."
+msgstr ""
+
+#: ../../purchase/replenishment/flows/purchase_triggering.rst:47
+msgid ""
+"You can validate the receipt of your products. When you will go back to the "
+"delivery order, you will see that the products are now ready to be shipped."
+msgstr ""
 
 #: ../../purchase/replenishment/flows/purchase_triggering.rst:52
 msgid ""
-"To create a sale order, go to the **Sales** application, "
-":menuselection:`Sales --> Sales order` and create a new sale order."
+"As long as your RfQ is not confirmed, Odoo will keep adding PO Lines "
+"automatically under it."
 msgstr ""
-"Pour créer une commande client, allez dans l'application de **Ventes**, "
-":menuselection:`Ventes --> Bons de commande` et créer un nouveau bon de "
-"commande."
 
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:58
-msgid ""
-"After confirming it, you will see one **Delivery** associated with this sale"
-" order on the **button** on the top of it."
+#: ../../purchase/replenishment/flows/purchase_triggering.rst:57
+msgid ":doc:`../../../purchase/replenishment/flows/setup_stock_rule`"
 msgstr ""
-"Après l'avoir confirmé, vous verrez une *Livraison** associée à ce bon de "
-"commande, dans le **bouton** en haut à droite."
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:64
-msgid ""
-"Click on the **Delivery** button to see the transfer order. The status of "
-"the outgoing shipment is **Waiting Another Operation**. It won't be done "
-"until the purchase order is confirmed and received."
-msgstr ""
-"Cliquez sur le bouton **Livraison** pour voir l'ordre de transfert. Le "
-"statut de l'expédition est **En attente d'une autre opération**. Il restera "
-"ainsi jusqu'à ce que la commande fournisseur soit confirmée et reçue."
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:69
-msgid "Purchase order"
-msgstr "Commande fournisseur"
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:71
-msgid ""
-"The purchase order is automatically created. Go to the **Purchase** "
-"application :menuselection:`Purchase --> Request for Quotation`. The source "
-"document is the sale order that triggered the procurement."
-msgstr ""
-"La commande fournisseur est créée automatiquement. Allez à l'application "
-"**Achat** :menuselection:`Achat --> Demande de prix`. Le document source est"
-" la commande client qui a déclenché l'approvisionnement."
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:79
-msgid ""
-"If you make some more sales that trigger procurements to the same vendor, it"
-" will be added to the existing request for quotation. Once it is confirmed, "
-"the next procurements will create a new request for quotation."
-msgstr ""
-"Si vous faites d'autres ventes qui déclenchent des approvisionnements auprès"
-" du même fournisseur, ce sera ajouté à la demande de prix existante. Une "
-"fois cette demande de prix confirmée, les approvisionnements suivants en "
-"créeront une nouvelle."
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:85
-msgid "Receipt and delivery"
-msgstr "Réception et expédition"
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:87
-msgid ""
-"Go the the **Inventory** application. Click on **# To Receive** on the "
-"**Receipts** tile."
-msgstr ""
-"Allez dans l'application **Inventaire**. Cliquez sur **# to receive** sur le"
-" bouton **Receptions**."
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:93
-msgid "Select the receipt from your vendor and **Validate** it."
-msgstr "Sélectionnez la réception de votre fournisseur et **Valider**."
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:98
-msgid ""
-"Go back to the **Inventory** dashboard. In the delivery order, click on **# "
-"To Do**. The delivery order is now ready to ship."
-msgstr ""
-"Revenez au tableau de bord de l'**Inventaire**. Dans le bon de livraison, "
-"cliquez sur **# à faire**. Le bon de livraison est maintenant prêt pour "
-"l'expédition."
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:104
-msgid ""
-"The status of the delivery changed from **Waiting Availability** to "
-"**Available**. Validate the transfer to confirm the delivery."
-msgstr ""
-"L'état de la livraison a changé de **Attente de Disponibilité** à "
-"**Disponible**. Validez le transfert pour confirmer la livraison."
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:111
-msgid ":doc:`setup_stock_rule`"
-msgstr ":doc:`setup_stock_rule`"
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:112
-msgid ":doc:`warning_triggering`"
-msgstr ":doc:`warning_triggering`"
 
 #: ../../purchase/replenishment/flows/setup_stock_rule.rst:3
-msgid "How to setup a minimum stock rule?"
-msgstr "Comment configurer une règle de stock minimum ?"
+msgid "Don’t run out of stock thanks to Reordering Rules"
+msgstr ""
 
 #: ../../purchase/replenishment/flows/setup_stock_rule.rst:5
 msgid ""
-"For some items you hold in stock, it might be useful to have rules making "
-"sure you never run out of stocks (for example, products with a high demand, "
-"or large items requiring a lot of storage space meaning they're harder to "
-"stock)."
+"To make sure you never run out of stock, you might want to define "
+"*Reordering Rules* on products. Thanks to reordering rules, Odoo will help "
+"you to replenish your stock when it reaches a minimum stock level."
 msgstr ""
-"Pour certains articles que vous détenez en stock, il pourrait être utile "
-"d'avoir des règles assurant que vous ne serez jamais en rupture de stock "
-"(par exemple, des produits avec une forte demande, ou de grands articles "
-"nécessitant beaucoup d'espace de stockage ce qui signifie qu'ils sont plus "
-"difficiles à stocker) ."
 
 #: ../../purchase/replenishment/flows/setup_stock_rule.rst:10
+msgid "Set a reordering rule"
+msgstr ""
+
+#: ../../purchase/replenishment/flows/setup_stock_rule.rst:12
+msgid "Open a stockable product, you'll find the *Reordering Rules* tab."
+msgstr ""
+
+#: ../../purchase/replenishment/flows/setup_stock_rule.rst:15
 msgid ""
-"Odoo allows you to set up rules so that an automatic replenishment for those"
-" items is made, based on minimum stocks available."
+"You can also access all your reordering rules from :menuselection:`Inventory"
+" --> Master Data --> Reordering Rules`."
 msgstr ""
-"Odoo vous permet de définir des règles de telle sorte qu'un "
-"réapprovisionnement automatique de ces articles soit fait, sur la base d'une"
-" quantité minimum en stock."
 
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:14
-msgid "When should I use Reordering Rules?"
-msgstr "Quand dois-je utiliser des règles de réapprovisionnement ?"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:16
+#: ../../purchase/replenishment/flows/setup_stock_rule.rst:21
 msgid ""
-"Reordering Rules work best for items that have a high demand and high flow. "
-"It will relieve you from a lot of work to focus on the rest of your "
-"activities knowing that stocks will always be right."
+"Once in the next menu, you can create the reordering rules linked to your "
+"product. From now on, every time this product reaches the minimum quantity "
+"it will replenish your stock to your **maximum quantity**."
 msgstr ""
-"Les règles de réapprovisionnement fonctionnent mieux pour les articles qui "
-"ont une forte demande et un débit important. Cela va vous soulager de "
-"beaucoup de travail pour vous concentrer sur le reste de vos activités en "
-"sachant que les stocks seront toujours suffisants."
 
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:20
+#: ../../purchase/replenishment/flows/setup_stock_rule.rst:29
 msgid ""
-"It can also be used when you have limited storage space and you need to keep"
-" large items in stock. In this case, you can keep as little as 1 item in "
-"stock, and have a new one ordered as a stock replenishment as soon as the "
-"item in stock is sold."
-msgstr ""
-"Elles peuvent également être utilisées lorsque vous avez un espace de "
-"stockage limité et que vous devez garder des gros articles en stock. Dans ce"
-" cas, vous pouvez garder seulement 1 article en stock, et en commander un "
-"nouveau en réapprovisionnement dès que l'article en stock est vendu."
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:26
-msgid "When should I avoid Reordering Rules?"
-msgstr "Quand dois-je éviter les règles de réapprovisionnement ?"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:28
-msgid ""
-"If you are offering a new product and don't know yet how fast it will go, "
-"you should handle stocks yourself first, and setup reordering rules only a "
-"few months into the sale to have better forecasts of the demand."
-msgstr ""
-"Si vous proposez un nouvel article et ne savez pas encore à quelle vitesse "
-"il va se vendre, vous devriez d'abord gérer les stocks vous-même, et "
-"configurer des règles de réapprovisionnement seulement quelques mois après "
-"le début des ventes afin de pouvoir mieux prévoir la demande."
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:32
-msgid ""
-"If you sell items that have a limited lifetime, such as fashion items, "
-"technology items, or products working together with a system that is meant "
-"to evolve, you have to be very well informed on when to stop automated "
-"replenishments, in order to avoid having to sell these items at a price that"
-" will not allow you to break even."
-msgstr ""
-"Si vous vendez des articles qui ont une durée de vie limitée, tels que des "
-"articles de mode, technologiques, ou des produits qui fonctionnent avec un "
-"système destiné à évoluer, vous devez être très bien informés sur le moment "
-"d'arrêter les réapprovisionnements automatiques, afin d'éviter d'avoir à "
-"vendre ces articles à un prix inférieur au seuil de rentabilité."
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:41
-msgid ""
-"My company sells modern furniture. We sell a set of table and chairs that "
-"are available in 4 seatings and 6 seatings."
-msgstr ""
-"Mon entreprise vend des meubles modernes. Nous vendons un ensemble de table "
-"et chaises qui est disponible en 4 sièges et 6 sièges."
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:44
-msgid ""
-"To keep things simple, we stock tables and chairs separately, but sell them "
-"all together to our clients as a kit. In order to make sure we can always "
-"deliver a complete set of table and chairs, I setup a Reordering Rule for "
-"the chairs to make sure I always have at least 10 chairs in stock, but no "
-"more than 20. This way, I can sell up to 5 sets of table at once while "
-"keeping my stock low enough not to eat up all my storage space."
-msgstr ""
-"Pour garder les choses simples, nous stockons les tables et les chaises "
-"séparément, mais les vendons ensemble à nos clients sous forme de kit. Afin "
-"de nous assurer que nous pouvons toujours offrir un ensemble complet de "
-"table et de chaises, je configure une règle de Réapprovisionnement pour les "
-"chaises pour nous assurer d'avoir toujours au moins 10 chaises en stock, "
-"mais pas plus de 20. De cette façon, je peux vendre jusqu'à 5 kits à la fois"
-" tout en gardant mon stock assez faible pour ne pas occuper tout mon espace "
-"de stockage."
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:52
-msgid ""
-"The last table I sold was a 4 seatings, and there were 12 chairs left in my "
-"stock. Because the stock in chairs is now only 8 chairs, Odoo will "
-"automatically order 12 new chairs to fill up my stock to the maximum amount."
-msgstr ""
-"La dernière table que j'ai vendue était une 4 places, et il n'y avait plus "
-"que 12 chaises en stock. Comme le stock de chaises n'est plus maintenant que"
-" de 8 chaises, Odoo va commander automatiquement 12 nouvelles chaises pour "
-"remplir mon stock au montant maximal."
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:61
-msgid "Set up your product"
-msgstr "Configurez votre article"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:63
-msgid ""
-"In the Purchases module, open the Purchase menu and click on Products. Open "
-"the product to which you would like to add a Reordering Rule (or create a "
-"new one)."
-msgstr ""
-"Dans le module Achats, ouvrez le menu Achat et cliquez sur Articles. Ouvrez "
-"l'article auquel vous voulez ajouter une règle de réapprovisionnement (ou "
-"créez-en un nouveau)."
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:67
-msgid "3 conditions for correct reordering rule :"
-msgstr "3 conditions pour une règle de réapprovisionnement correcte :"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:69
-msgid ""
-"In :menuselection:`General information --> Product type`, make the product "
-"stockable (as soon as this is done, the icon \"Reordering rule will appear)"
-msgstr ""
-"Dans :menuselection:`Informations Générales --> Type d'Article`, rendez le "
-"produit stockable (dès que ce sera fait, l'icône \"Règles de "
-"réapprovisionnement\" apparaîtra)"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:71
-msgid ""
-"In :menuselection:`Inventory --> route`, tick the \"Buy\" box (and untick "
-"the Make To Order box)"
-msgstr ""
-"Dans :menuselection:`Inventaire --> Routes`, cochez la case \"Acheter\" (et "
-"décochez la case Approvisionnement à la commande)"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:73
-msgid ""
-"Select a vendor (don't forget to put a minimal quantity greater than 0)"
-msgstr ""
-"Sélectionnez un fournisseur (et n'oubliez pas de mettre une quantité "
-"minimale supérieure à 0)"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:76
-msgid "Create a reordering rule"
-msgstr "Créez une règle de réapprovisionnement"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:78
-msgid "Click on the Reordering Rules tab, click on Create. A new page opens."
-msgstr ""
-"Cliquez sur l'icône Règles de réapprovisionnement, puis sur Créer. Une "
-"nouvelle fenêtre s'ouvre."
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:83
-msgid ""
-"By default, Reordering Rules in Odoo are named as \"OP/XXXXX\" but you are "
-"free to use any nomenclature. You can modify it via the **Name** field."
-msgstr ""
-"Par défaut, les règles de réapprovisionnement sont nommées \"OP/XXXXX\", "
-"mais vous êtes libres d'utiliser n'importe quelle nomenclature. Vous pouvez "
-"la modifier dans le champ **Nom**."
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:86
-msgid "The **Product** field is the product you are creating the rule for."
-msgstr "Le champ **Article** est l'article pour lequel vous créez une règle."
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:88
-msgid ""
-"Select the warehouse to which the product should be delivered in the "
-"**Warehouse** field."
-msgstr ""
-"Sélectionnez l'entrepôt où les produits doivent être livrés dans le champ "
-"**Entrepôt**."
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:91
-msgid ""
-"If you have configured multiple warehouses and location, specify the "
-"location in which the product will be stored in the **Location** field."
-msgstr ""
-"Si vous avez configuré plusieurs entrepôts et emplacements, précisez "
-"l'emplacement où le produit sera stocké dans le champ **Emplacement**."
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:96
-msgid ""
-":doc:`../../../inventory/settings/warehouses/difference_warehouse_location`"
-msgstr ""
-":doc:`../../../inventory/settings/warehouses/difference_warehouse_location`"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:102
-msgid ""
-"In the **Minimum Quantity** field, insert the quantity to which the system "
-"will trigger a new order for replenishment."
-msgstr ""
-"Dans le champ **Quantité minimum, saisissez la quantité en deçà de laquelle "
-"le système déclenchera une nouvelle commande de réapprovisionnement."
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:105
-msgid ""
-"In the **Maximum Quantity** field, insert the maximum of items that has to "
-"be stocked. The replenishing order will be based on that quantity to "
-"reorder."
-msgstr ""
-"Dans le champ **Quantité maximale, saisissez la quantité maximale d'articles"
-" en stock. La commande de réapprovisionnement se basera sur cette quantité."
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:109
-msgid ""
-"The **Quantity Multiple** is the lowest number of items that can be ordered "
-"at once. For instance, some items may be only available for purchase in a "
-"set of 2."
-msgstr ""
-"La **Quantité Multiple** est le plus petit nombre d'articles qui peuvent "
-"être commandés à la fois. Par exemple, certains articles peuvent n'être "
-"disponibles à l'achat que par lot de 2."
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:113
-msgid ""
-"In the Misc section, the **Active** box allows you to activate or deactivate"
-" the rule."
-msgstr ""
-"Dans la section Divers, la case à cocher **Actif** vous permet d'activer ou "
-"de désactiver cette règle."
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:116
-msgid "In the **Lead Time** section, you can enter:"
-msgstr "Dans le champ **Délai**, vous pouvez entrer :"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:118
-msgid ""
-"the number of Day(s) to purchase: correspond to the number of days for the "
-"supplier to receive the order"
-msgstr ""
-"le nombre de jour(s) pour commander : correspond au nombre de jours que le "
-"fournisseur met à traiter la commande"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:120
-msgid "the number of Day(s) to get the products"
-msgstr "le nombre de jour(s) pour obtenir les produits"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:122
-msgid ""
-"By default, the lead times are in calendar days. You can change that in "
-":menuselection:`Inventory --> Configuration --> Settings --> Minimum Stock "
-"Rules`"
-msgstr ""
-"Par défaut, les délais sont en jours calendaires. Vous pouvez changer cela "
-"dans :menuselection:`Inventaire --> Configuration --> Configuration --> "
-"Règles de stock minimum`"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:125
-msgid "When you have entered all the info, click on Save."
-msgstr ""
-"Quand vous avez saisi toutes les informations, cliquez sur Sauvegarder."
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:127
-msgid ""
-"From now on, every time a product with a reordering rule reaches the minimum"
-" stock, the system will automatically send a RfQ to your supplier based on "
-"your maximum quantity to replenish your stock."
-msgstr ""
-"A partir de maintenant, chaque fois qu'un article avec une règle de "
-"réapprovisionnement atteindra le stock minimum, le système enverra "
-"automatiquement une Demande de Prix à votre fournisseur en fonction de votre"
-" quantité maximale pour reconstituer votre stock."
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:131
-msgid ""
-"The replenishments will take place when the scheduler in the Inventory "
+"The replenishments will take place when the scheduler in the *Inventory* "
 "module runs. By default in Odoo, the schedulers will run every night at "
 "12:00PM."
 msgstr ""
-"Les réapprovisionnements auront lieu lorsque le planificateur du module "
-"Inventaire sera lancé. Par défaut dans Odoo, les planificateurs sont lancés "
-"tous les soirs à 12h00."
 
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:135
+#: ../../purchase/replenishment/flows/setup_stock_rule.rst:33
+msgid "See also: :doc:`../../../inventory/management/misc/schedulers`"
+msgstr ""
+
+#: ../../purchase/replenishment/flows/setup_stock_rule.rst:35
 msgid ""
-"To know how to configure and run the schedulers manually, read the document "
-"on :doc:`../../../inventory/management/misc/schedulers`"
+"From now on, every time a product with a reordering rule reaches the minimum"
+" stock, the system will automatically see how to fulfill that need based on "
+"the product configuration (e.g create an RfQ, create an MO, etc.)."
 msgstr ""
-"Pour savoir comment configurer et exécuter les planificateurs manuellement, "
-"lisez le document sur :doc:`../../../inventory/management/misc/schedulers`"
 
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:140
-msgid ":doc:`../../../inventory/management/misc/schedulers`"
-msgstr ":doc:`../../../inventory/management/misc/schedulers`"
+#: ../../purchase/replenishment/flows/setup_stock_rule.rst:41
+msgid "Troubleshooting"
+msgstr "Dépannage"
 
-#: ../../purchase/replenishment/flows/warning_triggering.rst:3
-#: ../../purchase/replenishment/flows/warning_triggering.rst:69
-msgid "How to trigger a warning when purchasing at a specific vendor?"
-msgstr ""
-"Comment déclencher une alerte lors d'un achat à un fournisseur spécifique ?"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:8
+#: ../../purchase/replenishment/flows/setup_stock_rule.rst:43
 msgid ""
-"The **Warning Messages and Alerts** module allow you to configure alerts on "
-"the customers and vendors or products."
+"For your reordering rules to work, your product needs to be correctly "
+"configured. If you are using *Buy* route, you need a vendor on the product. "
+"If you are using *Manufacturing* route you will been a BoM on the product. "
+"If the product is not fully configured or there is a mistake in your routes,"
+" a next activity will be logged on the product informing you there is an "
+"issue with the configuration."
 msgstr ""
-"Le module **Avertissement Messages et alertes** vous permet de configurer "
-"des alertes sur les clients, les fournisseurs ou les produits."
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:11
-msgid ""
-"You can select the following types of warnings and create different warnings"
-" for purchases and sales:"
-msgstr ""
-"Vous pouvez sélectionner les types d'avertissements suivants et créer des "
-"avertissements différents pour les achats et les ventes :"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:14
-msgid ""
-"Warning: This option displays the warning message during the process, but "
-"allows the user to continue."
-msgstr ""
-"Avertissement : Cette option affiche le message d'avertissement au cours du "
-"processus, mais permet à l'utilisateur de continuer."
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:17
-msgid ""
-"Blocking Message: The message displays a warning message, but the user "
-"cannot continue the process further."
-msgstr ""
-"Message Bloquant : Le message affiche un d'avertissement, mais l'utilisateur"
-" ne peut pas continuer le processus."
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:24
-msgid "Module Installation"
-msgstr "Installation du module"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:26
-msgid ""
-"First, you need to install the **Warning Messages and Alerts** module. Go to"
-" **Apps** and look for it (don't forget to remove the **Apps** filter)."
-msgstr ""
-"Tout d'abord, vous devez installer le module **Avertissement Messages et "
-"alertes**. Allez à **Applications ** et cherchez-le (n'oubliez pas de "
-"supprimer le filtre **Applications**)."
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:33
-msgid "Vendor or Customer warnings"
-msgstr "Alertes Fournisseur ou Client"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:35
-msgid ""
-"Go to :menuselection:`Purchases --> Vendors` or to :menuselection:`Sales -->"
-" Customers`."
-msgstr ""
-"Allez à :menuselection:`Achats --> Fournisseurs` ou à :menuselection:`Ventes"
-" --> Clients`."
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:37
-msgid "Open the vendor or the customer and click on the **Warnings** tab."
-msgstr ""
-"Ouvrez le fournisseur ou le client et cliquez sur l'onglet "
-"**Avertissements**."
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:42
-#: ../../purchase/replenishment/flows/warning_triggering.rst:62
-msgid "The available warnings are:"
-msgstr "Les avertissements disponibles sont :"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:44
-msgid "Warning on the **Sales Order**"
-msgstr "Avertissement sur les commandes de vente"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:46
-msgid "Warning on the **Purchase Order**"
-msgstr "Avertissement sur les **commandes d'achat**"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:48
-msgid "Warning on the **Picking**"
-msgstr "Avertissement sur les **colisages**"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:50
-msgid "Warning on the **Invoice**"
-msgstr "Avertissement sur la **facture**"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:53
-msgid "Product Warnings"
-msgstr "Alertes Articles"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:55
-msgid ""
-"Go to :menuselection:`Purchases --> Products` or to :menuselection:`Sales "
-"--> Products`."
-msgstr ""
-"Allez à :menuselection:`Achat --> Articles` ou à :menuselection:`Ventes --> "
-"Articles`."
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:57
-msgid "Open the product and click on the **Notes** tab."
-msgstr "Ouvrez l'article et cliquez sur l'onglet **Notes**."
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:64
-msgid "Warning when selling this product."
-msgstr "Avertissement lorsque vous vendez cet article"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:66
-msgid "Warning when Purchasing this product."
-msgstr "Avertissement lors d'un achat de cet article"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:71
-msgid ""
-"Go to the Purchases application, click on :menuselection:`Purchase --> "
-"Vendors`. Go to the **Warnings** tab."
-msgstr ""
-"Allez dans l'application Achats, cliquez sur :menuselection:`Achat --> "
-"Fournisseurs`. Allez dans l'onglet **Avertissements**."
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:74
-msgid ""
-"Under **Warning on the Purchase Order**, choose **Warning** and write your "
-"warning."
-msgstr ""
-"Sous **Avertissement sur les commandes d'achat**, choisissez "
-"**Avertissement** et écrivez votre message."
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:80
-msgid ""
-"Create a **Request for Quotation**. Go to :menuselection:`Purchase --> "
-"Request for Quotation` and click on **Create**. Choose the vendor on which a"
-" warning was set."
-msgstr ""
-"Créez une **Demande de prix**. Allez à :menuselection:`Achat --> Demande de "
-"prix` et cliquez sur **Créer**. Choisissez le fournisseur sur lequel un "
-"avertissement a été défini."
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:84
-msgid "When choosing the vendor, the warning will appear."
-msgstr "Lors du choix du fournisseur, l'avertissement apparaît."
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:90
-msgid ""
-"If you set a blocking message instead of a warning message, you won't be "
-"able to choose the vendor."
-msgstr ""
-"Si vous avez défini un message bloquant plutôt qu'un avertissement, vous ne "
-"pourrez pas sélectionner le fournisseur."
 
 #: ../../purchase/replenishment/multicompany.rst:3
 msgid "Multi-Companies"
@@ -3979,84 +2319,3 @@ msgid ""
 msgstr ""
 "Afin d'être en mesure de gérer les règles intersociétés, assurez-vous que "
 "votre utilisateur a le droit de gérer les entreprises."
-
-#: ../../purchase/replenishment/trouble_shooting.rst:3
-msgid "Trouble-Shooting"
-msgstr "Dépannage"
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:3
-msgid "How to check that everything is working fine?"
-msgstr "Comment vérifier que tout fonctionne correctement?"
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:6
-msgid "Vendor Bills"
-msgstr "Factures fournisseur"
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:8
-msgid ""
-"Even if you don't have the rights to the accounting application, you can "
-"still control the vendor bills."
-msgstr ""
-"Même si vous ne disposez pas d'accès à l'application de la comptabilité, "
-"vous pouvez tout de même contrôler les factures des fournisseurs."
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:11
-msgid ""
-"Go to the **Purchases** application: :menuselection:`Control --> Vendor "
-"Bills`."
-msgstr ""
-"Allez dans l'application **Achats** : :menuselection:`Contrôle --> Factures "
-"fournisseur`."
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:17
-msgid "Incoming Products"
-msgstr "Articles entrants"
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:19
-msgid ""
-"Even if you don't have the rights to the inventory application, you can "
-"still control the incoming products."
-msgstr ""
-"Même si vous ne disposez pas d'accès à l'application de l'inventaire, vous "
-"pouvez tout de même contrôler les articles entrants."
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:22
-msgid ""
-"Go to the **Purchases** application: :menuselection:`Control --> Incoming "
-"Products`."
-msgstr ""
-"Allez dans l'application **Achats** : :menuselection:`Contrôle --> Articles "
-"entrants`."
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:28
-msgid "Procurements exceptions"
-msgstr "Approvisionnements en exception"
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:30
-msgid "Here, you need the **Inventory Manager** access rights."
-msgstr "Ici, vous devez avoir les droits **Responsable de l'Inventaire**."
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:32
-msgid ""
-"Go to the **Inventory** application: :menuselection:`Control --> Procurement"
-" Exceptions`."
-msgstr ""
-"Allez dans l'application **Inventaire**: :menuselection:`Rapports --> "
-"Approvisionnements en exceptions`."
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:37
-msgid ""
-"To understand why the procurement is not running, open the exception and "
-"check the message in the chatter."
-msgstr ""
-"Pour comprendre pourquoi l'approvisionnement ne fonctionne pas, ouvrez "
-"l'exception et vérifier le message dans la zone de discussion."
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:43
-msgid ""
-"Usually, the problem is located on the procurement rules. Either there are "
-"no stock rules, or there are no vendor associated to a product."
-msgstr ""
-"Habituellement, le problème se situe sur les règles d'aprovisionnement. Soit"
-" il n'y a pas de règles de stock, soit il n'y a aucun fournisseur associé à "
-"l'article."
diff --git a/locale/fr/LC_MESSAGES/sales.po b/locale/fr/LC_MESSAGES/sales.po
index ce051e777..454879b64 100644
--- a/locale/fr/LC_MESSAGES/sales.po
+++ b/locale/fr/LC_MESSAGES/sales.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-23 12:10+0200\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Benjamin Frantzen, 2017\n"
+"Last-Translator: Eloïse Stilmant <est@odoo.com>, 2018\n"
 "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -279,797 +279,440 @@ msgstr ""
 msgid "Invoicing Method"
 msgstr "Méthode de facturation"
 
-#: ../../sales/invoicing/services.rst:3
-msgid "Services"
-msgstr "Services"
+#: ../../sales/invoicing/down_payment.rst:3
+msgid "Request a down payment"
+msgstr ""
 
-#: ../../sales/invoicing/services/milestones.rst:3
-msgid "How to invoice milestones of a project?"
-msgstr "Comment facturer les étapes d'un projet ?"
-
-#: ../../sales/invoicing/services/milestones.rst:5
+#: ../../sales/invoicing/down_payment.rst:5
 msgid ""
-"There are different kind of service sales: prepaid volume of hours/days "
-"(e.g. support contract), billing based on time and material (e.g. billing "
-"consulting hours) or a fixed price contract (e.g. a project)."
+"A down payment is an initial, partial payment, with the agreement that the "
+"rest will be paid later. For expensive orders or projects, it is a way to "
+"protect yourself and make sure your customer is serious."
 msgstr ""
-"Il existe différents types de ventes de services : un volume prépayé "
-"d'heures/de jours (par ex. contrat d'assistance), en fonction du temps et du"
-" matériel (par ex. heures de consultation) ou un contrat à prix fixe (par "
-"ex. un projet)."
 
-#: ../../sales/invoicing/services/milestones.rst:9
+#: ../../sales/invoicing/down_payment.rst:10
+msgid "First time you request a down payment"
+msgstr ""
+
+#: ../../sales/invoicing/down_payment.rst:12
 msgid ""
-"In this section, we will have a look at how to invoice milestones of a "
-"project."
+"When you confirm a sale, you can create an invoice and select a down payment"
+" option. It can either be a fixed amount or a percentage of the total "
+"amount."
 msgstr ""
-"Dans cette section, nous allons jeter un œil à la façon de facturer les "
-"étapes d'un projet."
 
-#: ../../sales/invoicing/services/milestones.rst:12
+#: ../../sales/invoicing/down_payment.rst:16
 msgid ""
-"Milestone invoicing can be used for expensive or large scale projects, with "
-"each milestone representing a clear sequence of work that will incrementally"
-" build up to the completion of the contract. For example, a marketing agency"
-" hired for a new product launch could break down a project into the "
-"following milestones, each of them considered as one service with a fixed "
-"price on the sale order :"
+"The first time you request a down payment you can select an income account "
+"and a tax setting that will be reused for next down payments."
 msgstr ""
-"La facturation par étape peut être utilisée pour des projets d'envergure "
-"coûteux ou longs, chaque étape représentant une séquence de travail "
-"clairement identifiable, avancant ainsi progressivement jusqu'à la fin du "
-"contrat. Par exemple, une agence de marketing engagée pour un nouveau "
-"lancement de produit pourrait découper un projet en étapes, chacune d'entre "
-"elles considérée comme un service avec un prix fixe sur le bon de commande :"
 
-#: ../../sales/invoicing/services/milestones.rst:19
-msgid "Milestone 1 : Marketing strategy audit - 5 000 euros"
-msgstr "Étape 1 : Audit de strategie marketing - 5 000 euros"
-
-#: ../../sales/invoicing/services/milestones.rst:21
-msgid "Milestone 2 : Brand Identity - 10 000 euros"
-msgstr "Étape 2 : Identité de marque - 10 000 euros"
-
-#: ../../sales/invoicing/services/milestones.rst:23
-msgid "Milestone 3 : Campaign launch & PR - 8 500 euros"
+#: ../../sales/invoicing/down_payment.rst:22
+msgid "You will then see the invoice for the down payment."
 msgstr ""
-"Étape 3 : Lancement de la campagne & relations publiques - 8 500 euros"
 
-#: ../../sales/invoicing/services/milestones.rst:25
+#: ../../sales/invoicing/down_payment.rst:27
 msgid ""
-"In this case, an invoice will be sent to the customer each time a milestone "
-"will be successfully reached. That invoicing method is comfortable both for "
-"the company which is ensured to get a steady cash flow throughout the "
-"project lifetime and for the client who can monitor the project's progress "
-"and pay in several times."
+"On the subsequent or final invoice, any prepayment made will be "
+"automatically deducted."
 msgstr ""
-"Dans ce contexte, une facture sera envoyée au client chaque fois qu'une "
-"étape sera atteinte avec succès. Cette méthode de facturation est "
-"confortable à la fois pour l'entreprise qui est assurée d'obtenir un flux de"
-" trésorerie stable tout au long de la durée de vie du projet, et pour le "
-"client qui peut suivre l'avancement du projet et le payer en plusieurs fois."
 
-#: ../../sales/invoicing/services/milestones.rst:32
+#: ../../sales/invoicing/down_payment.rst:34
+msgid "Modify the income account and customer taxes"
+msgstr ""
+
+#: ../../sales/invoicing/down_payment.rst:36
+msgid "From the products list, search for *Down Payment*."
+msgstr ""
+
+#: ../../sales/invoicing/down_payment.rst:41
 msgid ""
-"You can also use milestones to invoice percentages of the entire project. "
-"For example, for a million euros project, your company might require a 15% "
-"upfront payment, 30% at the midpoint and the balance at the contract "
-"conclusion. In that case, each payment will be considered as one milestone."
+"You can then edit it, under the invoicing tab you will be able to change the"
+" income account & customer taxes."
 msgstr ""
-"Vous pouvez également utiliser des étapes pour facturer des pourcentages de "
-"l'ensemble du projet. Par exemple, pour un projet en millions d'euros, votre"
-" entreprise peut nécessiter un paiement initial de 15%, 30% à mi-parcours et"
-" le solde à la fin du contrat. Dans ce cas, chaque paiement sera considéré "
-"comme une étape importante."
 
-#: ../../sales/invoicing/services/milestones.rst:39
-#: ../../sales/invoicing/services/reinvoice.rst:26
-#: ../../sales/invoicing/services/reinvoice.rst:95
-#: ../../sales/invoicing/services/support.rst:17
-#: ../../sales/send_quotations/quote_template.rst:10
-msgid "Configuration"
-msgstr "Configuration"
-
-#: ../../sales/invoicing/services/milestones.rst:42
-msgid "Install the Sales application"
-msgstr "Installer l'application Ventes"
-
-#: ../../sales/invoicing/services/milestones.rst:44
-#: ../../sales/invoicing/services/reinvoice.rst:28
-msgid ""
-"In order to sell services and to send invoices, you need to install the "
-"**Sales** application, from the **Apps** icon."
+#: ../../sales/invoicing/expense.rst:3
+msgid "Re-invoice expenses to customers"
 msgstr ""
-"Pour vendre des services et envoyer des factures, vous devez installer "
-"l'application **Ventes**, depuis le module **Applications**."
 
-#: ../../sales/invoicing/services/milestones.rst:51
-msgid "Create products"
-msgstr "Créer des articles"
-
-#: ../../sales/invoicing/services/milestones.rst:53
-msgid ""
-"In Odoo, each milestone of your project is considered as a product. From the"
-" **Sales** application, use the menu :menuselection:`Sales --> Products`, "
-"create a new product with the following setup:"
-msgstr ""
-"Dans Odoo, chaque étape de votre projet est considérée comme un article. "
-"Dans l'application de **Ventes**, utilisez le menu :menuselection:`Ventes ->"
-" Articles`, créez un nouvel article avec les informations suivantes :"
-
-#: ../../sales/invoicing/services/milestones.rst:57
-msgid "**Name**: Strategy audit"
-msgstr "**Nom** : Audit de stratégie"
-
-#: ../../sales/invoicing/services/milestones.rst:59
-#: ../../sales/invoicing/services/support.rst:50
-msgid "**Product Type**: Service"
-msgstr "**Type d'article** : Service"
-
-#: ../../sales/invoicing/services/milestones.rst:61
-msgid ""
-"**Invoicing Policy**: Delivered Quantities, since you will invoice your "
-"milestone after it has been delivered"
-msgstr ""
-"**Politique de facturation** : Qtés livrées, puisque vous facturez votre "
-"étape après qu'elle ait été livrée"
-
-#: ../../sales/invoicing/services/milestones.rst:64
-msgid ""
-"**Track Service**: Manually set quantities on order, as you complete each "
-"milestone, you will manually update their quantity from the **Delivered** "
-"tab on your sale order"
-msgstr ""
-"**Service de suivi** : Mettre manuellement les quantités sur la commande, "
-"car lorsque vous terminez chaque étape, vous allez mettre à jour "
-"manuellement leur quantité à partir de l'onglet **Livré** sur votre bon de "
-"commande"
-
-#: ../../sales/invoicing/services/milestones.rst:72
-msgid "Apply the same configuration for the others milestones."
-msgstr "Appliquez la même conficuration aux autre étapes"
-
-#: ../../sales/invoicing/services/milestones.rst:75
-msgid "Managing your project"
-msgstr "Gestion de votre projet"
-
-#: ../../sales/invoicing/services/milestones.rst:78
-msgid "Quotations and sale orders"
-msgstr "Devis et bons de commande"
-
-#: ../../sales/invoicing/services/milestones.rst:80
-msgid ""
-"Now that your milestones (or products) are created, you can create a "
-"quotation or a sale order with each line corresponding to one milestone. For"
-" each line, set the **Ordered Quantity** to ``1`` as each milestone is "
-"completed once. Once the quotation is confirmed and transformed into a sale "
-"order, you will be able to change the delivered quantities when the "
-"corresponding milestone has been achieved."
-msgstr ""
-"Maintenant que vos étapes (ou articles) sont créés, vous pouvez créer un "
-"devis ou un bon de commande avec chaque ligne correspondant à une étape. "
-"Pour chaque ligne, réglez la **Qté commandée** à ``1`` car chaque étape "
-"n'est réalisée qu'une fois. Une fois que le devis est confirmé et transformé"
-" en un bon de commande, vous serez en mesure de modifier les quantités "
-"livrées lorsque le jalon correspondant sera atteint."
-
-#: ../../sales/invoicing/services/milestones.rst:91
-msgid "Invoice milestones"
-msgstr "Facturer des étapes"
-
-#: ../../sales/invoicing/services/milestones.rst:93
-msgid ""
-"Let's assume that your first milestone (the strategy audit) has been "
-"successfully delivered and you want to invoice it to your customer. On the "
-"sale order, click on **Edit** and set the **Delivered Quantity** of the "
-"related product to ``1``."
-msgstr ""
-"Supposons que votre première étape (l'audit de stratégie) ait été livrée "
-"avec succès et que vous voulez facturer à votre client. Sur le bon de "
-"commande, cliquez sur **Modifier** et réglez la **Qté livrée** de l'article "
-"concerné à ``1``."
-
-#: ../../sales/invoicing/services/milestones.rst:99
-msgid ""
-"As soon as the above modification has been saved, you will notice that the "
-"color of the line has changed to blue, meaning that the service can now be "
-"invoiced. In the same time, the invoice status of the SO has changed from "
-"**Nothing To Invoice** to **To Invoice**"
-msgstr ""
-"Dès que la modification ci-dessus a été enregistrée, vous remarquerez que la"
-" couleur de la ligne a changé au bleu, ce qui signifie que le service peut "
-"maintenant être facturé. Dans le même temps, le statut de la facture du bon "
-"de commande a changé de **Rien à facturer** à **A facturer**"
-
-#: ../../sales/invoicing/services/milestones.rst:104
-msgid ""
-"Click on **Create invoice** and, in the new window that pops up, select "
-"**Invoiceable lines** and validate. It will create a new invoice (in draft "
-"status) with only the **strategy audit** product as invoiceable."
-msgstr ""
-"Cliquez sur **Créer la facture** et, dans la nouvelle fenêtre qui apparaît, "
-"sélectionnez **Lignes facturables** et validez. Cela va créer une nouvelle "
-"facture (à l'état Brouillon) avec seulement l'article **Audit de stratégie**"
-" facturé."
-
-#: ../../sales/invoicing/services/milestones.rst:112
-msgid ""
-"In order to be able to invoice a product, you need to set up the "
-"**Accounting** application and to configure an accounting journal and a "
-"chart of account. Click on the following link to learn more: "
-":doc:`../../../accounting/overview/getting_started/setup`"
-msgstr ""
-"Afin de pouvoir facturer un produit, vous devez paramétrer l'application de "
-"**Comptabilité** en configurant un journal et un plan comptable. Cliquez sur"
-" le lien suivant pour en savoir plus "
-":doc:`../../../accounting/overview/getting_started/setup`"
-
-#: ../../sales/invoicing/services/milestones.rst:117
-msgid ""
-"Back on your sale order, you will notice that the **Invoiced** column of "
-"your order line has been updated accordingly and that the **Invoice Status**"
-" is back to **Nothing to Invoice**."
-msgstr ""
-"En revenant sur votre bon de commande, vous noterez que la colonne "
-"**Facturé** de votre ligne de commande a été mise à jour en conséquence et "
-"que l'**État** de la facture est de retour à **Rien à facturer**."
-
-#: ../../sales/invoicing/services/milestones.rst:121
-msgid "Follow the same workflow to invoice your remaining milestones."
-msgstr "Suivez le même processus pour facturer vos étapes restantes."
-
-#: ../../sales/invoicing/services/milestones.rst:124
-msgid ":doc:`reinvoice`"
-msgstr ":doc:`reinvoice`"
-
-#: ../../sales/invoicing/services/milestones.rst:125
-#: ../../sales/invoicing/services/reinvoice.rst:185
-msgid ":doc:`support`"
-msgstr ":doc:`support`"
-
-#: ../../sales/invoicing/services/reinvoice.rst:3
-msgid "How to re-invoice expenses to your customers?"
-msgstr "Comment re-facturer des frais à vos clients ?"
-
-#: ../../sales/invoicing/services/reinvoice.rst:5
+#: ../../sales/invoicing/expense.rst:5
 msgid ""
 "It often happens that your employees have to spend their personal money "
 "while working on a project for your client. Let's take the example of an "
-"employee paying a parking spot for a meeting with your client. As a company,"
+"consultant paying an hotel to work on the site of your client. As a company,"
 " you would like to be able to invoice that expense to your client."
 msgstr ""
-"Il arrive souvent que vos employés doivent dépenser leur argent personnel "
-"alors qu'il travaillent sur un projet pour votre client. Prenons l'exemple "
-"d'un employé payant une place de parking pour une rencontre avec votre "
-"client. En tant qu'entreprise, vous souhaitez être en mesure de facturer ces"
-" frais à votre client."
 
-#: ../../sales/invoicing/services/reinvoice.rst:11
+#: ../../sales/invoicing/expense.rst:12
+#: ../../sales/invoicing/time_materials.rst:64
+msgid "Expenses configuration"
+msgstr ""
+
+#: ../../sales/invoicing/expense.rst:14
+#: ../../sales/invoicing/time_materials.rst:66
 msgid ""
-"In this documentation we will see two use cases. The first, very basic, "
-"consists of invoicing a simple expense to your client like you would do for "
-"a product. The second, more advanced, will consist of invoicing expenses "
-"entered in your expense system by your employees directly to your customer."
+"To track & invoice expenses, you will need the expenses app. Go to "
+":menuselection:`Apps --> Expenses` to install it."
 msgstr ""
-"Dans cette documentation, nous verrons deux cas d'utilisation. La première, "
-"très basique, consiste à facturer une note de frais simple à votre client "
-"comme vous le feriez pour un produit. Le second, plus avancé, consistera à "
-"facturer directement à votre client des frais saisis par vos employés dans "
-"votre système de gestion des notes de frais."
 
-#: ../../sales/invoicing/services/reinvoice.rst:18
-msgid "Use case 1: Simple expense invoicing"
-msgstr "Cas d'utilisation 1 : Facturation d'une simple note de frais"
-
-#: ../../sales/invoicing/services/reinvoice.rst:20
+#: ../../sales/invoicing/expense.rst:17
+#: ../../sales/invoicing/time_materials.rst:69
 msgid ""
-"Let's take the following example. You are working on a promotion campaign "
-"for one of your customers (``Agrolait``) and you have to print a lot of "
-"copies. Those copies are an expense for your company and you would like to "
-"invoice them."
+"You should also activate the analytic accounts feature to link expenses to "
+"the sales order, to do so, go to :menuselection:`Invoicing --> Configuration"
+" --> Settings` and activate *Analytic Accounting*."
 msgstr ""
-"Prenons l'exemple suivant. Vous travaillez sur une campagne de promotion "
-"pour un de vos clients (``Agrolait``) et vous devez imprimer un grand nombre"
-" de copies. Ces copies sont une dépense pour votre entreprise et vous "
-"souhaitez les facturer."
 
-#: ../../sales/invoicing/services/reinvoice.rst:35
-msgid "Create product to be expensed"
-msgstr "Créer un article de frais"
+#: ../../sales/invoicing/expense.rst:22
+#: ../../sales/invoicing/time_materials.rst:74
+msgid "Add expenses to your sales order"
+msgstr ""
 
-#: ../../sales/invoicing/services/reinvoice.rst:37
-msgid "You will need now to create a product called ``Copies``."
-msgstr "Vous devez maintenant créer un article nommé ``Copies``."
-
-#: ../../sales/invoicing/services/reinvoice.rst:39
-#: ../../sales/invoicing/services/reinvoice.rst:112
+#: ../../sales/invoicing/expense.rst:24
+#: ../../sales/invoicing/time_materials.rst:76
 msgid ""
-"From your **Sales** module, go to :menuselection:`Sales --> Products` and "
-"create a product as follows:"
+"From the expense app, you or your consultant can create a new one, e.g. the "
+"hotel for the first week on the site of your customer."
 msgstr ""
-"Depuis votre module **Ventes**, allez à :menuselection:`Ventes --> Articles`"
-" et créez un article comme suit :"
 
-#: ../../sales/invoicing/services/reinvoice.rst:42
-msgid "**Product type**: consumable"
-msgstr "**Type d'article** : Consommable"
-
-#: ../../sales/invoicing/services/reinvoice.rst:44
+#: ../../sales/invoicing/expense.rst:27
+#: ../../sales/invoicing/time_materials.rst:79
 msgid ""
-"**Invoicing policy**: on delivered quantities (you will manually set the "
-"quantities to invoice on the sale order)"
+"You can then enter a relevant description and select an existing product or "
+"create a new one from right there."
 msgstr ""
-"**Politique de facturation** : sur les quantités livrées (vous devrez "
-"définir manuellement les quantités sur le bon de commande)"
 
-#: ../../sales/invoicing/services/reinvoice.rst:51
-msgid "Create a sale order"
-msgstr "Créer une commande client"
+#: ../../sales/invoicing/expense.rst:33
+#: ../../sales/invoicing/time_materials.rst:85
+msgid "Here, we are creating a *Hotel* product:"
+msgstr ""
 
-#: ../../sales/invoicing/services/reinvoice.rst:53
+#: ../../sales/invoicing/expense.rst:38
 msgid ""
-"Now that your product is correctly set up, you can create a sale order for "
-"that product (from the menu :menuselection:`Sales --> Sales Orders`) with "
-"the ordered quantities set to 0. Click on **Confirm the Sale** to create the"
-" sale order. You will be able then to manually change the delivered "
-"quantities on the sale order to reinvoice the copies to your customer."
+"Under the invoicing tab, select *Delivered quantities* and either *At cost* "
+"or *Sales price* as well depending if you want to invoice the cost of your "
+"expense or a previously agreed on sales price."
 msgstr ""
-"Maintenant que votre article est correctement configuré, vous pouvez créer "
-"un ordre de vente pour cet article (dans le menu :menuselection:`Ventes -> "
-"Bons de commande`) avec les quantités commandées à 0. Cliquez sur "
-"**Confirmer la vente** pour créer le bon de commande. Vous pourrez alors "
-"modifier manuellement les quantités livrées sur le bon de commande pour "
-"refacturer les copies à votre client."
 
-#: ../../sales/invoicing/services/reinvoice.rst:64
-#: ../../sales/invoicing/services/reinvoice.rst:177
-msgid "Invoice expense to your client"
-msgstr "Facturer une note de frais à votre client"
-
-#: ../../sales/invoicing/services/reinvoice.rst:66
+#: ../../sales/invoicing/expense.rst:45
+#: ../../sales/invoicing/time_materials.rst:97
 msgid ""
-"At the end of the month, you have printed ``1000`` copies on behalf of your "
-"client and you want to re-invoice them. From the related sale order, click "
-"on **Delivered Quantities**, manually enter the correct amount of copies and"
-" click on **Save**. Your order line will turn blue, meaning that it is ready"
-" to be invoiced. Click on **Create invoice**."
+"To modify or create more products go to :menuselection:`Expenses --> "
+"Configuration --> Expense products`."
 msgstr ""
-"A la fin du mois, vous avez imprimé ``1000`` copies pour votre client et "
-"vous souhaitez les re-facturer. Depuis le bon de commande concerné, cliquez "
-"sur **Qtés livrées**, saisissez manuellement la quantité correcte de copies "
-"et cliquez sur **Sauvegarder**. Votre ligne de commande devient bleue, ce "
-"qui signifie qu'elle est prête à être facturée. Cliquez sur **Créer "
-"facture**."
 
-#: ../../sales/invoicing/services/reinvoice.rst:73
+#: ../../sales/invoicing/expense.rst:48
+#: ../../sales/invoicing/time_materials.rst:100
 msgid ""
-"The total amount on your sale order will be of 0 as it is computed on the "
-"ordered quantities. It is your invoice which will compute the correct amount"
-" due by your customer."
+"Back on the expense, add the original sale order in the expense to submit."
 msgstr ""
-"Le montant total de votre bon de commande sera de 0 car il est calculé sur "
-"les quantités commandées. C'est votre facture qui calculera le montant exact"
-" dû par votre client."
 
-#: ../../sales/invoicing/services/reinvoice.rst:77
+#: ../../sales/invoicing/expense.rst:54
+#: ../../sales/invoicing/time_materials.rst:106
+msgid "It can then be submitted to the manager, approved and finally posted."
+msgstr ""
+
+#: ../../sales/invoicing/expense.rst:65
+#: ../../sales/invoicing/time_materials.rst:117
+msgid "It will then be in the sales order and ready to be invoiced."
+msgstr ""
+
+#: ../../sales/invoicing/invoicing_policy.rst:3
+msgid "Invoice based on delivered or ordered quantities"
+msgstr ""
+
+#: ../../sales/invoicing/invoicing_policy.rst:5
 msgid ""
-"The invoice generated is in draft, so you can always control the quantities "
-"and change the amount if needed. You will notice that the amount to be "
-"invoiced is based here on the delivered quantities."
+"Depending on your business and what you sell, you have two options for "
+"invoicing:"
 msgstr ""
-"La facture générée est à l'état brouillon, donc vous pouvez toujours "
-"contrôler les quantités et modifier le montant si nécessaire. Vous noterez "
-"que le montant à facturer est basé ici sur les quantités livrées."
 
-#: ../../sales/invoicing/services/reinvoice.rst:84
-msgid "Click on validate to issue the payment to your customer."
-msgstr "Cliquez sur valider pour émettre le paiement à votre client."
-
-#: ../../sales/invoicing/services/reinvoice.rst:87
-msgid "Use case 2: Invoice expenses via the expense module"
-msgstr ""
-"Cas d'utilisation 2 : Facturer des frais via le module de Gestion des notes "
-"de frais"
-
-#: ../../sales/invoicing/services/reinvoice.rst:89
+#: ../../sales/invoicing/invoicing_policy.rst:8
 msgid ""
-"To illustrate this case, let's imagine that your company sells some "
-"consultancy service to your customer ``Agrolait`` and both parties agreed "
-"that the distance covered by your consultant will be re-invoiced at cost."
+"Invoice on ordered quantity: invoice the full order as soon as the sales "
+"order is confirmed."
 msgstr ""
-"Pour illustrer ce cas, imaginons que votre entreprise vend un service de "
-"conseil à votre client ``Agrolait`` et que les deux parties ont convenu que "
-"la distance parcourue par votre consultant sera refacturée au réel."
 
-#: ../../sales/invoicing/services/reinvoice.rst:97
-msgid "Here, you will need to install two more modules:"
-msgstr "Ici, vous aurez besoin d'installer deux autres modules:"
-
-#: ../../sales/invoicing/services/reinvoice.rst:99
-msgid "Expense Tracker"
-msgstr "Suivi des dépenses"
-
-#: ../../sales/invoicing/services/reinvoice.rst:101
+#: ../../sales/invoicing/invoicing_policy.rst:10
 msgid ""
-"Accounting, where you will need to activate the analytic accounting from the"
-" settings"
+"Invoice on delivered quantity: invoice on what you delivered even if it's a "
+"partial delivery."
 msgstr ""
-"Comptabilité, où vous devrez activer la comptabilité analytique dans les "
-"paramètres"
 
-#: ../../sales/invoicing/services/reinvoice.rst:108
-msgid "Create a product to be expensed"
-msgstr "Créer un produit à insérer en note de frais"
+#: ../../sales/invoicing/invoicing_policy.rst:13
+msgid "Invoice on ordered quantity is the default mode."
+msgstr ""
 
-#: ../../sales/invoicing/services/reinvoice.rst:110
-msgid "You will now need to create a product called ``Kilometers``."
-msgstr "Vous devez maintenant créer un article nommé ``Kilomètres``."
-
-#: ../../sales/invoicing/services/reinvoice.rst:115
-msgid "Product can be expensed"
-msgstr "Peut être insére dans une note de frais"
-
-#: ../../sales/invoicing/services/reinvoice.rst:117
-msgid "Product type: Service"
-msgstr "**Type d'article** : Service"
-
-#: ../../sales/invoicing/services/reinvoice.rst:119
-msgid "Invoicing policy: invoice based on time and material"
-msgstr "**Politique de facturation** : Reinvoice costs"
-
-#: ../../sales/invoicing/services/reinvoice.rst:121
-msgid "Expense invoicing policy: At cost"
-msgstr "**Politique pour les notes de frais** : Au prix coûtant"
-
-#: ../../sales/invoicing/services/reinvoice.rst:123
-msgid "Track service: manually set quantities on order"
-msgstr "Service de suivi : Mettre manuellement les quantités sur la commande"
-
-#: ../../sales/invoicing/services/reinvoice.rst:129
-msgid "Create a sales order"
-msgstr "Créer un bon de commande"
-
-#: ../../sales/invoicing/services/reinvoice.rst:131
+#: ../../sales/invoicing/invoicing_policy.rst:15
 msgid ""
-"Still from the Sales module, go to :menuselection:`Sales --> Sales Orders` "
-"and add your product **Consultancy** on the order line."
+"The benefits of using *Invoice on delivered quantity* depends on your type "
+"of business, when you sell material, liquids or food in large quantities the"
+" quantity might diverge a little bit and it is therefore better to invoice "
+"the actual delivered quantity."
 msgstr ""
-"Toujours à partir du module de Ventes, allez à :menuselection:`Ventes --> "
-"Bons de commande` et ajouter votre produit **Conseils** sur la ligne de "
-"commande."
 
-#: ../../sales/invoicing/services/reinvoice.rst:135
+#: ../../sales/invoicing/invoicing_policy.rst:21
 msgid ""
-"If your product doesn't exist yet, you can configure it on the fly from the "
-"SO. Just type the name on the **product** field and click on **Create and "
-"edit** to configure it."
+"You also have the ability to invoice manually, letting you control every "
+"options: invoice ready to invoice lines, invoice a percentage (advance), "
+"invoice a fixed advance."
 msgstr ""
-"Si votre article n'existe pas encore, vous pouvez le configurer à la volée à"
-" partir du bon de commande. Il suffit de taper le nom sur le champ *Article "
-"** et cliquez sur **Créer et modifier** pour le configurer."
 
-#: ../../sales/invoicing/services/reinvoice.rst:139
+#: ../../sales/invoicing/invoicing_policy.rst:26
+msgid "Decide the policy on a product page"
+msgstr ""
+
+#: ../../sales/invoicing/invoicing_policy.rst:28
 msgid ""
-"Depending on your product configuration, an **Analytic Account** may have "
-"been generated automatically. If not, you can easily create one in order to "
-"link your expenses to the sale order. Do not forget to confirm the sale "
-"order."
+"From any products page, under the invoicing tab you will find the invoicing "
+"policy and select the one you want."
 msgstr ""
-"Selon la configuration de votre produit, un **Compte Analytique** peut avoir"
-" été généré automatiquement. Sinon, vous pouvez facilement en créer un afin "
-"de lier vos frais au bon de commande. N'oubliez pas de confirmer le bon de "
-"commande."
 
-#: ../../sales/invoicing/services/reinvoice.rst:148
+#: ../../sales/invoicing/invoicing_policy.rst:35
+msgid "Send the invoice"
+msgstr ""
+
+#: ../../sales/invoicing/invoicing_policy.rst:37
 msgid ""
-"Refer to the documentation :doc:`../../../accounting/others/analytic/usage` "
-"to learn more about that concept."
+"Once you confirm the sale, you can see your delivered and invoiced "
+"quantities."
 msgstr ""
-"Référez-vous à la documentation "
-":doc:`../../../accounting/others/analytic/usage` pour en apprendre plus sur "
-"ces concepts."
 
-#: ../../sales/invoicing/services/reinvoice.rst:152
-msgid "Create expense and link it to SO"
-msgstr "Créez une note de frais et reliez-la au bon de commande"
-
-#: ../../sales/invoicing/services/reinvoice.rst:154
+#: ../../sales/invoicing/invoicing_policy.rst:43
 msgid ""
-"Let's assume that your consultant covered ``1.000km`` in October as part of "
-"his consultancy project. We will create a expense for it and link it to the "
-"related sales order thanks to the analytic account."
+"If you set it in ordered quantities, you can invoice as soon as the sale is "
+"confirmed. If however you selected delivered quantities, you will first have"
+" to validate the delivery."
 msgstr ""
-"Supposons que votre consultant a parcouru ``1.000km`` en Octobre dans le "
-"cadre de son projet de conseil. Nous allons créer une dépense pour ce projet"
-" et le lier au bon de commande concerné grâce au compte analytique."
 
-#: ../../sales/invoicing/services/reinvoice.rst:158
+#: ../../sales/invoicing/invoicing_policy.rst:47
 msgid ""
-"Go to the **Expenses** module and click on **Create**. Record your expense "
-"as follows:"
+"Once the products are delivered, you can invoice your customer. Odoo will "
+"automatically add the quantities to invoiced based on how many you delivered"
+" if you did a partial delivery."
 msgstr ""
-"Allez dans l'application **Notes de frais** et cliquez sur **Créer**. "
-"Enregistrez vos frais comme suit :"
 
-#: ../../sales/invoicing/services/reinvoice.rst:161
-msgid "**Expense description**: Kilometers October 2015"
-msgstr "**Description de note de frais** : Kilomètres Octobre 2015"
+#: ../../sales/invoicing/milestone.rst:3
+msgid "Invoice project milestones"
+msgstr ""
 
-#: ../../sales/invoicing/services/reinvoice.rst:163
-msgid "**Product**: Kilometers"
-msgstr "**Article**: Kilomètres"
-
-#: ../../sales/invoicing/services/reinvoice.rst:165
-msgid "**Quantity**: 1.000"
-msgstr "**Quantité**: 1.000"
-
-#: ../../sales/invoicing/services/reinvoice.rst:167
-msgid "**Analytic account**: SO0019 - Agrolait"
-msgstr "**Compte Analytique**: SO0019 - Agrolait"
-
-#: ../../sales/invoicing/services/reinvoice.rst:172
+#: ../../sales/invoicing/milestone.rst:5
 msgid ""
-"Click on **Submit to manager**. As soon as the expense has been validated "
-"and posted to the journal entries, a new line corresponding to the expense "
-"will automatically be generated on the sale order."
+"Milestone invoicing can be used for expensive or large-scale projects, with "
+"each milestone representing a clear sequence of work that will incrementally"
+" build up to the completion of the contract. This invoicing method is "
+"comfortable both for the company which is ensured to get a steady cash flow "
+"throughout the project lifetime and for the client who can monitor the "
+"project's progress and pay in several installments."
 msgstr ""
-"Cliquez sur **Soumettre au responsable**. Dès que la dépense aura été "
-"validée et comptabilisée, une nouvelle ligne correspondant à la note de "
-"frais sera automatiquement générée sur le bon de commande."
 
-#: ../../sales/invoicing/services/reinvoice.rst:179
-msgid "You can now invoice the invoiceable lines to your customer."
+#: ../../sales/invoicing/milestone.rst:13
+msgid "Create milestone products"
 msgstr ""
-"Vous pouvez maintenant facturer les lignes facturables à votre client."
 
-#: ../../sales/invoicing/services/reinvoice.rst:186
-msgid ":doc:`milestones`"
-msgstr ":doc:`milestones`"
-
-#: ../../sales/invoicing/services/support.rst:3
-msgid "How to invoice a support contract (prepaid hours)?"
-msgstr "Comment facturer un contrat d'assistance (heures prépayées) ?"
-
-#: ../../sales/invoicing/services/support.rst:5
+#: ../../sales/invoicing/milestone.rst:15
 msgid ""
-"There are different kinds of service sales: prepaid volume of hours/days "
-"(e.g. support contract), billing based on time and material (e.g. billing "
-"consulting hours) and a fixed price contract (e.g. a project)."
+"In Odoo, each milestone of your project is considered as a product. To "
+"configure products to work this way, go to any product form."
 msgstr ""
-"Il existe différents types de ventes de services : un volume prépayé "
-"d'heures/de jours (par ex. contrat d'assistance), en fonction du temps et du"
-" matériel (par ex. heures de consultation) et un contrat à prix fixe (par "
-"ex. un projet)."
 
-#: ../../sales/invoicing/services/support.rst:9
+#: ../../sales/invoicing/milestone.rst:18
 msgid ""
-"In this section, we will have a look at how to sell and keep track of a pre-"
-"paid support contract."
+"You have to set the product type as *Service* under general information and "
+"select *Milestones* in the sales tab."
 msgstr ""
-"Dans cette section, nous allons jeter un œil à la façon de vendre et "
-"d'assurer le suivi d'un contrat d'assistance pré-payé.."
 
-#: ../../sales/invoicing/services/support.rst:12
+#: ../../sales/invoicing/milestone.rst:25
+msgid "Invoice milestones"
+msgstr "Facturer des étapes"
+
+#: ../../sales/invoicing/milestone.rst:27
 msgid ""
-"As an example, you may sell a pack of ``50 Hours`` of support at "
-"``$25,000``. The price is fixed and charged initially. But you want to keep "
-"track of the support service you did for the customer."
+"From the sales order, you can manually edit the quantity delivered as you "
+"complete a milestone."
 msgstr ""
-"A titre d'exemple, vous vendez un contrat de ``50 Heures`` d'assistance à "
-"``$25,000``. Le prix est fixé et facturé initialement. Mais vous voulez "
-"garder une trace du service d'assistance que vous avez réalisé pour le "
-"client."
 
-#: ../../sales/invoicing/services/support.rst:20
-msgid "Install the Sales and Timesheet applications"
-msgstr "Installer les application Ventes et Feuilles de temps"
+#: ../../sales/invoicing/milestone.rst:33
+msgid "You can then invoice that first milestone."
+msgstr ""
 
-#: ../../sales/invoicing/services/support.rst:22
+#: ../../sales/invoicing/proforma.rst:3 ../../sales/invoicing/proforma.rst:22
+msgid "Send a pro-forma invoice"
+msgstr ""
+
+#: ../../sales/invoicing/proforma.rst:5
 msgid ""
-"In order to sell services, you need to install the **Sales** application, "
-"from the **Apps** icon. Install also the **Timesheets** application if you "
-"want to track support services you worked on every contract."
+"A pro-forma invoice is an abridged or estimated invoice in advance of a "
+"delivery of goods. It notes the kind and quantity of goods, their value, and"
+" other important information such as weight and transportation charges. Pro-"
+"forma invoices are commonly used as preliminary invoices with a quotation, "
+"or for customs purposes in importation. They differ from a normal invoice in"
+" not being a demand or request for payment."
 msgstr ""
-"Pour vendre des services, vous devez installer l'application **Ventes**, "
-"depuis le module **Applications**. Installez aussi l'application **Feuilles "
-"de temps** si vous voulez suivre les heures d'assistance que vous avez "
-"fournies pour chaque contrat."
 
-#: ../../sales/invoicing/services/support.rst:33
-msgid "Create Products"
-msgstr "Créer des Articles"
+#: ../../sales/invoicing/proforma.rst:13
+#: ../../sales/send_quotations/different_addresses.rst:10
+msgid "Activate the feature"
+msgstr ""
 
-#: ../../sales/invoicing/services/support.rst:35
+#: ../../sales/invoicing/proforma.rst:15
 msgid ""
-"By default, products are sold by number of units. In order to sell services "
-"``per hour``, you must allow using multiple unit of measures. From the "
-"**Sales** application, go to the menu :menuselection:`Configuration --> "
-"Settings`. From this screen, activate the multiple **Unit of Measures** "
-"option."
+"Go to :menuselection:`SALES --> Configuration --> Settings` and activate the"
+" *Pro-Forma Invoice* feature."
 msgstr ""
-"Par défaut, les produits sont vendus en nombre d'unités. Afin de vendre des "
-"services ``à l'heure``, vous devez autoriser l'utilisation de multiples "
-"unités mesures. Dans l'application **Ventes**, allez dans le menu "
-":menuselection:`Configuration --> Settings`. Dans cet écran, activer "
-"l'option **Unité de mesure** multiples."
 
-#: ../../sales/invoicing/services/support.rst:44
+#: ../../sales/invoicing/proforma.rst:24
 msgid ""
-"In order to sell a support contract, you must create a product for every "
-"support contract you sell. From the **Sales** application, use the menu "
-":menuselection:`Sales --> Products`, create a new product with the following"
-" setup:"
+"From any quotation or sales order, you know have an option to send a pro-"
+"forma invoice."
 msgstr ""
-"Afin de vendre un contrat d'assistance, vous devez créer un article pour "
-"chaque contrat d'assistance que vous vendez. Dans l'application **Ventes** ,"
-" utilisez le menu :menuselection:`Ventes --> Articles`, créez un nouvel "
-"article avec la configuration suivante :"
 
-#: ../../sales/invoicing/services/support.rst:48
-msgid "**Name**: Technical Support"
-msgstr "**Nom**: Assistance Technique"
-
-#: ../../sales/invoicing/services/support.rst:52
-msgid "**Unit of Measure**: Hours"
-msgstr "**Unité de Mesure** : Heures"
-
-#: ../../sales/invoicing/services/support.rst:54
+#: ../../sales/invoicing/proforma.rst:30
 msgid ""
-"**Invoicing Policy**: Ordered Quantities, since the service is prepaid, we "
-"will invoice the service based on what has been ordered, not based on "
-"delivered quantities."
+"When you click on send, Odoo will send an email with the pro-forma invoice "
+"in attachment."
 msgstr ""
-"**Politique de facturation**: Quantités Commandées, puisque le service est "
-"prépayé, nous facturerons le service selon ce qui a été commandé, pas sur "
-"les quantités livrées."
 
-#: ../../sales/invoicing/services/support.rst:58
+#: ../../sales/invoicing/subscriptions.rst:3
+msgid "Sell subscriptions"
+msgstr ""
+
+#: ../../sales/invoicing/subscriptions.rst:5
 msgid ""
-"**Track Service**: Timesheet on contracts. An analytic account will "
-"automatically be created for every order containing this service so that you"
-" can track hours in the related account."
+"Selling subscription products will give you predictable revenue, making "
+"planning ahead much easier."
 msgstr ""
-"**Service de suivi**: Feuilles de temps sur les contrats. Un compte "
-"analytique sera automatiquement créé pour chaque commande contenant ce "
-"service afin que vous puissiez suivre les heures dans le compte "
-"correspondant."
 
-#: ../../sales/invoicing/services/support.rst:66
+#: ../../sales/invoicing/subscriptions.rst:9
+msgid "Make a subscription from a sales order"
+msgstr ""
+
+#: ../../sales/invoicing/subscriptions.rst:11
 msgid ""
-"There are different ways to track the service related to a sales order or "
-"product sold. With the above configuration, you can only sell one support "
-"contract per order. If your customer orders several service contracts on "
-"timesheet, you will have to split the quotation into several orders."
+"From the sales app, create a quotation to the desired customer, and select "
+"the subscription product your previously created."
 msgstr ""
 
-#: ../../sales/invoicing/services/support.rst:72
+#: ../../sales/invoicing/subscriptions.rst:14
 msgid ""
-"Note that you can sell in different unit of measure than hours, example: "
-"days, pack of 40h, etc. To do that, just create a new unit of measure in the"
-" **Unit of Measure** category and set a conversion ratio compared to "
-"**Hours** (example: ``1 day = 8 hours``)."
+"When you confirm the sale the subscription will be created automatically. "
+"You will see a direct link from the sales order to the Subscription in the "
+"upper right corner."
 msgstr ""
-"Notez que vous pouvez vendre dans différentes unités de mesure que les "
-"heures, par exemple : jours, lot de 40h, etc. Pour ce faire, il suffit de "
-"créer une nouvelle unité de mesure dans la catégorie **Unité de mesure** et "
-"de fixer un taux de conversion par rapport à **Heures** (exemple: ``1 jour ="
-" 8 heures``)."
 
-#: ../../sales/invoicing/services/support.rst:78
-msgid "Managing support contract"
-msgstr "Gestion d'un contrat d'assistance"
+#: ../../sales/invoicing/time_materials.rst:3
+msgid "Invoice based on time and materials"
+msgstr ""
 
-#: ../../sales/invoicing/services/support.rst:81
-msgid "Quotations and Sales Orders"
-msgstr "Devis et bons de commande"
-
-#: ../../sales/invoicing/services/support.rst:83
+#: ../../sales/invoicing/time_materials.rst:5
 msgid ""
-"Once the product is created, you can create a quotation or a sales order "
-"with the related product. Once the quotation is confirmed and transformed "
-"into a sales order, your users will be able to record services related to "
-"this support contract using the timesheet application."
+"Time and Materials is generally used in projects in which it is not possible"
+" to accurately estimate the size of the project, or when it is expected that"
+" the project requirements would most likely change."
 msgstr ""
 
-#: ../../sales/invoicing/services/support.rst:93
-msgid "Timesheets"
-msgstr "Feuilles de temps"
-
-#: ../../sales/invoicing/services/support.rst:95
+#: ../../sales/invoicing/time_materials.rst:9
 msgid ""
-"To track the service you do on a specific contract, you should use the "
-"timesheet application. An analytic account related to the sale order has "
-"been automatically created (``SO009 - Agrolait`` on the screenshot here "
-"above), so you can start tracking services as soon as it has been sold."
-msgstr ""
-"Pour suivre le service que vous réalisez sur un contrat spécifique, vous "
-"devez utiliser l'application de feuille de temps. Un compte analytique lié "
-"au bon de commande a été créé automatiquement (``SO009 - Agrolait`` sur la "
-"capture d'écran ci-dessus), de sorte que vous pouvez commencer le suivi des "
-"services dès qu'il a été vendu."
-
-#: ../../sales/invoicing/services/support.rst:104
-msgid "Control delivered support on the sales order"
+"This is opposed to a fixed-price contract in which the owner agrees to pay "
+"the contractor a lump sum for the fulfillment of the contract no matter what"
+" the contractors pay their employees, sub-contractors, and suppliers."
 msgstr ""
 
-#: ../../sales/invoicing/services/support.rst:106
+#: ../../sales/invoicing/time_materials.rst:14
 msgid ""
-"From the **Sales** application, use the menu :menuselection:`Sales --> Sales"
-" Orders`  to control the progress of every order. On the sales order line "
-"related to the support contract, you should see the **Delivered Quantities**"
-" that are updated automatically, based on the number of hours in the "
-"timesheet."
+"For this documentation I will use the example of a consultant, you will need"
+" to invoice their time, their various expenses (transport, lodging, ...) and"
+" purchases."
 msgstr ""
-"Depuis l'application **Ventes**, utilisez le menu :menuselection:`Ventes -->"
-" Bons de commande` pour contrôler l'état d'avancement de chaque commande. "
-"Sur la ligne du bon de commande lié au contrat d'assistance, vous devriez "
-"voir les **Quantités Livrées** qui sont mises à jour automatiquement, en "
-"fonction du nombre d'heures dans les feuilles de temps."
 
-#: ../../sales/invoicing/services/support.rst:116
-msgid "Upselling and renewal"
-msgstr "Vente incitative et renouvellement"
+#: ../../sales/invoicing/time_materials.rst:19
+msgid "Invoice time configuration"
+msgstr ""
 
-#: ../../sales/invoicing/services/support.rst:118
+#: ../../sales/invoicing/time_materials.rst:21
 msgid ""
-"If the number of hours you performed on the support contract is bigger or "
-"equal to the number of hours the customer purchased, you are suggested to "
-"sell an extra contract to the customer since they used all their quota of "
-"service. Periodically (ideally once every two weeks), you should check the "
-"sales order that are in such a case. To do so, go to :menuselection:`Sales "
-"--> Invoicing --> Orders to Upsell`."
+"To keep track of progress in the project, you will need the *Project* app. "
+"Go to :menuselection:`Apps --> Project` to install it."
 msgstr ""
 
-#: ../../sales/invoicing/services/support.rst:127
+#: ../../sales/invoicing/time_materials.rst:24
 msgid ""
-"If you use Odoo CRM, a good practice is to create an opportunity for every "
-"sale order in upselling invoice status so that you easily track your "
-"upselling effort."
+"In *Project* you will use timesheets, to do so go to :menuselection:`Project"
+" --> Configuration --> Settings` and activate the *Timesheets* feature."
 msgstr ""
-"Si vous utilisez la CRM d'Odoo, une bonne pratique consiste à créer une "
-"opportunité pour chaque bon de commande en upselling afin que vous puissiez "
-"suivre facilement votre effort de vente incitative."
 
-#: ../../sales/invoicing/services/support.rst:131
+#: ../../sales/invoicing/time_materials.rst:32
+msgid "Invoice your time spent"
+msgstr ""
+
+#: ../../sales/invoicing/time_materials.rst:34
 msgid ""
-"If you sell an extra support contract, you can either add a new line on the "
-"existing sales order (thus, you continue to timesheet on the same order) or "
-"create a new order (thus, people will timesheet their hours on the new "
-"contract). To unmark the sales order as **Upselling**, you can set the sales"
-" order as done and it will disappear from your upselling list."
+"From a product page set as a service, you will find two options under the "
+"invoicing tab, select both *Timesheets on tasks* and *Create a task in a new"
+" project*."
 msgstr ""
 
-#: ../../sales/invoicing/services/support.rst:138
-msgid "Special Configuration"
-msgstr "Configuration Spéciale"
+#: ../../sales/invoicing/time_materials.rst:41
+msgid "You could also add the task to an existing project."
+msgstr ""
 
-#: ../../sales/invoicing/services/support.rst:140
+#: ../../sales/invoicing/time_materials.rst:43
 msgid ""
-"When creating the product form, you may set a different approach to track "
-"the service:"
+"Once confirming a sales order, you will now see two new buttons, one for the"
+" project overview and one for the current task."
 msgstr ""
-"Lors de la création de la fiche article, vous pouvez définir une approche "
-"différente pour suivre l'assistance :"
 
-#: ../../sales/invoicing/services/support.rst:143
+#: ../../sales/invoicing/time_materials.rst:49
 msgid ""
-"**Create task and track hours**: in this mode, a task is created for every "
-"sales order line. Then when you do the timesheet, you don't record hours on "
-"a sales order/contract, but you record hours on a task (that represents the "
-"contract). The advantage of this solution is that it allows to sell several "
-"service contracts within the same sales order."
+"You will directly be in the task if you click on it, you can also access it "
+"from the *Project* app."
 msgstr ""
 
-#: ../../sales/invoicing/services/support.rst:150
+#: ../../sales/invoicing/time_materials.rst:52
 msgid ""
-"**Manually**: you can use this mode if you don't record timesheets in Odoo. "
-"The number of hours you worked on a specific contract can be recorded "
-"manually on the sales order line directly, in the delivered quantity field."
+"Under timesheets, you can assign who works on it. You can or they can add "
+"how many hours they worked on the project so far."
 msgstr ""
 
-#: ../../sales/invoicing/services/support.rst:156
-msgid ":doc:`../../../inventory/settings/products/uom`"
-msgstr ":doc:`../../../inventory/settings/products/uom`"
+#: ../../sales/invoicing/time_materials.rst:58
+msgid "From the sales order, you can then invoice those hours."
+msgstr ""
+
+#: ../../sales/invoicing/time_materials.rst:90
+msgid ""
+"under the invoicing tab, select *Delivered quantities* and either *At cost* "
+"or *Sales price* as well depending if you want to invoice the cost of your "
+"expense or a previously agreed on sales price."
+msgstr ""
+
+#: ../../sales/invoicing/time_materials.rst:120
+msgid "Invoice purchases"
+msgstr ""
+
+#: ../../sales/invoicing/time_materials.rst:122
+msgid ""
+"The last thing you might need to add to the sale order is purchases made for"
+" it."
+msgstr ""
+
+#: ../../sales/invoicing/time_materials.rst:125
+msgid ""
+"You will need the *Purchase Analytics* feature, to activate it, go to "
+":menuselection:`Invoicing --> Configuration --> Settings` and select "
+"*Purchase Analytics*."
+msgstr ""
+
+#: ../../sales/invoicing/time_materials.rst:129
+msgid ""
+"While making the purchase order don't forget to add the right analytic "
+"account."
+msgstr ""
+
+#: ../../sales/invoicing/time_materials.rst:135
+msgid ""
+"Once the PO is confirmed and received, you can create the vendor bill, this "
+"will automatically add it to the SO where you can invoice it."
+msgstr ""
 
 #: ../../sales/products_prices.rst:3
 msgid "Products & Prices"
@@ -1469,10 +1112,6 @@ msgid ""
 "invoice location."
 msgstr ""
 
-#: ../../sales/send_quotations/different_addresses.rst:10
-msgid "Activate the feature"
-msgstr ""
-
 #: ../../sales/send_quotations/different_addresses.rst:12
 msgid ""
 "Go to :menuselection:`SALES --> Configuration --> Settings` and activate the"
@@ -1671,6 +1310,10 @@ msgid ""
 "complete quotation in no time."
 msgstr ""
 
+#: ../../sales/send_quotations/quote_template.rst:10
+msgid "Configuration"
+msgstr "Configuration"
+
 #: ../../sales/send_quotations/quote_template.rst:12
 msgid ""
 "For this feature to work, go to :menuselection:`Sales --> Configuration --> "
diff --git a/locale/nl/LC_MESSAGES/accounting.po b/locale/nl/LC_MESSAGES/accounting.po
index a0ab4b1f7..8842a78ed 100644
--- a/locale/nl/LC_MESSAGES/accounting.po
+++ b/locale/nl/LC_MESSAGES/accounting.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-27 11:08+0200\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Martien van Geene <martien.vangeene@gmail.com>, 2018\n"
+"Last-Translator: dpms <pieter.van.de.wygaert@telenet.be>, 2018\n"
 "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../../accounting.rst:5 ../../accounting/localizations/mexico.rst:281
+#: ../../accounting.rst:5 ../../accounting/localizations/mexico.rst:283
 msgid "Accounting"
 msgstr "Boekhouding"
 
@@ -28,7 +28,7 @@ msgstr "Bank & Kas"
 
 #: ../../accounting/bank/feeds.rst:3
 msgid "Bank Feeds"
-msgstr "Bank feeds"
+msgstr "Bank Feeds"
 
 #: ../../accounting/bank/feeds/coda.rst:3
 msgid "Import Coda statement files (Belgium only)"
@@ -74,6 +74,7 @@ msgstr ""
 #: ../../accounting/bank/reconciliation/use_cases.rst:20
 #: ../../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
@@ -91,19 +92,17 @@ msgstr ""
 #: ../../accounting/payables/pay/sepa.rst:26
 #: ../../accounting/payables/supplier_bills/bills_or_receipts.rst:30
 #: ../../accounting/payables/supplier_bills/manage.rst:31
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:15
 #: ../../accounting/receivables/customer_invoices/cash_rounding.rst:19
 #: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:24
 #: ../../accounting/receivables/customer_invoices/installment_plans.rst:20
 #: ../../accounting/receivables/customer_invoices/payment_terms.rst:19
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:31
 #: ../../accounting/receivables/customer_payments/check.rst:39
 #: ../../accounting/receivables/customer_payments/check.rst:103
 #: ../../accounting/receivables/customer_payments/credit_cards.rst:40
 #: ../../accounting/receivables/customer_payments/credit_cards.rst:113
 #: ../../accounting/receivables/customer_payments/payment_sepa.rst:19
 msgid "Configuration"
-msgstr "Instelling"
+msgstr "Instellingen"
 
 #: ../../accounting/bank/feeds/coda.rst:20
 msgid "Install the CODA feature"
@@ -801,7 +800,7 @@ msgstr ""
 "uur gesynchroniseerd worden."
 
 #: ../../accounting/bank/feeds/synchronize.rst:73
-#: ../../accounting/localizations/mexico.rst:531
+#: ../../accounting/localizations/mexico.rst:533
 msgid "FAQ"
 msgstr "FAQ"
 
@@ -1262,7 +1261,7 @@ msgstr ""
 #: ../../accounting/others/reporting/main_reports.rst:153
 #: ../../accounting/overview/main_concepts/memento.rst:177
 msgid "Bank Reconciliation"
-msgstr "Afletteren bank"
+msgstr "Bank afletteren"
 
 #: ../../accounting/bank/reconciliation/configure.rst:3
 msgid "Configure model of entries"
@@ -1558,6 +1557,18 @@ msgid ""
 "accounts from another company."
 msgstr ""
 
+#: ../../accounting/bank/setup/create_bank_account.rst:0
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+#: ../../accounting/others/configuration/account_type.rst:0
+msgid "Type"
+msgstr "Soort"
+
+#: ../../accounting/bank/setup/create_bank_account.rst:0
+msgid ""
+"Bank account type: Normal or IBAN. Inferred from the bank account number."
+msgstr ""
+"Bankrekening soort: Normaal of IBAN. Afgeleid vanuit het bankrekeningnummer."
+
 #: ../../accounting/bank/setup/create_bank_account.rst:0
 msgid "ABA/Routing"
 msgstr ""
@@ -1566,6 +1577,18 @@ msgstr ""
 msgid "American Bankers Association Routing Number"
 msgstr ""
 
+#: ../../accounting/bank/setup/create_bank_account.rst:0
+msgid "Account Holder Name"
+msgstr "Rekeninghouder naam"
+
+#: ../../accounting/bank/setup/create_bank_account.rst:0
+msgid ""
+"Account holder name, in case it is different than the name of the Account "
+"Holder"
+msgstr ""
+"Bankrekening naamhouder, indien de naam anders is dan de naam van de "
+"bankrekeninghouder"
+
 #: ../../accounting/bank/setup/create_bank_account.rst:49
 msgid "View *Bank Account* in our Online Demonstration"
 msgstr "Bekijk de *Bankrekening* in onze online demonstratie"
@@ -1781,7 +1804,7 @@ msgstr ""
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Active"
-msgstr "Actief"
+msgstr "Actie"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Set active to false to hide the Journal without removing it."
@@ -1789,11 +1812,6 @@ msgstr ""
 "Zet actief naar onwaar om het dagboek te verbergen zonder het te "
 "verwijderen."
 
-#: ../../accounting/bank/setup/manage_cash_register.rst:0
-#: ../../accounting/others/configuration/account_type.rst:0
-msgid "Type"
-msgstr "Type"
-
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Select 'Sale' for customer invoices journals."
 msgstr "Selecteer 'Verkoop' voor klant factuur dagboeken."
@@ -1838,7 +1856,7 @@ msgstr "Korte code"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "The journal entries of this journal will be named using this prefix."
-msgstr "De boekingen van dit dagboek worden aangeduid met deze prefix."
+msgstr "De boekingen van dit dagboek worden genaamd met de prefix."
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Next Number"
@@ -1846,7 +1864,8 @@ msgstr "Volgend nummer"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "The next sequence number will be used for the next invoice."
-msgstr "Het volgende reeksnummer welke gebruikt voor de volgende factuur."
+msgstr ""
+"Het volgende reeksnummer welke gebruikt wordt voor de volgende factuur."
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Entry Sequence"
@@ -1878,7 +1897,8 @@ msgstr "Creditfactuur's: Volgend nummer"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "The next sequence number will be used for the next credit note."
-msgstr "De volgende reeksnummer wordt gebruikt voor de volgende credit nota."
+msgstr ""
+"De volgende reeksnummer wordt gebruikt voor de volgende creditfactuur."
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Credit Note Entry Sequence"
@@ -1985,7 +2005,7 @@ msgstr ""
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Loss Account"
-msgstr "Verlies rekening"
+msgstr "Verliesrekening"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid ""
@@ -2061,7 +2081,7 @@ msgstr ""
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Amount Authorized Difference"
-msgstr "Toegestaan bedrag afwijking"
+msgstr "Toegestane bedrag afwijking"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid ""
@@ -2137,6 +2157,310 @@ msgstr ""
 msgid "Localizations"
 msgstr ""
 
+#: ../../accounting/localizations/colombia.rst:3
+msgid "Colombia"
+msgstr "Colombia"
+
+#: ../../accounting/localizations/colombia.rst:6
+#: ../../accounting/localizations/mexico.rst:14
+#: ../../accounting/others/taxes/B2B_B2C.rst:63
+msgid "Introduction"
+msgstr "Introductie"
+
+#: ../../accounting/localizations/colombia.rst:8
+msgid ""
+"Electronic invoicing for Colombia is available from Odoo 12 and requires the"
+" next modules:"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:11
+msgid ""
+"**l11n_co**: All the basic data to manage the accounting module, contains "
+"the default setup for: chart of accounts, taxes, retentions, identification "
+"document types"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:14
+msgid ""
+"**l10n_co_edi**: This module includes all the extra fields that are required"
+" for the Integration with Carvajal T&S and generate the electronic invoice, "
+"based on the DIAN legal requirements."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:19
+msgid "Workflow"
+msgstr "Workflow"
+
+#: ../../accounting/localizations/colombia.rst:28
+msgid "1. Install the Colombian localization modules"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:30
+msgid ""
+"For this, go in Apps and search for Colombia. Then click Install for the "
+"first two modules."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:37
+msgid "2. Configure credentials for Carvajal T&S web service"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:39
+msgid ""
+"Once that the modules are installed, in order to be able to connect with "
+"Carvajal T&S Web Service, it's necessary to configure the user and "
+"credentials, this information will be provided by Carvajal T&S."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:43
+#: ../../accounting/localizations/colombia.rst:64
+msgid ""
+"Go to :menuselection:`Accounting --> Configuration --> Settings` and look "
+"for the *Colombian Electronic Invoice* section."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:49
+msgid ""
+"Using the Testing mode it is possible to connect with a Carvajal T&S testing"
+" environment. This allows users to test the complete workflow and "
+"integration with the CEN Financiero portal, which is accessible here: "
+"https://cenfinancierolab.cen.biz"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:54
+msgid ""
+"Once that Odoo and Carvajal T&S is fully configured and ready for production"
+" the testing environment can be disabled."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:58
+msgid "3. Configure your report data"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:60
+msgid ""
+"As part of the configurable information that is sent in the XML, you can "
+"define the data for the fiscal section and the bank information in the PDF."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:71
+msgid "4. Configure data required in the XML"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:74
+msgid "4.1 Partner"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:77
+msgid "4.1.1 Identification"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:79
+msgid ""
+"As part of the Colombian Localization, the document types defined by the "
+"DIAN are now available on the Partner form. Colombian partners have to have "
+"their identification number and document type set:"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:86
+msgid ""
+"When the document type is RUT the identification number needs to be "
+"configured in Odoo including the verification digit, Odoo will split this "
+"number when the data to the third party vendor is sent."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:92
+msgid "4.1.2 Fiscal structure (RUT)"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:94
+msgid ""
+"The partner's responsibility codes (section 53 in the RUT document) are "
+"included as part of the electronic invoice module given that is part of the "
+"information required by the DIAN ."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:98
+msgid ""
+"These fields can be found in :menuselection:`Partner --> Sales & Purchase "
+"Tab --> Fiscal Information`"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:104
+msgid ""
+"Additionally two booleans fields were added in order to specify the fiscal "
+"regimen of the partner."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:108
+msgid "4.2 Taxes"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:110
+msgid ""
+"If your sales transactions include products with taxes, it's important to "
+"consider that an extra field *Value Type* needs to be configured per tax. "
+"This option is located in the Advanced Options tab."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:117
+msgid ""
+"Retention tax types (ICA, IVA, Fuente) are also included in the options to "
+"configure your taxes. This configuration is used in order to correctly "
+"display taxes in the invoice PDF."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:125
+msgid "4.3 Journals"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:127
+msgid ""
+"Once the DIAN has assigned the official sequence and prefix for the "
+"electronic invoice resolution, the Sales journals related to your invoice "
+"documents need to be updated in Odoo.  The sequence can be accessed using "
+"developer mode: :menuselection:`Accounting --> Settings --> Configuration "
+"Setting --> Journals`."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:136
+msgid ""
+"Once that the sequence is opened, the Prefix and Next Number fields should "
+"be configured and synchronized with the CEN Financiero."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:143
+msgid "4.4 Users"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:145
+msgid ""
+"The default template that is used by Odoo on the invoice PDF includes the "
+"job position of the salesperson, so these fields should be configured:"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:153
+#: ../../accounting/localizations/mexico.rst:196
+msgid "Usage and testing"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:156
+msgid "1. Invoice"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:158
+msgid ""
+"When all your master data and credentials has been configured, it's possible"
+" to start testing the electronic invoice workflow."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:162
+msgid "1.1 Invoice creation"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:164
+msgid ""
+"The functional workflow that takes place before an invoice validation "
+"doesn't change. The main changes that are introduced with the electronic "
+"invoice are the next fields:"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:171
+msgid "There are three types of documents:"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:173
+msgid ""
+"**Factura Electronica**: This is the regular type of document and its "
+"applicable for Invoices, Credit Notes and Debit Notes."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:175
+msgid ""
+"**Factura de Importación**: This should be selected for importation "
+"transactions."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:177
+msgid ""
+"**Factura de contingencia**: This is an exceptional type that is used as a "
+"manual backup in case that the company is not able to use the ERP and it's "
+"necessary to generate the invoice manually, when this invoice is added to "
+"the ERP, this invoice type should be selected."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:184
+msgid "1.2 Invoice validation"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:186
+msgid ""
+"After the invoice is validated an XML file is created and sent automatically"
+" to Carvajal, this file is displayed in the chatter."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:192
+msgid ""
+"An extra field is now displayed in \"Other Info\" tab with the name of the "
+"XML file. Additionally there is a second extra field that is displayed with "
+"the Electronic Invoice status, with the initial value \"In progress\":"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:201
+msgid "1.3 Reception of legal XML and PDF"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:203
+msgid ""
+"The electronic invoice vendor receives the XML file and proceeds to validate"
+" the structure and the information in it, if everything is correct the "
+"invoice status changes to \"Validated\" after using the \"Check Carvajal "
+"Status\" button in the Action dropdown. They then proceed to generate a "
+"Legal XML which includes a digital signature and a unique code (CUFE), a PDF"
+" invoice that includes a QR code and the CUFE is also generated."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:211
+msgid "After this:"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:213
+msgid ""
+"A ZIP containing the legal XML and the PDF is downloaded and displayed in "
+"the invoice chatter:"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:222
+msgid "The Electronic Invoice status changes to \"Accepted\""
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:225
+msgid "1.4 Common errors"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:227
+msgid ""
+"During the XML validation the most common errors are usually related to "
+"missing master data. In such cases, error messages are shown in the chatter "
+"after updating the electronic invoice status."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:234
+msgid ""
+"After the master data is corrected, it's possible to reprocess the XML with "
+"the new data and send the updated version, using the following button:"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:245
+msgid "2. Additional use cases"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:247
+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/france.rst:3
 msgid "France"
 msgstr "Frankrijk"
@@ -2556,11 +2880,6 @@ msgid ""
 "\"Mexico\" set."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:14
-#: ../../accounting/others/taxes/B2B_B2C.rst:63
-msgid "Introduction"
-msgstr "Introductie"
-
 #: ../../accounting/localizations/mexico.rst:16
 msgid "The mexican localization is a group of 3 modules:"
 msgstr ""
@@ -2628,11 +2947,11 @@ msgid ""
 " integrate with the normal invoicing flow in Odoo."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:66
+#: ../../accounting/localizations/mexico.rst:68
 msgid "3. Set you legal information in the company"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:68
+#: ../../accounting/localizations/mexico.rst:70
 msgid ""
 "First, make sure that your company is configured with the correct data. Go "
 "in :menuselection:`Settings --> Users --> Companies` and enter a valid "
@@ -2640,20 +2959,20 @@ msgid ""
 "position on your company’s contact."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:75
+#: ../../accounting/localizations/mexico.rst:77
 msgid ""
 "If you want use the Mexican localization on test mode, you can put any known"
 " address inside Mexico with all fields for the company address and set the "
 "vat to **ACO560518KW7**."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:83
+#: ../../accounting/localizations/mexico.rst:85
 msgid ""
 "4. Set the proper \"Fiscal Position\" on the partner that represent the "
 "company"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:85
+#: ../../accounting/localizations/mexico.rst:87
 msgid ""
 "Go In the same form where you are editing the company save the record in "
 "order to set this form as a readonly and on readonly view click on the "
@@ -2663,11 +2982,11 @@ msgid ""
 "the option)."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:92
+#: ../../accounting/localizations/mexico.rst:94
 msgid "5. Enabling CFDI Version 3.3"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:95
+#: ../../accounting/localizations/mexico.rst:97
 msgid ""
 "This steps are only necessary when you will enable the CFDI 3.3 (only "
 "available for V11.0 and above) if you do not have Version 11.0 or above on "
@@ -2675,11 +2994,11 @@ msgid ""
 "https://www.odoo.com/help."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:100
+#: ../../accounting/localizations/mexico.rst:102
 msgid "Enable debug mode:"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:105
+#: ../../accounting/localizations/mexico.rst:107
 msgid ""
 "Go and look the following technical parameter, on :menuselection:`Settings "
 "--> Technical --> Parameters --> System Parameters` and set the parameter "
@@ -2687,7 +3006,7 @@ msgid ""
 "name does not exist)."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:111
+#: ../../accounting/localizations/mexico.rst:113
 msgid ""
 "The CFDI 3.2 will be legally possible until November 30th 2017 enable the "
 "3.3 version will be a mandatory step to comply with the new `SAT "
@@ -2695,36 +3014,36 @@ msgid ""
 "the default behavior."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:120
+#: ../../accounting/localizations/mexico.rst:122
 msgid "Important considerations when yo enable the CFDI 3.3"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:122
-#: ../../accounting/localizations/mexico.rst:611
+#: ../../accounting/localizations/mexico.rst:124
+#: ../../accounting/localizations/mexico.rst:613
 msgid ""
 "Your tax which represent the VAT 16% and 0% must have the \"Factor Type\" "
 "field set to \"Tasa\"."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:130
+#: ../../accounting/localizations/mexico.rst:132
 msgid ""
 "You 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:137
+#: ../../accounting/localizations/mexico.rst:139
 msgid ""
 "All products must have for CFDI 3.3 the \"SAT code\" and the field "
 "\"Reference\" properly set, you can export them and re import them to do it "
 "faster."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:144
+#: ../../accounting/localizations/mexico.rst:146
 msgid "6. Configure the PAC in order to sign properly the invoices"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:146
+#: ../../accounting/localizations/mexico.rst:148
 msgid ""
 "To configure the EDI with the **PACs**, you can go in "
 ":menuselection:`Accounting --> Settings --> Electronic Invoicing (MX)`. You "
@@ -2732,14 +3051,14 @@ msgid ""
 "and then enter your PAC username and PAC password."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:152
+#: ../../accounting/localizations/mexico.rst:154
 msgid ""
 "Remember you must sign up in the refereed PAC before hand, that process can "
 "be done with the PAC itself on this case we will have two (2) availables "
 "`Finkok`_ and `Solución Factible`_."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:156
+#: ../../accounting/localizations/mexico.rst:158
 msgid ""
 "You must process your **Private Key (CSD)** with the SAT institution before "
 "follow this steps, if you do not have such information please try all the "
@@ -2748,163 +3067,159 @@ msgid ""
 "environment with real transactions."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:166
+#: ../../accounting/localizations/mexico.rst:168
 msgid ""
 "If you ticked the box *MX PAC test environment* there is no need to enter a "
 "PAC username or password."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:173
+#: ../../accounting/localizations/mexico.rst:175
 msgid ""
 "Here is a SAT certificate you can use if you want to use the *Test "
 "Environment* for the Mexican Accounting Localization."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:176
+#: ../../accounting/localizations/mexico.rst:178
 msgid "`Certificate`_"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:177
+#: ../../accounting/localizations/mexico.rst:179
 msgid "`Certificate Key`_"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:178
+#: ../../accounting/localizations/mexico.rst:180
 msgid "**Password :** 12345678a"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:181
+#: ../../accounting/localizations/mexico.rst:183
 msgid "7. Configure the tag in sales taxes"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:183
+#: ../../accounting/localizations/mexico.rst:185
 msgid ""
 "This tag is used to set the tax type code, transferred or withhold, "
 "applicable to the concept in the CFDI. So, if the tax is a sale tax the "
 "\"Tag\" field should be \"IVA\", \"ISR\" or \"IEPS\"."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:190
+#: ../../accounting/localizations/mexico.rst:192
 msgid ""
 "Note that the default taxes already has a tag assigned, but when you create "
 "a new tax you should choose a tag."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:194
-msgid "Usage and testing"
-msgstr ""
-
-#: ../../accounting/localizations/mexico.rst:197
+#: ../../accounting/localizations/mexico.rst:199
 msgid "Invoicing"
 msgstr "Boekhouding"
 
-#: ../../accounting/localizations/mexico.rst:199
+#: ../../accounting/localizations/mexico.rst:201
 msgid ""
 "To use the mexican invoicing you just need to do a normal invoice following "
 "the normal Odoo's behaviour."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:202
+#: ../../accounting/localizations/mexico.rst:204
 msgid ""
 "Once you validate your first invoice a correctly signed invoice should look "
 "like this:"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:209
+#: ../../accounting/localizations/mexico.rst:211
 msgid ""
 "You can generate the PDF just clicking on the Print button on the invoice or"
 " sending it by email following the normal process on odoo to send your "
 "invoice by email."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:216
+#: ../../accounting/localizations/mexico.rst:218
 msgid ""
 "Once you send the electronic invoice by email this is the way it should "
 "looks like."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:223
+#: ../../accounting/localizations/mexico.rst:225
 msgid "Cancelling invoices"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:225
+#: ../../accounting/localizations/mexico.rst:227
 msgid ""
 "The cancellation process is completely linked to the normal cancellation in "
 "Odoo."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:227
+#: ../../accounting/localizations/mexico.rst:229
 msgid "If the invoice is not paid."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:229
+#: ../../accounting/localizations/mexico.rst:231
 msgid "Go to to the customer invoice journal where the invoice belong to"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:237
+#: ../../accounting/localizations/mexico.rst:239
 msgid "Check the \"Allow cancelling entries\" field"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:242
+#: ../../accounting/localizations/mexico.rst:244
 msgid "Go back to your invoice and click on the button \"Cancel Invoice\""
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:247
+#: ../../accounting/localizations/mexico.rst:249
 msgid ""
 "For security reasons it is recommendable return the check on the to allow "
 "cancelling to false again, then go to the journal and un check such field."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:250
+#: ../../accounting/localizations/mexico.rst:252
 msgid "**Legal considerations**"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:252
+#: ../../accounting/localizations/mexico.rst:254
 msgid "A cancelled invoice will automatically cancelled on the SAT."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:253
+#: ../../accounting/localizations/mexico.rst:255
 msgid ""
 "If you retry to use the same invoice after cancelled, you will have as much "
 "cancelled CFDI as you tried, then all those xml are important to maintain a "
 "good control of the cancellation reasons."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:256
+#: ../../accounting/localizations/mexico.rst:258
 msgid ""
 "You must unlink all related payment done to an invoice on odoo before cancel"
 " such document, this payments must be cancelled to following the same "
 "approach but setting the \"Allow Cancel Entries\" in the payment itself."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:261
+#: ../../accounting/localizations/mexico.rst:263
 msgid "Payments (Just available for CFDI 3.3)"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:263
+#: ../../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."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:266
+#: ../../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\"."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:269
+#: ../../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:271
+#: ../../accounting/localizations/mexico.rst:273
 msgid "You must print the payment in order to retrieve the PDF properly."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:272
+#: ../../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 "
@@ -2913,66 +3228,66 @@ msgid ""
 "caso de anticipos recibidos**."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:277
+#: ../../accounting/localizations/mexico.rst:279
 msgid ""
 "Related to topic 4 it is blocked the possibility to create a Customer "
 "Payment without a proper invoice."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:282
+#: ../../accounting/localizations/mexico.rst:284
 msgid "The accounting for Mexico in odoo is composed by 3 reports:"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:284
+#: ../../accounting/localizations/mexico.rst:286
 msgid "Chart of Account (Called and shown as COA)."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:285
+#: ../../accounting/localizations/mexico.rst:287
 msgid "Electronic Trial Balance."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:286
+#: ../../accounting/localizations/mexico.rst:288
 msgid "DIOT report."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:288
+#: ../../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."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:291
+#: ../../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:297
+#: ../../accounting/localizations/mexico.rst:299
 msgid "Electronic Accounting (Requires Accounting App)"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:300
+#: ../../accounting/localizations/mexico.rst:302
 msgid "Electronic Chart of account CoA"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:302
+#: ../../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)**"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:309
+#: ../../accounting/localizations/mexico.rst:311
 msgid "**How to add new accounts?**"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:311
+#: ../../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."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:314
+#: ../../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 "
@@ -2982,17 +3297,17 @@ msgid ""
 " xml."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:324
+#: ../../accounting/localizations/mexico.rst:326
 msgid "**What is the meaning of the tag?**"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:326
+#: ../../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**."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:330
+#: ../../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 "
@@ -3000,11 +3315,11 @@ msgid ""
 "is not created you can create one on the fly."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:336
+#: ../../accounting/localizations/mexico.rst:338
 msgid "Electronic Trial Balance"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:338
+#: ../../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 "
@@ -3013,28 +3328,28 @@ msgid ""
 "the previous selection of the period you want to export."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:347
+#: ../../accounting/localizations/mexico.rst:349
 msgid ""
 "All the normal auditory and analysis features are available here also as any"
 " regular Odoo Report."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:351
+#: ../../accounting/localizations/mexico.rst:353
 msgid "DIOT Report (Requires Accounting App)"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:353
+#: ../../accounting/localizations/mexico.rst:355
 msgid "**What is the DIOT and the importance of presenting it SAT**"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:355
+#: ../../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."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:358
+#: ../../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 "
@@ -3042,25 +3357,25 @@ msgid ""
 "the same, with our providers."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:363
+#: ../../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:"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:367
+#: ../../accounting/localizations/mexico.rst:369
 msgid "**When to file the DIOT and in what format?**"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:369
+#: ../../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:373
+#: ../../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 "
@@ -3068,24 +3383,24 @@ msgid ""
 "to said data."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:378
+#: ../../accounting/localizations/mexico.rst:380
 msgid "**Where the DIOT is presented?**"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:380
+#: ../../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."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:384
+#: ../../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."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:387
+#: ../../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 "
@@ -3094,18 +3409,18 @@ msgid ""
 "that you will still have these records and of course, your CD or USB."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:393
+#: ../../accounting/localizations/mexico.rst:395
 msgid "**One more fact to know: the Batch load?**"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:395
+#: ../../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:"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:399
+#: ../../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 "
@@ -3115,7 +3430,7 @@ msgid ""
 "integration for the presentation in time and form to the SAT."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:406
+#: ../../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 "
@@ -3123,41 +3438,41 @@ msgid ""
 "Third Parties."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:411
+#: ../../accounting/localizations/mexico.rst:413
 msgid "You can find the `official information here`_."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:413
+#: ../../accounting/localizations/mexico.rst:415
 msgid "**How Generate this report in odoo?**"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:415
+#: ../../accounting/localizations/mexico.rst:417
 msgid ""
 "Go to  :menuselection:`Accounting --> Reports --> Mexico --> Transactions "
 "with third partied (DIOT)`."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:420
+#: ../../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."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:426
+#: ../../accounting/localizations/mexico.rst:428
 msgid "Click on \"Export (TXT)."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:431
+#: ../../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."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:435
+#: ../../accounting/localizations/mexico.rst:437
 msgid "Important considerations on your Supplier and Invice data for the DIOT"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:437
+#: ../../accounting/localizations/mexico.rst:439
 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 "
@@ -3166,34 +3481,34 @@ msgid ""
 " suppliers."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:445
+#: ../../accounting/localizations/mexico.rst:447
 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:448
+#: ../../accounting/localizations/mexico.rst:450
 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:451
+#: ../../accounting/localizations/mexico.rst:453
 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:454
+#: ../../accounting/localizations/mexico.rst:456
 msgid ""
 "Remember this report only shows the Supplier Invoices that were actually "
 "paid."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:456
+#: ../../accounting/localizations/mexico.rst:458
 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 "
@@ -3203,26 +3518,26 @@ msgid ""
 "your partners are correctly set."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:467
+#: ../../accounting/localizations/mexico.rst:469
 msgid "Extra Recommended features"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:470
+#: ../../accounting/localizations/mexico.rst:472
 msgid "Contact Module (Free)"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:472
+#: ../../accounting/localizations/mexico.rst:474
 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:477
+#: ../../accounting/localizations/mexico.rst:479
 msgid "Multi currency (Requires Accounting App)"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:479
+#: ../../accounting/localizations/mexico.rst:481
 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"
@@ -3232,17 +3547,17 @@ msgid ""
 "information daily in the system manually."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:486
+#: ../../accounting/localizations/mexico.rst:488
 msgid "Go to settings and enable the multi currency feature."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:492
+#: ../../accounting/localizations/mexico.rst:494
 msgid ""
 "Enabling Explicit errors on the CFDI using the XSD local validator (CFDI "
 "3.3)"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:494
+#: ../../accounting/localizations/mexico.rst:496
 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 "
@@ -3250,72 +3565,72 @@ msgid ""
 "debug mode enabled)."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:499
+#: ../../accounting/localizations/mexico.rst:501
 msgid ""
 "Go to :menuselection:`Settings --> Technical --> Actions --> Server Actions`"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:500
+#: ../../accounting/localizations/mexico.rst:502
 msgid "Look for the Action called \"Download XSD files to CFDI\""
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:501
+#: ../../accounting/localizations/mexico.rst:503
 msgid "Click on button \"Create Contextual Action\""
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:502
+#: ../../accounting/localizations/mexico.rst:504
 msgid ""
 "Go to the company form :menuselection:`Settings --> Users&Companies --> "
 "Companies`"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:503
+#: ../../accounting/localizations/mexico.rst:505
 msgid "Open any company you have."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:504
-#: ../../accounting/localizations/mexico.rst:527
+#: ../../accounting/localizations/mexico.rst:506
+#: ../../accounting/localizations/mexico.rst:529
 msgid "Click on \"Action\" and then on \"Download XSD file to CFDI\"."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:509
+#: ../../accounting/localizations/mexico.rst:511
 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:514
+#: ../../accounting/localizations/mexico.rst:516
 msgid "If you see an error like this:"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:516
+#: ../../accounting/localizations/mexico.rst:518
 msgid "The cfdi generated is not valid"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:518
+#: ../../accounting/localizations/mexico.rst:520
 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:522
+#: ../../accounting/localizations/mexico.rst:524
 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:526
+#: ../../accounting/localizations/mexico.rst:528
 msgid "Go to the company in which the error occurs."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:533
+#: ../../accounting/localizations/mexico.rst:535
 msgid "**Error message** (Only applicable on CFDI 3.3):"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:535
+#: ../../accounting/localizations/mexico.rst:537
 msgid ""
 ":9:0:ERROR:SCHEMASV:SCHEMAV_CVC_MINLENGTH_VALID: Element "
 "'{http://www.sat.gob.mx/cfd/3}Concepto', attribute 'NoIdentificacion': "
@@ -3323,43 +3638,43 @@ msgid ""
 "allowed minimum length of '1'."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:537
+#: ../../accounting/localizations/mexico.rst:539
 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:540
+#: ../../accounting/localizations/mexico.rst:542
 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:543
-#: ../../accounting/localizations/mexico.rst:568
-#: ../../accounting/localizations/mexico.rst:578
-#: ../../accounting/localizations/mexico.rst:591
-#: ../../accounting/localizations/mexico.rst:602
+#: ../../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
 msgid "**Error message**:"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:545
+#: ../../accounting/localizations/mexico.rst:547
 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:547
+#: ../../accounting/localizations/mexico.rst:549
 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:550
+#: ../../accounting/localizations/mexico.rst:552
 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"
@@ -3369,20 +3684,20 @@ msgid ""
 "considerations about fiscal positions."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:557
+#: ../../accounting/localizations/mexico.rst:559
 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:565
+#: ../../accounting/localizations/mexico.rst:567
 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:570
+#: ../../accounting/localizations/mexico.rst:572
 msgid ""
 ":2:0:ERROR:SCHEMASV:SCHEMAV_CVC_ENUMERATION_VALID: Element "
 "'{http://www.sat.gob.mx/cfd/3}Comprobante', attribute 'FormaPago': [facet "
@@ -3391,11 +3706,11 @@ msgid ""
 "'26', '27', '28', '29', '30', '99'}"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:573
+#: ../../accounting/localizations/mexico.rst:575
 msgid "**Solution:** The payment method is required on your invoice."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:580
+#: ../../accounting/localizations/mexico.rst:582
 msgid ""
 ":2:0:ERROR:SCHEMASV:SCHEMAV_CVC_ENUMERATION_VALID: Element "
 "'{http://www.sat.gob.mx/cfd/3}Comprobante', attribute 'LugarExpedicion': "
@@ -3409,16 +3724,16 @@ msgid ""
 "missing."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:585
+#: ../../accounting/localizations/mexico.rst:587
 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 `3. Set you legal "
-"information in the company`."
+"the required fields for your address following the step :ref:`mx-legal-"
+"info`."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:593
+#: ../../accounting/localizations/mexico.rst:595
 msgid ""
 ":2:0:ERROR:SCHEMASV:SCHEMAV_CVC_DATATYPE_VALID_1_2_1: Element "
 "'{http://www.sat.gob.mx/cfd/3}Comprobante', attribute 'LugarExpedicion': '' "
@@ -3426,13 +3741,13 @@ msgid ""
 "'{http://www.sat.gob.mx/sitio_internet/cfd/catalogos}c_CodigoPostal'."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:596
+#: ../../accounting/localizations/mexico.rst:598
 msgid ""
 "**Solution:** The postal code on your company address is not a valid one for"
 " Mexico, fix it."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:604
+#: ../../accounting/localizations/mexico.rst:606
 msgid ""
 ":18:0:ERROR:SCHEMASV:SCHEMAV_CVC_COMPLEX_TYPE_4: Element "
 "'{http://www.sat.gob.mx/cfd/3}Traslado': The attribute 'TipoFactor' is "
@@ -3441,7 +3756,7 @@ msgid ""
 "is required but missing.\", '')"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:608
+#: ../../accounting/localizations/mexico.rst:610
 msgid ""
 "**Solution:** Set the mexican name for the tax 0% and 16% in your system and"
 " used on the invoice."
@@ -4006,128 +4321,6 @@ msgstr ""
 msgid "Explanation of the fields:"
 msgstr "Verklaring van de velden:"
 
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Status"
-msgstr "Status"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "When an asset is created, the status is 'Draft'."
-msgstr ""
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid ""
-"If the asset is confirmed, the status goes in 'Running' and the depreciation"
-" lines can be posted in the accounting."
-msgstr ""
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid ""
-"You can manually close an asset when the depreciation is over. If the last "
-"line of depreciation is posted, the asset automatically goes in that status."
-msgstr ""
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Category"
-msgstr "Categorie"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Category of asset"
-msgstr "Categorie van activa"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Date"
-msgstr "Datum"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Date of asset"
-msgstr "Datum van activa"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Gross Value"
-msgstr "Bruto waarde"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Gross value of asset"
-msgstr "Bruto waarde van activa"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Salvage Value"
-msgstr "Restwaarde"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "It is the amount you plan to have that you cannot depreciate."
-msgstr ""
-"Het is het bedrag dat u van plan bent te hebben, dat u niet kunt "
-"afschrijven."
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Computation Method"
-msgstr "Berekeningsmethode"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Choose the method to use to compute the amount of depreciation lines."
-msgstr ""
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid ""
-"* Linear: Calculated on basis of: Gross Value / Number of Depreciations"
-msgstr ""
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid ""
-"* Degressive: Calculated on basis of: Residual Value * Degressive Factor"
-msgstr ""
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Time Method Based On"
-msgstr "Tijdmethode gebaseerd op"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Choose the method to use to compute the dates and number of entries."
-msgstr ""
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid ""
-"* Number of Entries: Fix the number of entries and the time between 2 "
-"depreciations."
-msgstr ""
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid ""
-"* Ending Date: Choose the time between 2 depreciations and the date the "
-"depreciations won't go beyond."
-msgstr ""
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Prorata Temporis"
-msgstr "Prorata Temporis"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid ""
-"Indicates that the first depreciation entry for this asset have to be done "
-"from the purchase date instead of the first January / Start date of fiscal "
-"year"
-msgstr ""
-"Geeft aan dat de eerste afschrijving mutatie voor deze activa moet gedaan "
-"zijn van de inkoopdatum in plaats van de eerste van januari / startdatum van"
-" het fiscale jaar"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Number of Depreciations"
-msgstr "Aantal afschrijvingen"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "The number of depreciations needed to depreciate your asset"
-msgstr "Het aantal afschrijvingen nodig om de activa af te schrijven."
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Number of Months in a Period"
-msgstr "Aantal maanden in de periode"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "The amount of time between two depreciations, in months"
-msgstr "De hoeveelheid tijd tussen twee afschrijvingen, in maanden."
-
 #: ../../accounting/others/adviser/assets.rst:88
 msgid "Try creating an *Asset* in our online demonstration"
 msgstr ""
@@ -4372,22 +4565,18 @@ msgstr ""
 msgid ":doc:`../../receivables/customer_invoices/overview`"
 msgstr ":doc:`../../receivables/customer_invoices/overview`"
 
-#: ../../accounting/others/adviser/budget.rst:128
-msgid ":doc:`../../../purchase/overview/process/from_po_to_invoice`"
-msgstr ":doc:`../../../purchase/overview/process/from_po_to_invoice`"
-
-#: ../../accounting/others/adviser/budget.rst:130
+#: ../../accounting/others/adviser/budget.rst:129
 msgid "Go back in the budget list and find the Smith Project."
 msgstr "Ga terug in de budgetlijst en zoek het Smith project."
 
-#: ../../accounting/others/adviser/budget.rst:132
+#: ../../accounting/others/adviser/budget.rst:131
 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:141
+#: ../../accounting/others/adviser/budget.rst:140
 msgid ""
 "The theoretical amount represents the amount of money you theoretically "
 "could have spend / should have received in function of the date. When your "
@@ -4540,6 +4729,37 @@ msgid ""
 "reporting a 0 balance."
 msgstr ""
 
+#: ../../accounting/others/adviser/fiscalyear.rst:93
+msgid ":doc:`../configuration/fiscal_year`"
+msgstr ""
+
+#: ../../accounting/others/adviser/reverse_entry.rst:3
+msgid "Reverse an accounting entry automatically"
+msgstr ""
+
+#: ../../accounting/others/adviser/reverse_entry.rst:5
+msgid ""
+"You may want to automatically reverse an accounting entry at a specific "
+"date."
+msgstr ""
+
+#: ../../accounting/others/adviser/reverse_entry.rst:8
+msgid ""
+"This is, for example, used when you make a provision (e.g. provision for bad"
+" debt). When making the accounting entry for the provision, the amount you "
+"entered is only an estimated amount. You will only be sure of the amount at "
+"the end of the fiscal year. That's why, at that point, you want the "
+"accounting entry to be reversed to be able to enter the real loss that "
+"occurred."
+msgstr ""
+
+#: ../../accounting/others/adviser/reverse_entry.rst:15
+msgid ""
+"For this, you just have to tick the box \"Reverse Automatically\" on the "
+"journal entry and to define a reversal date. The accounting entry will be "
+"reversed at that date."
+msgstr ""
+
 #: ../../accounting/others/analytic.rst:3
 msgid "Analytic"
 msgstr "Kostenplaats"
@@ -4665,25 +4885,23 @@ msgstr "Inkoopproduct"
 #: ../../accounting/others/analytic/purchases_expenses.rst:104
 msgid ""
 "We also need to buy a software for our customers. In the purchase app create"
-" a purchase order for the software product. (please refer to the following "
-"document: :doc:`../../../purchase/overview/process/from_po_to_invoice`). "
-"Within the line we can link the product's cost with the analytical account. "
-"Specify the order line and select the correct analytical account. Confirm "
-"the sale."
+" a purchase order for the software product. Within the line we can link the "
+"product's cost with the analytical account. Specify the order line and "
+"select the correct analytical account. Confirm the sale."
 msgstr ""
 
-#: ../../accounting/others/analytic/purchases_expenses.rst:114
+#: ../../accounting/others/analytic/purchases_expenses.rst:113
 msgid ""
 "Accept the delivery and enter the invoice. Once the invoice is entered the "
 "cost price (**Vendor Price** field) will be booked in the analytical "
 "account."
 msgstr ""
 
-#: ../../accounting/others/analytic/purchases_expenses.rst:118
+#: ../../accounting/others/analytic/purchases_expenses.rst:117
 msgid "Subcontracting"
 msgstr ""
 
-#: ../../accounting/others/analytic/purchases_expenses.rst:120
+#: ../../accounting/others/analytic/purchases_expenses.rst:119
 msgid ""
 "The purchase module can be used in the same way as seen previously to handle"
 " subcontracting. if we purchase a service from another company we can re "
@@ -4691,33 +4909,33 @@ msgid ""
 "analytical account. We simply need to create the correct vendors product."
 msgstr ""
 
-#: ../../accounting/others/analytic/purchases_expenses.rst:128
+#: ../../accounting/others/analytic/purchases_expenses.rst:127
 msgid "You can also track cost with timesheets, see: :doc:`timesheets`"
 msgstr ""
 
-#: ../../accounting/others/analytic/purchases_expenses.rst:131
+#: ../../accounting/others/analytic/purchases_expenses.rst:130
 msgid "Track costs in accounting"
 msgstr ""
 
-#: ../../accounting/others/analytic/purchases_expenses.rst:133
+#: ../../accounting/others/analytic/purchases_expenses.rst:132
 msgid ""
 "Now that everything is booked and points to the analytical account. Simply "
 "open it to check the costs related to that account."
 msgstr ""
 
-#: ../../accounting/others/analytic/purchases_expenses.rst:136
+#: ../../accounting/others/analytic/purchases_expenses.rst:135
 msgid ""
 "Enter the accounting module, click on :menuselection:`Advisers --> Analytic "
 "Accounts --> Open Charts`."
 msgstr ""
 
-#: ../../accounting/others/analytic/purchases_expenses.rst:139
+#: ../../accounting/others/analytic/purchases_expenses.rst:138
 msgid ""
 "Select \"consulting pack - Smith\" and click on the cost and revenue button "
 "to have an overview of all cost linked to the account."
 msgstr ""
 
-#: ../../accounting/others/analytic/purchases_expenses.rst:147
+#: ../../accounting/others/analytic/purchases_expenses.rst:146
 msgid ""
 "If you would like to have the revenue as well you should invoice the "
 "Consulting Pack in the Invoice menu and link the invoice line to this same "
@@ -5533,7 +5751,7 @@ msgstr "Bank en kas"
 
 #: ../../accounting/others/configuration/account_type.rst:33
 msgid "Current Assets"
-msgstr "Vlottende activa"
+msgstr "Huidige activa"
 
 #: ../../accounting/others/configuration/account_type.rst:35
 msgid "Non-current Assets"
@@ -5541,7 +5759,7 @@ msgstr "Langlopende activa"
 
 #: ../../accounting/others/configuration/account_type.rst:37
 msgid "Prepayments"
-msgstr "Vooruitbetaalde kosten"
+msgstr "Voorafbetalingen"
 
 #: ../../accounting/others/configuration/account_type.rst:39
 msgid "Fixed Assets"
@@ -5549,19 +5767,19 @@ msgstr "Vaste activa"
 
 #: ../../accounting/others/configuration/account_type.rst:41
 msgid "Current Liabilities"
-msgstr "Kort vreemd vermogen"
+msgstr "Huidige passiva"
 
 #: ../../accounting/others/configuration/account_type.rst:43
 msgid "Non-current Liabilities"
-msgstr "Lang vreemd vermogen"
+msgstr "Langlopende passiva"
 
 #: ../../accounting/others/configuration/account_type.rst:45
 msgid "Equity"
-msgstr "Eigen vermogen"
+msgstr "Vermogen"
 
 #: ../../accounting/others/configuration/account_type.rst:47
 msgid "Current Year Earnings"
-msgstr "Huidige jaarwinst"
+msgstr "Huidige jaaromzet"
 
 #: ../../accounting/others/configuration/account_type.rst:49
 msgid "Other Income"
@@ -5668,13 +5886,53 @@ msgid ""
 "Check this box if this account allows invoices & payments matching of "
 "journal items."
 msgstr ""
-"Vink deze optie aan als u deze rekening wilt toestaan bij het afletteren van"
-" facturen & betalingen."
+"Vink deze optie aan als u deze rekening wilt toestaan op facturen & "
+"betalingen te matchen."
 
 #: ../../accounting/others/configuration/account_type.rst:86
 msgid "View *Create Account* in our Online Demonstration"
 msgstr ""
 
+#: ../../accounting/others/configuration/fiscal_year.rst:3
+msgid "Manage Fiscal Years"
+msgstr ""
+
+#: ../../accounting/others/configuration/fiscal_year.rst:5
+msgid ""
+"In most cases, the fiscal years last 12 months. If it is your case, you just"
+" have to define what is the last day of your fiscal year in the accounting "
+"settings. By default, it is set on the 31st December."
+msgstr ""
+
+#: ../../accounting/others/configuration/fiscal_year.rst:12
+msgid ""
+"However, there might be some exceptions. For example, if it is the first "
+"fiscal year of your business, it could last more or less than 12 months. In "
+"this case, some additional configuration is required."
+msgstr ""
+
+#: ../../accounting/others/configuration/fiscal_year.rst:16
+msgid ""
+"Go in :menuselection:`accounting --> configuration --> settings` and "
+"activate the fiscal years."
+msgstr ""
+
+#: ../../accounting/others/configuration/fiscal_year.rst:22
+msgid ""
+"You can then configure your fiscal years in :menuselection:`accounting --> "
+"configuration --> fiscal years`."
+msgstr ""
+
+#: ../../accounting/others/configuration/fiscal_year.rst:29
+msgid ""
+"You only have to create fiscal years if they last more or less than 12 "
+"months."
+msgstr ""
+
+#: ../../accounting/others/configuration/fiscal_year.rst:34
+msgid ":doc:`../adviser/fiscalyear`"
+msgstr ""
+
 #: ../../accounting/others/inventory.rst:3
 msgid "Inventory"
 msgstr "Voorraad"
@@ -6212,6 +6470,7 @@ msgstr ""
 
 #: ../../accounting/others/multicurrencies/exchange.rst:109
 #: ../../accounting/payables/pay/multiple.rst:153
+#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:68
 msgid ":doc:`../../bank/reconciliation/configure`"
 msgstr ":doc:`../../bank/reconciliation/configure`"
 
@@ -6481,7 +6740,7 @@ msgstr "Facturen"
 #: ../../accounting/others/multicurrencies/invoices_payments.rst:64
 #: ../../accounting/payables/supplier_bills.rst:3
 msgid "Vendor Bills"
-msgstr "Facturen"
+msgstr "Leveranciersfacturen"
 
 #: ../../accounting/others/multicurrencies/invoices_payments.rst:74
 msgid "Multi-currency Payments"
@@ -6872,7 +7131,7 @@ msgstr ""
 
 #: ../../accounting/others/reporting/main_reports.rst:115
 msgid "Aged Payable"
-msgstr "Ouderdom leveranciersfacturen"
+msgstr "Ouderdomsanalyse leveranciersfacturen"
 
 #: ../../accounting/others/reporting/main_reports.rst:117
 msgid ""
@@ -6883,7 +7142,7 @@ msgstr ""
 
 #: ../../accounting/others/reporting/main_reports.rst:125
 msgid "Aged Receivable"
-msgstr "Ouderdom klantfacturen"
+msgstr "Ouderdomsanalyse klantfacturen"
 
 #: ../../accounting/others/reporting/main_reports.rst:127
 msgid ""
@@ -6893,7 +7152,7 @@ msgstr ""
 
 #: ../../accounting/others/reporting/main_reports.rst:134
 msgid "Cash Flow Statement"
-msgstr "Kasstroomrapportage"
+msgstr "Cashflow"
 
 #: ../../accounting/others/reporting/main_reports.rst:136
 msgid ""
@@ -7483,7 +7742,7 @@ msgstr ""
 
 #: ../../accounting/others/taxes/cash_basis_taxes.rst:72
 msgid "Tax Cash Basis Journal"
-msgstr "BTW kasbasis dagboek"
+msgstr "BTW kasstelsel dagboek"
 
 #: ../../accounting/others/taxes/cash_basis_taxes.rst:78
 msgid "Tax Received Account $15"
@@ -8948,7 +9207,6 @@ msgid "15"
 msgstr "15"
 
 #: ../../accounting/overview/process_overview/customer_invoice.rst:117
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:89
 msgid "Payment"
 msgstr "Betaling"
 
@@ -9698,7 +9956,7 @@ msgstr ""
 
 #: ../../accounting/payables/pay.rst:3
 msgid "Vendor Payments"
-msgstr ""
+msgstr "Leverancier betalingen"
 
 #: ../../accounting/payables/pay/check.rst:3
 msgid "Pay by Checks"
@@ -9873,7 +10131,7 @@ msgid ""
 "printed check paper already has numbers or if the current numbering is "
 "wrong, you can change it in the journal configuration page."
 msgstr ""
-"Het geselecteerde dagboek is geconfigureerd om cheque nummers te printen. "
+"Het geselecteerde dagboek is geconfigureerd om chequenummers af te drukken. "
 "Als uw voorgedrukt papier al nummers bevat of als het huidige nummer fout is"
 " kan u dit wijzigen op de dagboek configuratie pagina."
 
@@ -10311,7 +10569,6 @@ msgstr ""
 
 #: ../../accounting/payables/pay/sepa.rst:132
 #: ../../accounting/receivables/customer_payments/credit_cards.rst:168
-#: ../../accounting/receivables/customer_payments/followup.rst:168
 #: ../../accounting/receivables/customer_payments/recording.rst:129
 msgid ":doc:`check`"
 msgstr ":doc:`check`"
@@ -10756,174 +11013,81 @@ msgid "Customer Invoices"
 msgstr "Klantfacturen"
 
 #: ../../accounting/receivables/customer_invoices/cash_discounts.rst:3
-msgid "How to setup cash discounts?"
-msgstr "Hoe contante kortingen op te zetten?"
+msgid "Offer cash discounts"
+msgstr ""
 
 #: ../../accounting/receivables/customer_invoices/cash_discounts.rst:5
 msgid ""
-"Cash discounts are an incentive (usually a small percentage) that you offer "
-"to customers in return for paying a bill owed before the scheduled due date."
-" If used properly, cash discounts improve the Days Sales Outstanding aspect "
-"of a business's cash conversion cycle."
+"Cash discounts are incentives you can offer to customers to motivate them to"
+" pay within a specific time frame. For instance, you offer a 2% discount if "
+"the customer pays you within the first 5 days of the invoice, when it is due"
+" in 30 days. This approach can greatly improve your average collection "
+"period."
 msgstr ""
 
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:10
-msgid ""
-"For example, a typical cash discount would be: you offer a 2% discount on an"
-" invoice due in 30 days if the customer were to pay within the first 5 days "
-"of receiving the invoice."
+#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:12
+msgid "Set up a cash discount"
 msgstr ""
 
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:18
-msgid "Payment terms"
-msgstr "Betalingstermijnen"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:20
+#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:14
 msgid ""
-"In order to manage cash discounts, we will use the payment terms concept of "
-"Odoo (From the Accounting module, go to :menuselection:`Configuration --> "
-"Management --> Payment terms --> Create`)."
+"To set up a cash discount, go to :menuselection:`Accounting --> "
+"Configuration --> Management --> Payment Terms` and click on *Create*. Add a"
+" *Percent* type of term with a corresponding value (e.g. 98% of the total "
+"price for a 2% discount) and the number of days during which the offer is "
+"valid. You can also change the default balance term if needed."
 msgstr ""
 
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:24
-msgid ""
-"Let's start with the above example: a 2% discount on an invoice due in 30 "
-"days if the customer were to pay within the first 5 days."
+#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:25
+msgid "Start offering the cash discount"
 msgstr ""
 
 #: ../../accounting/receivables/customer_invoices/cash_discounts.rst:27
 msgid ""
-"A typical payment term of 30 days would have only one installment: balance "
-"in 30 days. But, in order to configure the cash discount, you can configure "
-"the payment term with two installments:"
+"Now, you can create a customer invoice and select the cash discount payment "
+"term you added. Once the invoice is validated, Odoo will automatically split"
+" the account receivables part of the journal entry into two installments "
+"having different due dates. Since the discounted price is already "
+"calculated, your payment controls will be simplified."
 msgstr ""
 
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:31
-msgid "98% within 5 days"
-msgstr "98% binnen 5 dagen"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:32
-msgid "balance within 30 days"
-msgstr "balans binnen 30 dagen"
-
 #: ../../accounting/receivables/customer_invoices/cash_discounts.rst:37
+msgid "Grant the cash discount"
+msgstr ""
+
+#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:39
 msgid ""
-"To make it clear that it's not a payment term but a cash discount, don't "
-"forget to set a clear description that will appear on the invoice: Invoice "
-"is due within 30 days, but you can benefit from a 2% cash discount if you "
-"pay within 5 days."
+"The customer fulfilled the payment terms and therefore benefits from the "
+"cash discount. When you process the bank statement, match the payment with "
+"the related journal entry. Then, select the remaining cash discount and "
+"click on *Create Write-off* to reconcile it."
 msgstr ""
 
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:43
-msgid "Bank reconciliation model"
-msgstr ""
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:45
+#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:48
 msgid ""
-"In order to speed up the bank reconciliation process, we can create a model "
-"of entry for all cash discounts. To do that, from the Accounting application"
-" dashboard, click on the \"More\" link on the bank and choose the option "
-"\"Reconciliation Models\"."
-msgstr ""
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:53
-msgid "Create a new model for cash discounts as follow:"
-msgstr "Maak als volgt een nieuw model voor contante kortingen:"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:55
-msgid "**Button Label**: Cash Discount"
+"You can also create a dedicated reconciliation model to make the process "
+"easier. In this case, you should add a tax to the model based on the taxes "
+"applied to your invoices. This means that if you handle multiple tax rates, "
+"you need to create several reconciliation models. Note that depending on "
+"your localisation, you might already have a Cash Discount model available by"
+" default."
 msgstr ""
 
 #: ../../accounting/receivables/customer_invoices/cash_discounts.rst:56
-msgid "**Account**: Cash Discount (according to your country)"
+msgid "Register the full payment"
 msgstr ""
 
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:57
-msgid "**Amount Type**: Percentage"
-msgstr "**Bedrag type**: Percentage"
-
 #: ../../accounting/receivables/customer_invoices/cash_discounts.rst:58
-msgid "**Amount**: 100%"
-msgstr "**Bedrag**: 100%"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:60
-msgid "**Taxes**: depending on your country, you may put a tax on the cash"
+msgid ""
+"In this case, the customer has not fulfilled the payment term and cannot "
+"benefit from the cash discount. When you process the bank statement, match "
+"the payment with the two related journal entries."
 msgstr ""
 
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:60
-msgid "discount if taxes have to be deduced"
-msgstr "korting indien belastingen moeten ingehouden worden"
-
 #: ../../accounting/receivables/customer_invoices/cash_discounts.rst:67
-msgid ""
-"Even if it's a 2% cash discount, set a 100% amount on the reconciliation "
-"model as it means 100% of the remaining balance (the 2%). You can use the "
-"same reconciliation model for all your cash discount. No need to create a "
-"model per payment term."
+msgid ":doc:`../../receivables/customer_invoices/payment_terms`"
 msgstr ""
 
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:73
-msgid "Creating an invoice with a cash discount"
-msgstr "Een factuur aanmaken met contante korting"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:75
-msgid ""
-"When you create a customer invoice, set the right payment term \"30 days, 2%"
-" cash discount\" right after having selected the customer."
-msgstr ""
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:81
-msgid ""
-"Once the invoice is validated, Odoo will automatically split the account "
-"receivable part of the journal entry with two installments having a "
-"different due date: 98% within 5 days, 2% within 30 days."
-msgstr ""
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:92
-msgid "Paying the invoice with a cash discount"
-msgstr "Een factuur met contante korting betalen"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:94
-msgid ""
-"If the customer pays with a cash discount, when processing the bank "
-"statement, you will match the payment (98%) with the related line in the "
-"journal entry."
-msgstr ""
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:101
-msgid ""
-"As you can see in the above screenshot, when selecting the customer, you "
-"also see the 2% remaining of 3$. If you want to accept the cash discount (if"
-" the customer paid within the 5 days), you can click on this line with 2%, "
-"click on \"Open Balance\", and select your \"Cash Discount\" reconciliation "
-"model. That way, the invoice is marked as fully paid."
-msgstr ""
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:109
-msgid ""
-"from now on, matching the remaining 2% has to be done manually. In the "
-"future, we plan to automate the reconciliation of the 2% if the 98% are paid"
-" on time."
-msgstr ""
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:113
-msgid "Paying the invoice in full"
-msgstr "De factuur volledig betalen"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:115
-msgid ""
-"If the customer pays the invoice fully, without benefiting from the cash "
-"discount, you will reconcile the payment (in full) with the two lines from "
-"the invoice (98% and 2%). Just click on the two lines to match them with the"
-" payment."
-msgstr ""
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:125
-#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:116
-#: ../../accounting/receivables/customer_invoices/installment_plans.rst:86
-msgid ":doc:`overview`"
-msgstr ":doc:`overview`"
-
 #: ../../accounting/receivables/customer_invoices/cash_rounding.rst:2
 msgid "Set up cash roundings"
 msgstr ""
@@ -11096,7 +11260,7 @@ msgstr "Product"
 
 #: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:69
 msgid "Deferred Revenue Type"
-msgstr "Soort uitgestelde omzet"
+msgstr "Uitgestelde omzetsoort"
 
 #: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:71
 msgid "Support Contract: 3 years"
@@ -11171,6 +11335,11 @@ msgid ""
 " the menu Reporting > Deferred Revenue Analysis."
 msgstr ""
 
+#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:116
+#: ../../accounting/receivables/customer_invoices/installment_plans.rst:86
+msgid ":doc:`overview`"
+msgstr ":doc:`overview`"
+
 #: ../../accounting/receivables/customer_invoices/installment_plans.rst:3
 msgid "How to define an installment plan on customer invoices?"
 msgstr ""
@@ -11731,309 +11900,6 @@ msgstr ""
 msgid "Customer Payments"
 msgstr "Klantbetalingen"
 
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:3
-msgid "How to automate customer follow-ups with plans?"
-msgstr "Hoe klantopvolgingen automatiseren via plannen?"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:5
-msgid ""
-"With the Odoo Accounting application, you get a dynamic aged receivable "
-"report, customer statements and you can easily send them to customers."
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:8
-msgid ""
-"If you want to go further in the automation of the credit collection "
-"process, you can use follow-up plans. They will help you automate all the "
-"steps to get paid, by triggering them at the right time: send customer "
-"statements by emails, send regular letter (through the Docsaway "
-"integration), create a task to manually call the customer, etc..."
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:14
-msgid "Here is an example of a plan:"
-msgstr "Hier is een voorbeeld van een plan:"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:17
-msgid "When?"
-msgstr "Wanneer?"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:17
-msgid "What?"
-msgstr "Wat?"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:17
-msgid "Who?"
-msgstr "Wie?"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:19
-msgid "3 days before due date"
-msgstr "3 dagen voor vervaldatum"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:19
-msgid "Email"
-msgstr "E-mail"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:19
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:21
-msgid "automated"
-msgstr "geautomatiseerd"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:21
-msgid "1 day after due date"
-msgstr "1 dag na vervaldatum"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:21
-msgid "Email + Regular Letter"
-msgstr "E-mail + Brief"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:23
-msgid "15 days after due date"
-msgstr "15 dagen na vervaldatum"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:23
-msgid "Call the customer"
-msgstr "Bel de klant"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:23
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:25
-msgid "John Mac Gregor"
-msgstr "John Mac Gregor"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:25
-msgid "35 days after due date"
-msgstr "35 dagen na vervaldatum"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:25
-msgid "Email + Letter + Call"
-msgstr "E-mail + Brief + Telefoon"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:27
-msgid "60 days after due date"
-msgstr "60 dagen na vervaldatum"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:27
-msgid "Formal notice"
-msgstr "Formele melding"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:27
-msgid "Bailiff"
-msgstr "Deurwaarder"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:34
-msgid "Install Reminder Module"
-msgstr "Installeer \"Herinnering\" module"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:36
-msgid ""
-"You must start by activating the feature, using the menu "
-":menuselection:`Configuration --> Settings` of the Accounting application. "
-"From the settings screen, activate the feature **Enable payment follow-up "
-"management**."
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:44
-msgid "Define Payment Follow-ups Levels"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:46
-msgid ""
-"To automate customer follow ups, you must configure your follow–up levels "
-"using the menu :menuselection:`Accounting --> Configuration --> Payment "
-"Follow-ups`. You should define one and only one follow-up plan per company."
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:50
-msgid ""
-"The levels of follow-up are relative to the due date; when no payment term "
-"is specified, the invoice date will be considered as the due date."
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:53
-msgid ""
-"For each level, you should define the number of days and create a note which"
-" will automatically be added into the reminder letter."
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:59
-msgid "Odoo defines several actions for every reminder:"
-msgstr "Odoo definieert meerdere acties voor elke herinnering:"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:61
-msgid ""
-"**Manual Action:** assign a responsible that will have to call the customer"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:62
-msgid "**Send an Email:** send an email to customer using the provided text"
-msgstr ""
-"**Verzend een e-mail:** verzend een e-mail naar de klant met de voorziene "
-"tekst"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:63
-msgid ""
-"**Send a Letter:** send a letter by regular mail, using the provided note"
-msgstr ""
-"**Verzend een brief:** verzend een brief via reguliere e-mail, met de "
-"voorziene opmerking"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:69
-msgid ""
-"As you need to provide a number of days relative to the due date, you can "
-"use a negative number. As an example, if an invoice is issued the January "
-"1st but the due date is January 20, if you set a reminder 3 days before the "
-"due date, the customer may receive an email in January 17."
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:76
-msgid "Doing your weekly follow-ups"
-msgstr "Uw wekelijkse opvolgingen doen"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:78
-msgid ""
-"Once everything is setup, Odoo will prepare follow-up letters and emails "
-"automatically for you. All you have to do is to the menu "
-":menuselection:`Sales --> Customers Statement` in the accounting "
-"application."
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:85
-msgid ""
-"Odoo will automatically propose you actions based on the follow-up plan you "
-"defined, invoices to pay and payment received."
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:88
-msgid ""
-"You can use this menu every day, once a week or once a month. You do not "
-"risk to send two times the same reminder to your customer. Odoo only "
-"proposes you the action you have to do. If you do it every day, you will "
-"have a few calls to do per day. If you do it once a month, you will have "
-"much more work once you do it."
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:94
-msgid ""
-"It's up to you to organize the way you want to work. But it's a good "
-"practice to reconcile your bank statements before launching the follow-ups. "
-"That way, all paid invoices will be reconciled and you will not send a "
-"follow-up letter to a customer that already paid his invoice."
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:99
-msgid "From a customer follow-up proposition, you can:"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:101
-msgid "Get the customer information to contact him"
-msgstr "Krijg de klant zijn informatie om hem te contacteren"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:103
-msgid "Drill down to the customer information form by clicking on its name"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:105
-msgid "Change the text (or the email or letter) and adapt to the customer"
-msgstr "Wijzig de tekst (op de e-mail of brief) en pas u aan naar de klant"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:107
-msgid ""
-"Change the colored dot to mark the customer as being a good, normal or bad "
-"debtor"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:110
-msgid "Log a note is you called the customer"
-msgstr "Log een opmerking wanneer u de klant heeft gebeld"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:112
-msgid "Exclude some invoices from the statement table (litigation)"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:114
-msgid "Send an email with the statement"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:116
-msgid ""
-"Print a letter, or send a regular mail (if you installed the Docsaway "
-"integration)"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:119
-msgid ""
-"Plan the next reminder (but it's better to keep in automatic mode so that "
-"Odoo will stick to the follow-up plan of the company)"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:122
-msgid "Drill down to an invoice"
-msgstr "Inzoomen op een factuur"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:124
-msgid ""
-"Change the expected payment date of an invoice (thus, impacting the next "
-"time Odoo will propose you to send a reminder)"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:128
-msgid ""
-"You can force a customer statement, even if Odoo do not proposes you to do "
-"it, because it's not the right date yet. To do this, you should go to the "
-"Aged Receivable report (in the report menu of the Accounting application). "
-"From this report, you can click on a customer to get to his customer "
-"statement."
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:135
-msgid "How to exclude an invoice from auto follow up?"
-msgstr "Hoe een factuur uitsluiten van automatische opvolging?"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:137
-msgid "To see all **overdue invoices** or **on need of action**,"
-msgstr ""
-"Om alle ** achterstallige facturen ** of ** wanneer er actie nodig is ** te "
-"zien,"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:139
-msgid "Go to :menuselection:`Accounting --> Sales --> Customers Statement`"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:145
-msgid "Exclude a specific invoice for a specific date"
-msgstr "Sluit een bepaalde factuur uit voor een bepaalde datum"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:147
-msgid ""
-"Odoo can exclude an invoice from follow-ups actions for specific date by "
-"clicking on **Log a Note**, then choose one of the ready options (*one "
-"week*, *two weeks*, *one month*, *two months*), So Odoo will calculate the "
-"required date according to the current date."
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:155
-msgid ""
-"Another way to achieve it is the following: click on the required invoice, "
-"then choose **Change expected payment date/note**, then enter a new payment "
-"date and note."
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:162
-msgid "Exclude a specific invoice forever"
-msgstr "Sluit een specifieke factuur permanent uit"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:164
-msgid ""
-"Odoo can exclude an invoice for a specific customer by clicking on the "
-"checkbox **Excluded**"
-msgstr ""
-"Odoo kan een factuur uitsluiten voor een specifieke klant door te klikken op"
-" het selectievakje ** Uitgesloten **"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:168
-msgid "If you click on **History**, you can see all follow ups actions."
-msgstr "Als u klikt op **Geschiedenis** kan u alle opvolg acties zien."
-
 #: ../../accounting/receivables/customer_payments/check.rst:3
 msgid "How to register customer payments by checks?"
 msgstr ""
@@ -12423,7 +12289,6 @@ msgid ""
 msgstr ""
 
 #: ../../accounting/receivables/customer_payments/credit_cards.rst:166
-#: ../../accounting/receivables/customer_payments/followup.rst:167
 msgid ":doc:`recording`"
 msgstr ":doc:`recording`"
 
@@ -12438,232 +12303,94 @@ msgid ":doc:`followup`"
 msgstr ":doc:`followup`"
 
 #: ../../accounting/receivables/customer_payments/followup.rst:3
-msgid "How to get paid and organize customer follow-ups?"
-msgstr "Hoe betaald worden en klantenopvolging organiseren?"
+msgid "Follow-up on invoices and get paid faster"
+msgstr ""
 
 #: ../../accounting/receivables/customer_payments/followup.rst:5
 msgid ""
-"Getting paid and organizing customer reminders is always a difficult task, "
-"however it is critical for the health of the company to stay diligent about "
-"outstanding receivables. Fortunately, Odoo provides the right tools to track"
-" receivables, automate customer statements, and measure your performance."
+"It is essential for your business to collect payments when they are overdue."
+" Odoo will help you identify payments that are late and will allow you to "
+"send the appropriate reminders."
 msgstr ""
 
-#: ../../accounting/receivables/customer_payments/followup.rst:12
-msgid "Customer follow-ups: A step by step guide"
-msgstr "Klanten opvolgen: een stap per stap handleiding"
+#: ../../accounting/receivables/customer_payments/followup.rst:10
+msgid "Manage your follow-ups"
+msgstr ""
 
-#: ../../accounting/receivables/customer_payments/followup.rst:15
-msgid "Cleaning up outstanding payments"
-msgstr "Openstaande betalingen opkuisen"
+#: ../../accounting/receivables/customer_payments/followup.rst:13
+msgid ""
+"We recommend that you reconcile your bank statements before launching your "
+"follow-up process. It will avoid you the trouble of sending a statement to a"
+" customer that has already paid you."
+msgstr ""
 
 #: ../../accounting/receivables/customer_payments/followup.rst:17
 msgid ""
-"If you have any unreconciled transactions in your bank account, you will "
-"need to process them first before you begin analyzing your customers "
-"statements. This ensures that you have recorded all of the latest customer "
-"payments before sending out reminders to any customers with outstanding "
-"balances."
+"The overdue invoices you need to follow-up on are available by default in "
+":menuselection:`Accounting --> Sales --> Follow-up Reports`. There, you can "
+"easily send a reminder by email or print it as a letter. Then, you can click"
+" on the *Done* button to view the next follow-up that needs your attention."
 msgstr ""
 
-#: ../../accounting/receivables/customer_payments/followup.rst:27
-msgid "Checking the Aged Receivables report"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/followup.rst:29
+#: ../../accounting/receivables/customer_payments/followup.rst:23
 msgid ""
-"After you have reconciled all of your bank accounts, you can then generate "
-"an accurate Aged Receivables Report from the Reports menu. This report will "
-"display all of the customers and their outstanding balances on open "
-"invoices."
+"Otherwise, if now is not the time for a reminder, click on *Remind me "
+"later*. You will get the next report according to the *Next Reminder Date* "
+"set on the statement."
 msgstr ""
 
-#: ../../accounting/receivables/customer_payments/followup.rst:37
+#: ../../accounting/receivables/customer_payments/followup.rst:28
 msgid ""
-"The report displays this information in time increments to better paint a "
-"picture of the outstanding balances your customers hold and for how long "
-"they have held these outstanding balances. You can then appropriately focus "
-"your efforts on the appropriate customers."
+"To avoid sending too many reminders in a short period of time, change the "
+"number of days calculated between each report by going to "
+":menuselection:`Accounting --> Configuration --> Settings --> Payment "
+"Follow-up`."
+msgstr ""
+
+#: ../../accounting/receivables/customer_payments/followup.rst:33
+msgid ""
+"You can also set a trust level for your customers by marking them as bad, "
+"normal or good debtors on the follow-up reports."
+msgstr ""
+
+#: ../../accounting/receivables/customer_payments/followup.rst:40
+msgid "Send reminders in batch"
 msgstr ""
 
 #: ../../accounting/receivables/customer_payments/followup.rst:42
 msgid ""
-"You can then select any of the customers on this list and Odoo will open up "
-"their invoice details in the form of the Customer Follow-Up letter, also "
-"known as the **Customer Statement**."
+"To get your follow-up process easier, you can send reminder emails in batch "
+"from your follow-up reports page. Select all the reports you would like to "
+"process, click on *Action* and then on *Process Follow-ups*. A pdf document "
+"containing all of the follow-up letters for you to print will also be "
+"automatically generated."
 msgstr ""
 
-#: ../../accounting/receivables/customer_payments/followup.rst:49
-msgid "From the customer statement, you can:"
+#: ../../accounting/receivables/customer_payments/followup.rst:52
+msgid "Plan a follow-up process"
 msgstr ""
 
-#: ../../accounting/receivables/customer_payments/followup.rst:51
-msgid "Change and customize the message that is sent to the customer"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/followup.rst:53
-msgid "Send a reminder email to the customer"
-msgstr "Verstuur een herinneringsmail naar de klant"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:55
-msgid "Send a printed reminder letter to the customer"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/followup.rst:57
-msgid "Send automated printed reminders by utilizing our Docsaway integration"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/followup.rst:60
-msgid "Zoom in on the different open invoices or payments"
-msgstr "Zoom in op de verschillende open facturen of betalingen"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:62
-msgid "Remove an invoice or payment from the report (in case of conflict)"
-msgstr ""
-"Verwijder een factuur of betaling van het rapport (in het geval van een "
-"conflict)"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:64
-msgid "Log any call notes made to the customer"
-msgstr "Log opmerkingen van telefoongesprekken naar de klant"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:66
+#: ../../accounting/receivables/customer_payments/followup.rst:54
 msgid ""
-"Schedule your next follow up task to stay on top of customer payments (e.g. "
-"call back in 15 days if not payments are made)"
+"To plan a follow-up process, go to :menuselection:`Accounting --> "
+"Configuration --> Settings` and activate the *Follow-up Levels* feature "
+"under the *Customer Payments* section. Then, click on the new *Follow-up "
+"Levels* button that has appeared on your settings page."
+msgstr ""
+
+#: ../../accounting/receivables/customer_payments/followup.rst:59
+msgid ""
+"A follow-up plan with several actions is available by default in Odoo, but "
+"you can customize it any way you want. Depending on a specific number of "
+"overdue days, plan to send an email, a letter or to undertake a manual "
+"action. You can also edit the template used for the statement according to "
+"the stage of the process."
 msgstr ""
 
 #: ../../accounting/receivables/customer_payments/followup.rst:69
 msgid ""
-"You can set reminders for when you would like to next contact the particular"
-" customer. Selecting **Manual** will open up the follow up scheduling tool, "
-"while selecting **Auto** will automatically recommend that you contact the "
-"customer 15 days from then if the customer has not yet paid for the invoice."
-" Installing the **Follow-Up Plans** module will allow you to define "
-"automated actions and intervals to send reminders."
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/followup.rst:79
-msgid ""
-"If you have already sent out a reminder to a customer a few days ago, a "
-"warning message will appear at the top of the screen, reminding you that you"
-" should not send another reminder so soon since one was already sent "
-"recently. Every time you log a note, Odoo will automatically set the next "
-"reminder date, unless you choose to manually set it by selecting the next "
-"reminder button at the top right of the screen."
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/followup.rst:88
-msgid ""
-"You can also specify the expected payment date on an invoice line directly, "
-"therefore defining the next reminder in case the invoice has not been paid."
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/followup.rst:92
-msgid "Sending customer statements"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/followup.rst:94
-msgid ""
-"Send your customers reminders in batches in the menu :menuselection:`Sales "
-"--> Customer Statements`."
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/followup.rst:97
-msgid ""
-"Here Odoo will open all the statements awaiting to be processed, which is "
-"determined by the last reminder they received. You can choose to process "
-"them one by one, send multiple letters or emails in batches, or set a next "
-"action date for the next time they'll be contacted."
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/followup.rst:104
-msgid ""
-"If an invoice has not yet been paid, Odoo will remind you to contact at "
-"particular customer based after their next action date."
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/followup.rst:107
-msgid ""
-"You can access the customer statement report daily and Odoo will only "
-"display the customers you need to contact on any given day. This is based "
-"on:"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/followup.rst:111
-msgid "Customers you have not yet received a payment from"
-msgstr "Klanten waar u nog geen betaling van heeft ontvangen"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:113
-msgid ""
-"Customers that have not been reminded over the last X days (\"X\" being "
-"defined as the overdue date of the invoice after the first reminder, then "
-"the next action date set at every reminder)"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/followup.rst:118
-msgid "Setting up your dunning process"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/followup.rst:120
-msgid ""
-"The **Payment Follow-up Management** module allows you to define reminder "
-"plans. After installing it from the **Apps** menu, go to the **Follow-up "
-"Levels** menu in the accounting configuration to set up your dunning "
-"process."
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/followup.rst:125
-msgid "Some Examples are:"
-msgstr "Een paar voorbeelden zijn:"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:127
-msgid "**Email**: 3 days before overdue date"
-msgstr "**Email**: 3 dagen voor de vervaldatum"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:129
-msgid "**Email+Letter**: at the overdue date"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/followup.rst:131
-msgid "**Email+Call**: 15 days after the overdue date"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/followup.rst:133
-msgid "**Email+Letter**: 60 days after the overdue date"
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/followup.rst:138
-msgid ""
-"Thanks to this module, you can send every email and letters in batches for "
-"all your customers at once. The next reminder will automatically be computed"
-" based on your configured follow-up plan."
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/followup.rst:142
-msgid ""
-"The module will also add a red/green dot on each customer, this will allow "
-"you to easily mark customer status's with the following options: \"Good "
-"Debtor, Normal Debtor, or bad debtors."
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/followup.rst:150
-msgid "DSO: Measuring your performance"
-msgstr "DSO: uw performantie meten"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:152
-msgid ""
-"The DSO (Days of Outstanding Sales) is a measure of the average number of "
-"days that a company takes to collect revenue after a sale has been made. DSO"
-" is calculated by dividing the amount of accounts receivable during a given "
-"period by the total value of credit sales during the same period, and "
-"multiplying the result by the number of days in the period measured."
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/followup.rst:159
-msgid ""
-"You can get the DSO of your company from the Executive Summary report under "
-"Reporting (check the KPI average debtors days)."
+"If you would like to get a reminder before the actual due date, set a "
+"negative number of due days."
 msgstr ""
 
 #: ../../accounting/receivables/customer_payments/payment_sepa.rst:3
diff --git a/locale/nl/LC_MESSAGES/applications.po b/locale/nl/LC_MESSAGES/applications.po
index d940b3dc9..4cf1c5dda 100644
--- a/locale/nl/LC_MESSAGES/applications.po
+++ b/locale/nl/LC_MESSAGES/applications.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2015-TODAY, Odoo S.A.
-# This file is distributed under the same license as the Odoo Business package.
+# This file is distributed under the same license as the Odoo package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 10.0\n"
+"Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-07 09:30+0200\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Martin Trigaux, 2017\n"
+"Last-Translator: Martin Trigaux, 2018\n"
 "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,4 +20,4 @@ msgstr ""
 
 #: ../../applications.rst:3
 msgid "Applications"
-msgstr "Applicaties"
+msgstr "Sollicitaties"
diff --git a/locale/nl/LC_MESSAGES/crm.po b/locale/nl/LC_MESSAGES/crm.po
index 743617b43..704f32dc9 100644
--- a/locale/nl/LC_MESSAGES/crm.po
+++ b/locale/nl/LC_MESSAGES/crm.po
@@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-07-23 12:10+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Cas Vissers <casvissers@brahoo.nl>, 2017\n"
+"Last-Translator: Pol Van Dingenen <pol.vandingenen@vanroey.be>, 2018\n"
 "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: ../../crm.rst:5
 msgid "CRM"
-msgstr "Relatiebeheer"
+msgstr "CRM"
 
 #: ../../crm/acquire_leads.rst:3
 msgid "Acquire leads"
@@ -44,7 +44,7 @@ msgstr ""
 #: ../../crm/optimize/onsip.rst:13 ../../crm/track_leads/lead_scoring.rst:12
 #: ../../crm/track_leads/prospect_visits.rst:12
 msgid "Configuration"
-msgstr "Instelling"
+msgstr "Instellingen"
 
 #: ../../crm/acquire_leads/convert.rst:15
 msgid ""
diff --git a/locale/nl/LC_MESSAGES/db_management.po b/locale/nl/LC_MESSAGES/db_management.po
index 667295a98..b97baf926 100644
--- a/locale/nl/LC_MESSAGES/db_management.po
+++ b/locale/nl/LC_MESSAGES/db_management.po
@@ -109,7 +109,7 @@ msgstr "Selecteer de juiste database en ga naar <https://www.odoo.com/help>"
 
 #: ../../db_management/db_online.rst:51
 msgid "Upgrade"
-msgstr "Bijwerken"
+msgstr "Upgraden"
 
 #: ../../db_management/db_online.rst:53
 msgid ""
@@ -244,7 +244,7 @@ msgstr "Verwijder een database"
 
 #: ../../db_management/db_online.rst:152
 msgid "You can only delete databases of which you are the administrator."
-msgstr ""
+msgstr ". "
 
 #: ../../db_management/db_online.rst:154
 msgid ""
diff --git a/locale/nl/LC_MESSAGES/discuss.po b/locale/nl/LC_MESSAGES/discuss.po
index 30fc99fa8..f3672cff4 100644
--- a/locale/nl/LC_MESSAGES/discuss.po
+++ b/locale/nl/LC_MESSAGES/discuss.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-27 11:08+0200\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Cas Vissers <casvissers@brahoo.nl>, 2018\n"
 "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n"
@@ -30,23 +30,32 @@ msgstr ""
 msgid ""
 "This document is mainly dedicated to Odoo on-premise users who don't benefit"
 " from an out-of-the-box solution to send and receive emails in Odoo, unlike "
-"in `Odoo Online <https://www.odoo.com/trial>`__ & `Odoo.sh "
+"`Odoo Online <https://www.odoo.com/trial>`__ & `Odoo.sh "
 "<https://www.odoo.sh>`__."
 msgstr ""
 
 #: ../../discuss/email_servers.rst:9
 msgid ""
 "If no one in your company is used to manage email servers, we strongly "
-"recommend that you opt for such convenient Odoo hosting solutions. Indeed "
-"their email system works instantly and is monitored by professionals. "
-"Nevertheless you can still use your own email servers if you want to manage "
-"your email server's reputation yourself."
+"recommend that you opt for those Odoo hosting solutions. Their email system "
+"works instantly and is monitored by professionals. Nevertheless you can "
+"still use your own email servers if you want to manage your email server's "
+"reputation yourself."
 msgstr ""
 
 #: ../../discuss/email_servers.rst:15
 msgid ""
-"You will find here below some useful information to do so by integrating "
-"your own email solution with Odoo. .. note::"
+"You will find here below some useful information on how to integrate your "
+"own email solution with Odoo."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:18
+msgid ""
+"Office 365 email servers don't allow easiliy to send external emails from "
+"hosts like Odoo. Refer to the `Microsoft's documentation "
+"<https://support.office.com/en-us/article/How-to-set-up-a-multifunction-"
+"device-or-application-to-send-email-using-"
+"Office-365-69f58e99-c550-4274-ad18-c805d654b4c4>`__ to make it work."
 msgstr ""
 
 #: ../../discuss/email_servers.rst:24
@@ -477,6 +486,27 @@ msgid ""
 "their *Category* is set as *Meeting*."
 msgstr ""
 
+#: ../../discuss/plan_activities.rst:40
+msgid "Schedule a chain of activities to follow"
+msgstr ""
+
+#: ../../discuss/plan_activities.rst:42
+msgid ""
+"Odoo helps you easily plan your usual flow of activities. Go to "
+":menuselection:`Configuration --> Activity Types` and set the common "
+"following steps as *Recommended next activities*."
+msgstr ""
+
+#: ../../discuss/plan_activities.rst:49
+msgid ""
+"Now, when an activity is completed, you can select *Done & schedule next*. "
+"The next steps will automatically be suggested to you."
+msgstr ""
+
+#: ../../discuss/plan_activities.rst:55
+msgid "Have fun getting better organized by planning activities !"
+msgstr ""
+
 #: ../../discuss/team_communication.rst:3
 msgid "How to efficiently communicate in team using channels"
 msgstr "Hoe efficiënt communiceren in team met kanalen"
diff --git a/locale/nl/LC_MESSAGES/ecommerce.po b/locale/nl/LC_MESSAGES/ecommerce.po
index 17ff0ac16..4262a6701 100644
--- a/locale/nl/LC_MESSAGES/ecommerce.po
+++ b/locale/nl/LC_MESSAGES/ecommerce.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2015-TODAY, Odoo S.A.
-# This file is distributed under the same license as the Odoo Business package.
+# This file is distributed under the same license as the Odoo package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 10.0\n"
+"Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-10 09:08+0200\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Eric Geens <ericgeens@yahoo.com>, 2017\n"
+"Last-Translator: Pol Van Dingenen <pol.vandingenen@vanroey.be>, 2018\n"
 "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -707,7 +707,7 @@ msgstr "Wordt betaald"
 
 #: ../../ecommerce/shopper_experience/authorize.rst:3
 msgid "How to get paid with Authorize.Net"
-msgstr "Hoe betaald worden met Authorize.Net"
+msgstr "Hoe betaald te worden met Authorize.Net"
 
 #: ../../ecommerce/shopper_experience/authorize.rst:5
 msgid ""
diff --git a/locale/nl/LC_MESSAGES/general.po b/locale/nl/LC_MESSAGES/general.po
index a634504d4..19f3f755c 100644
--- a/locale/nl/LC_MESSAGES/general.po
+++ b/locale/nl/LC_MESSAGES/general.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2015-TODAY, Odoo S.A.
-# This file is distributed under the same license as the Odoo Business package.
+# This file is distributed under the same license as the Odoo package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 10.0\n"
+"Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-10 09:08+0200\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Eric Geens <ericgeens@yahoo.com>, 2017\n"
+"Last-Translator: Pol Van Dingenen <pol.vandingenen@vanroey.be>, 2018\n"
 "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -819,10 +819,6 @@ msgstr ""
 "`Gebruikers deactiveren <../../db_management/documentation.html"
 "#deactivating-users>`_"
 
-#: ../../general/odoo_basics/add_user.rst:46
-msgid ":doc:`../../crm/salesteam/setup/create_team`"
-msgstr ":doc:`../../crm/salesteam/setup/create_team`"
-
 #: ../../general/odoo_basics/choose_language.rst:3
 msgid "Manage Odoo in your own language"
 msgstr "Beheer Odoo in uw eigen taal"
diff --git a/locale/nl/LC_MESSAGES/helpdesk.po b/locale/nl/LC_MESSAGES/helpdesk.po
index 66b16d530..f3a7150b9 100644
--- a/locale/nl/LC_MESSAGES/helpdesk.po
+++ b/locale/nl/LC_MESSAGES/helpdesk.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2015-TODAY, Odoo S.A.
-# This file is distributed under the same license as the Odoo Business package.
+# This file is distributed under the same license as the Odoo package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 10.0\n"
+"Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-08 14:28+0100\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Martin Trigaux, 2017\n"
+"Last-Translator: Yenthe Van Ginneken <yenthespam@gmail.com>, 2018\n"
 "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/locale/nl/LC_MESSAGES/index.po b/locale/nl/LC_MESSAGES/index.po
index 3871a2951..03a0c4ef4 100644
--- a/locale/nl/LC_MESSAGES/index.po
+++ b/locale/nl/LC_MESSAGES/index.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2015-TODAY, Odoo S.A.
-# This file is distributed under the same license as the Odoo Business package.
+# This file is distributed under the same license as the Odoo package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 10.0\n"
+"Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-07 09:30+0200\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Yenthe Van Ginneken <yenthespam@gmail.com>, 2017\n"
+"Last-Translator: Yenthe Van Ginneken <yenthespam@gmail.com>, 2018\n"
 "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/locale/nl/LC_MESSAGES/inventory.po b/locale/nl/LC_MESSAGES/inventory.po
index aaa03ffb6..c0a512e41 100644
--- a/locale/nl/LC_MESSAGES/inventory.po
+++ b/locale/nl/LC_MESSAGES/inventory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2015-TODAY, Odoo S.A.
-# This file is distributed under the same license as the Odoo Business package.
+# This file is distributed under the same license as the Odoo package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 10.0\n"
+"Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-08 17:10+0100\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Gunther Clauwaert <gclauwae@hotmail.com>, 2017\n"
+"Last-Translator: Pol Van Dingenen <pol.vandingenen@vanroey.be>, 2018\n"
 "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -78,8 +78,8 @@ msgid ""
 "printed documents (and scan lines on the documents), or on a screen (and "
 "scan products directly)."
 msgstr ""
-"Er zijn twee aanpakken om uitgaande leveringen te verwerken: u kan werken op"
-" afgedrukte documenten (en regels scannen van het document), of van een "
+"Er zijn twee aanpakken om leveringen te verwerken: u kan werken op "
+"afgedrukte documenten (en regels scannen van het document), of van een "
 "scherm (en scan direct producten)."
 
 #: ../../inventory/barcode/operations/delivery.rst:10
@@ -766,7 +766,7 @@ msgstr ""
 #: ../../inventory/shipping/setup/delivery_method.rst:17
 #: ../../inventory/shipping/setup/third_party_shipper.rst:14
 msgid "Configuration"
-msgstr "Instelling"
+msgstr "Instellingen"
 
 #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:33
 #: ../../inventory/settings/products/strategies.rst:33
@@ -783,7 +783,7 @@ msgstr ""
 
 #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
 msgid "Active"
-msgstr "Actief"
+msgstr "Actie"
 
 #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
 msgid ""
@@ -908,7 +908,7 @@ msgstr ""
 
 #: ../../inventory/management/delivery.rst:3
 msgid "Delivery Orders"
-msgstr "Uitgaande leveringen"
+msgstr "Leveringen"
 
 #: ../../inventory/management/delivery/cancel_order.rst:3
 msgid "How do I cancel a delivery order?"
@@ -2026,7 +2026,7 @@ msgstr ""
 
 #: ../../inventory/management/incoming.rst:3
 msgid "Incoming Shipments"
-msgstr "Inkomende leveringen"
+msgstr "Ontvangsten"
 
 #: ../../inventory/management/incoming/handle_receipts.rst:3
 msgid "How to choose the right flow to handle receipts?"
@@ -2776,7 +2776,7 @@ msgstr ""
 
 #: ../../inventory/management/misc.rst:3
 msgid "Miscellaneous Operations"
-msgstr "Memoriaal"
+msgstr "Memoriaal boekingen"
 
 #: ../../inventory/management/misc/immediate_planned_transfers.rst:2
 msgid "Immediate & Planned Transfers"
@@ -3132,7 +3132,7 @@ msgstr "Kostprijsbepaling"
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:63
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:64
 msgid "Standard Price"
-msgstr "Vaste verrekenprijs"
+msgstr "Kostprijs"
 
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:28
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:73
@@ -4131,7 +4131,7 @@ msgstr ""
 
 #: ../../inventory/overview/concepts/double-entry.rst:39
 msgid "Pick"
-msgstr "Verzamelen"
+msgstr "Pick"
 
 #: ../../inventory/overview/concepts/double-entry.rst:40
 msgid "1 Bicycle: Stock → Packing Zone"
@@ -4148,7 +4148,7 @@ msgstr ""
 #: ../../inventory/overview/concepts/double-entry.rst:43
 #: ../../inventory/shipping.rst:3
 msgid "Shipping"
-msgstr "Verzending"
+msgstr "Afleveradres"
 
 #: ../../inventory/overview/concepts/double-entry.rst:44
 msgid "1 Bicycle: Output → Customer"
@@ -6527,10 +6527,6 @@ msgstr ":doc:`../../overview/start/setup`"
 msgid ":doc:`uom`"
 msgstr ":doc:`uom`"
 
-#: ../../inventory/settings/products/usage.rst:72
-msgid ":doc:`packages`"
-msgstr ":doc:`packages`"
-
 #: ../../inventory/settings/products/variants.rst:3
 msgid "Using product variants"
 msgstr "Product varianten gebruiken"
diff --git a/locale/nl/LC_MESSAGES/iot.po b/locale/nl/LC_MESSAGES/iot.po
new file mode 100644
index 000000000..19d8c3ba8
--- /dev/null
+++ b/locale/nl/LC_MESSAGES/iot.po
@@ -0,0 +1,388 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2015-TODAY, Odoo S.A.
+# This file is distributed under the same license as the Odoo package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo 11.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Yenthe Van Ginneken <yenthespam@gmail.com>, 2018\n"
+"Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../../iot.rst:5
+msgid "Internet of Things (IoT)"
+msgstr ""
+
+#: ../../iot/connect.rst:3
+msgid "Connect an IoT Box to your database"
+msgstr ""
+
+#: ../../iot/connect.rst:5
+msgid "Install the Internet of Things (IoT) App on your Odoo Database."
+msgstr ""
+
+#: ../../iot/connect.rst:10
+msgid "Go in the IoT App and click on Connect on the IoT Boxes page."
+msgstr ""
+
+#: ../../iot/connect.rst:15
+msgid "Follow the steps to connect your IoT Box."
+msgstr ""
+
+#: ../../iot/connect.rst:21
+msgid "Ethernet Connection"
+msgstr ""
+
+#: ../../iot/connect.rst:23
+msgid ""
+"Connect to the IoT Box all the devices that have to be connected with cables"
+" (ethernet, usb devices, etc.)."
+msgstr ""
+
+#: ../../iot/connect.rst:26
+msgid "Power on the IoT Box."
+msgstr ""
+
+#: ../../iot/connect.rst:28
+msgid "Then click on the Scan button."
+msgstr ""
+
+#: ../../iot/connect.rst:34
+msgid "WiFi Connection"
+msgstr ""
+
+#: ../../iot/connect.rst:36
+msgid "Power on the IoT Box"
+msgstr ""
+
+#: ../../iot/connect.rst:38
+msgid "Copy the token"
+msgstr ""
+
+#: ../../iot/connect.rst:43
+msgid ""
+"Connect to the IoT Box WiFi Network (make sure there is no ethernet cable "
+"plugged in your computer)."
+msgstr ""
+
+#: ../../iot/connect.rst:49
+msgid ""
+"You will be redirected to the IoT Box Homepage (if it doesn't work, connect "
+"to the IP address of the box). Give a name to your IoT Box (not required) "
+"and paste the token, then click on next."
+msgstr ""
+
+#: ../../iot/connect.rst:57
+msgid ""
+"If you are on Runbot, do not forget to add the -all or -base in the token "
+"(e.g. this token **http://375228-saas-11-5-iot-"
+"f3f920.runbot16.odoo.com\\|4957098401** should become "
+"**http://375228-saas-11-5-iot-f3f920-all.runbot16.odoo.com\\|4957098401**)."
+msgstr ""
+
+#: ../../iot/connect.rst:63
+msgid ""
+"Choose the WiFi network you want to connect with (enter the password if "
+"there is one) and click on Submit. Wait a few seconds before being "
+"redirected to your database."
+msgstr ""
+
+#: ../../iot/connect.rst:70
+msgid "You should now see the IoT Box."
+msgstr ""
+
+#: ../../iot/connect.rst:76
+msgid "IoT Box Schema"
+msgstr ""
+
+#: ../../iot/pos.rst:3
+msgid "Use the IoT Box for the PoS"
+msgstr ""
+
+#: ../../iot/pos.rst:9
+msgid "Prerequisites"
+msgstr "Vereisten"
+
+#: ../../iot/pos.rst:11
+msgid "Before starting, make sure you have the following:"
+msgstr ""
+
+#: ../../iot/pos.rst:13
+msgid "An IoT Box"
+msgstr ""
+
+#: ../../iot/pos.rst:15
+msgid "A 2A Power adapter with pi 3 b+ 2.5 A"
+msgstr ""
+
+#: ../../iot/pos.rst:17
+msgid "A computer or tablet with an up-to-date web browser"
+msgstr "Een computer of tablet met een geüpdatet webbrowser"
+
+#: ../../iot/pos.rst:19
+msgid ""
+"A running SaaS or Odoo instance with the Point of Sale and IoT apps "
+"installed"
+msgstr ""
+
+#: ../../iot/pos.rst:22
+msgid "A local network setup with DHCP (this is the default setting)"
+msgstr ""
+
+#: ../../iot/pos.rst:24
+msgid ""
+"An Epson USB TM-T20 Printer or another ESC/POS compatible printer "
+"(officially supported printers are listed at the `POS Hardware page "
+"<https://www.odoo.com/page/pos-ipad-android-hardware>`__)"
+msgstr ""
+
+#: ../../iot/pos.rst:28
+msgid "A Honeywell Eclipse USB Barcode Scanner or another compatible scanner"
+msgstr ""
+"Een Honeywell Eclipse USB Barcode scanner of een ander compatibel apparaat"
+
+#: ../../iot/pos.rst:30
+msgid "An Epson compatible cash drawer"
+msgstr "Een Epson compatibele kassa lade"
+
+#: ../../iot/pos.rst:32
+msgid "An RJ45 Ethernet Cable (optional, WiFi is built in)"
+msgstr ""
+
+#: ../../iot/pos.rst:35
+msgid "Set Up"
+msgstr "Instellen"
+
+#: ../../iot/pos.rst:37
+msgid ""
+"To connect hardware to the PoS, the first step is to connect an IoT Box to "
+"your database. For this, follow this `documentation "
+"<https://docs.google.com/document/d/1vhWrSSlSdJcRYe4tjPpXKYVMTD47lVK3ysyYc7tJDlA/edit#>`__."
+msgstr ""
+
+#: ../../iot/pos.rst:44
+msgid "Then, you have to connect the peripheral devices to your IoT Box."
+msgstr ""
+
+#: ../../iot/pos.rst:46
+msgid ""
+"Officially supported hardware is listed on `the POS Hardware page "
+"<https://www.odoo.com/page/pos-ipad-android-hardware>`__, but other hardware"
+" might work as well."
+msgstr ""
+
+#: ../../iot/pos.rst:50
+msgid "**Printer**: Connect an ESC/POS printer to a USB port and power it on."
+msgstr ""
+"**Printer**: Connecteer een ECS/Kassa printer met een USB poort en zet deze "
+"aan."
+
+#: ../../iot/pos.rst:53
+msgid ""
+"**Cash drawer**: The cash drawer should be connected to the printer with an "
+"RJ25 cable."
+msgstr ""
+"**Kassalade**: De kassalade moet geconnecteerd zijn met de printer via een "
+"RJ25 kabel."
+
+#: ../../iot/pos.rst:56
+msgid ""
+"**Barcode scanner**: Connect your barcode scanner. In order for your barcode"
+" scanner to be compatible it must behave as a keyboard and must be "
+"configured in **US QWERTY**. It also must end barcodes with an Enter "
+"character (keycode 28). This is most likely the default configuration of "
+"your barcode scanner."
+msgstr ""
+"**Barcode scanner**: Connecteer uw barcode scanner. Om u barcode scanner "
+"compatibel te maken moet het zich voordoen als een toetsenbord en moet het "
+"geconfigureerd zijn in **US QWERTY**. Het moet barcodes ook beëindigen met "
+"een enter karakter (toetscode 28). Dit is normaal gezien de normale "
+"configuratie van uw barcode scanner."
+
+#: ../../iot/pos.rst:62
+msgid "**Scale**: Connect your scale and power it on."
+msgstr "**Weegschaal**: Connecteer uw weegschaal en zet ze aan."
+
+#: ../../iot/pos.rst:64
+msgid ""
+"**Ethernet**: If you do not wish to use Wi-Fi, plug in the Ethernet cable. "
+"Make sure this will connect the IoT Box to the same network as your POS "
+"device."
+msgstr ""
+
+#: ../../iot/pos.rst:68
+msgid ""
+"**Wi-Fi**: The current version of the IoT Box has Wi-Fi built in. Make sure "
+"not to plug in an Ethernet cable when booting, because all Wi-Fi "
+"functionality will be bypassed when a wired network connection is available "
+"on boot."
+msgstr ""
+
+#: ../../iot/pos.rst:73
+msgid ""
+"Once it's done, you can connect the IoT Box to your PoS. For this, go in "
+"Point of Sale > Configuration > PoS, tick the box \"IoT Box\" and select the"
+" IoT Box you want to connect with. Save the changes."
+msgstr ""
+
+#: ../../iot/pos.rst:77
+msgid "Set up is done, you can launch a new PoS Session."
+msgstr ""
+
+#: ../../iot/pos.rst:80
+msgid "Troubleshoot"
+msgstr "Troubleshoot"
+
+#: ../../iot/pos.rst:83
+msgid "The PoS cannot connect to the IoT Box"
+msgstr ""
+
+#: ../../iot/pos.rst:85
+msgid ""
+"The easiest way to make sure the IoT Box is properly set-up is to turn it on"
+" with the printer plugged in as it will print a receipt indicating any error"
+" if encountered or the IoT Box's IP address in case of success. If no "
+"receipt is printed, check the following steps:"
+msgstr ""
+
+#: ../../iot/pos.rst:91
+msgid ""
+"Make sure the IoT Box is powered on, indicated by a brightly lit red status "
+"LED."
+msgstr ""
+
+#: ../../iot/pos.rst:94
+msgid ""
+"Make sure the IoT Box is ready, this is indicated by a brightly lit green "
+"status LED just next to the red power status LED. The IoT Box should be "
+"ready ~2 minutes after it is started."
+msgstr ""
+
+#: ../../iot/pos.rst:98
+msgid ""
+"Make sure the IoT Box is connected to the same network as your POS device. "
+"Both the device and the IoT Box should be visible in the list of connected "
+"devices on your network router."
+msgstr ""
+
+#: ../../iot/pos.rst:102
+msgid ""
+"If you specified the IoT Box's IP address in the configuration, make sure it"
+" corresponds to the ip address printed on the IoT Box's status receipt."
+msgstr ""
+
+#: ../../iot/pos.rst:106
+msgid "Make sure that the POS is not loaded over HTTPS."
+msgstr "Verzeker u er van dat de POS niet over HTTPS laad."
+
+#: ../../iot/pos.rst:108
+msgid ""
+"A bug in Firefox's HTTP implementation might prevent the autodiscovery from "
+"working reliably. You could also manually set up the IoT Box's IP address in"
+" the POS configuration."
+msgstr ""
+
+#: ../../iot/pos.rst:113
+msgid "The Barcode Scanner is not working"
+msgstr "De Barcode Scanner werkt niet"
+
+#: ../../iot/pos.rst:115
+msgid ""
+"The barcode scanner must be configured in US QWERTY and emit an Enter after "
+"each barcode. This is the default configuration of most barcode readers. "
+"Refer to the barcode reader documentation for more information."
+msgstr ""
+"De barcode scanner moet geconfigureerd zijn in US QWERTY en moet een enter "
+"toevoegen achter de barcode. Dit is de standaard configuratie voor de meeste"
+" barcode lezers. Kijk naar de barcode documentatie voor meer informatie."
+
+#: ../../iot/pos.rst:120
+msgid ""
+"The IoT Box needs a 2A power supply to work with some barcode scanners. If "
+"you are not using the provided power supply, make sure the one you use has "
+"enough power."
+msgstr ""
+
+#: ../../iot/pos.rst:124
+msgid ""
+"Some barcode scanners will need more than 2A and will not work, or will work"
+" unreliably, even with the provided power supply. In those case you can plug"
+" the barcode scanner in a self-powered USB hub."
+msgstr ""
+"Sommige barcode scanners hebben meer dan 2A nodig en zullen niet of "
+"onbetrouwbaar werken, zelfs met de meegeleverde voeding. In die gevallen kan"
+" u een barcode scanner inpluggen in een zelfvoorzienende USB hub."
+
+#: ../../iot/pos.rst:129
+msgid ""
+"Some poorly built barcode scanners do not advertise themselves as barcode "
+"scanners but as a usb keyboard instead, and will not be recognized by the "
+"IoT Box."
+msgstr ""
+
+#: ../../iot/pos.rst:134
+msgid "The Barcode Scanner is not working reliably"
+msgstr "De Barcode Scanner werkt niet betrouwbaar"
+
+#: ../../iot/pos.rst:136
+msgid ""
+"Make sure that no more than one device with 'Scan via Proxy'/'Barcode "
+"Scanner' enabled are connected to the IoT Box at the same time."
+msgstr ""
+
+#: ../../iot/pos.rst:140
+msgid "Printing the receipt takes too much time"
+msgstr "Het ticket printen duurt te lang"
+
+#: ../../iot/pos.rst:142
+msgid ""
+"A small delay before the first print is expected, as the IoT Box will do "
+"some preprocessing to speed up the next printings. If you suffer delays "
+"afterwards it is most likely due to poor network connection between the POS "
+"and the IoT Box."
+msgstr ""
+
+#: ../../iot/pos.rst:148
+msgid "Some characters are not correctly printed on the receipt"
+msgstr "Sommige karakters zijn niet correct afgedrukt op het ticket"
+
+#: ../../iot/pos.rst:150
+msgid ""
+"The IoT Box does not support all languages and characters. It currently "
+"supports Latin and Cyrillic based scripts, with basic Japanese support."
+msgstr ""
+
+#: ../../iot/pos.rst:155
+msgid "The printer is offline"
+msgstr "De printer is offline"
+
+#: ../../iot/pos.rst:157
+msgid ""
+"Make sure the printer is connected, powered, has enough paper and has its "
+"lid closed, and is not reporting an error. If the error persists, please "
+"contact support."
+msgstr ""
+"Verzeker u er van dat de printer verbonden is, opstaat, genoeg papier heeft,"
+" dat het deksel gesloten is en dat de printer geen fouten meld. Gelieve "
+"support te contacteren als deze fout zich blijft voordoen."
+
+#: ../../iot/pos.rst:162
+msgid "The cashdrawer does not open"
+msgstr "De kassalade opent niet"
+
+#: ../../iot/pos.rst:164
+msgid ""
+"The cashdrawer should be connected to the printer and should be activated in"
+" the POS configuration."
+msgstr ""
+"De kassalade moet verbonden zijn met de printer en moet geactiveerd worden "
+"in de POS configuratie."
diff --git a/locale/nl/LC_MESSAGES/livechat.po b/locale/nl/LC_MESSAGES/livechat.po
index dc17b12dc..629b7e607 100644
--- a/locale/nl/LC_MESSAGES/livechat.po
+++ b/locale/nl/LC_MESSAGES/livechat.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2015-TODAY, Odoo S.A.
-# This file is distributed under the same license as the Odoo Business package.
+# This file is distributed under the same license as the Odoo package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 10.0\n"
+"Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-08 14:28+0100\n"
+"POT-Creation-Date: 2018-07-23 12:10+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Cas Vissers <casvissers@brahoo.nl>, 2018\n"
+"Last-Translator: Yenthe Van Ginneken <yenthespam@gmail.com>, 2018\n"
 "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -38,7 +38,7 @@ msgstr ""
 
 #: ../../livechat/livechat.rst:19
 msgid "Configuration"
-msgstr "Instelling"
+msgstr "Instellingen"
 
 #: ../../livechat/livechat.rst:21
 msgid ""
diff --git a/locale/nl/LC_MESSAGES/manufacturing.po b/locale/nl/LC_MESSAGES/manufacturing.po
index 5661702c8..80fd34988 100644
--- a/locale/nl/LC_MESSAGES/manufacturing.po
+++ b/locale/nl/LC_MESSAGES/manufacturing.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2015-TODAY, Odoo S.A.
-# This file is distributed under the same license as the Odoo Business package.
+# This file is distributed under the same license as the Odoo package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 10.0\n"
+"Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-22 15:27+0100\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Martin Trigaux, 2017\n"
+"Last-Translator: Gunther Clauwaert <gclauwae@hotmail.com>, 2018\n"
 "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -51,13 +51,10 @@ msgstr "Maken van een eenvoudige materiaallijst (BoM)"
 #: ../../manufacturing/management/bill_configuration.rst:16
 msgid ""
 "If you choose to manage your manufacturing operations using manufacturing "
-"orders only, you will define basic bills of materials without routings. For "
-"more information about which method of management to use, review the "
-"**Getting Started** section of the *Manufacturing* chapter of the "
-"documentation."
+"orders only, you will define basic bills of materials without routings."
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:22
+#: ../../manufacturing/management/bill_configuration.rst:19
 msgid ""
 "Before creating your first bill of materials, you will need to create a "
 "product and at least one component (components are considered products in "
@@ -70,7 +67,7 @@ msgid ""
 "Materials`, or using the button on the top of the product form."
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:32
+#: ../../manufacturing/management/bill_configuration.rst:29
 msgid ""
 "Under the **Miscellaneous** tab, you can fill additional fields. "
 "**Sequence** defines the order in which your BoMs will be selected for "
@@ -78,11 +75,11 @@ msgid ""
 "allows you to track changes to your BoM over time."
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:38
+#: ../../manufacturing/management/bill_configuration.rst:35
 msgid "Adding a Routing to a BoM"
 msgstr "Routes toevoegen aan een materiaallijst (BoM)"
 
-#: ../../manufacturing/management/bill_configuration.rst:40
+#: ../../manufacturing/management/bill_configuration.rst:37
 msgid ""
 "A routing defines a series of operations required to manufacture a product "
 "and the work center at which each operation is performed. A routing may be "
@@ -90,14 +87,14 @@ msgid ""
 "information about configuring routings, review the chapter on routings."
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:46
+#: ../../manufacturing/management/bill_configuration.rst:43
 msgid ""
 "After enabling routings from :menuselection:`Configuration --> Settings`, "
 "you will be able to add a routing to a bill of materials by selecting a "
 "routing from the dropdown list or creating one on the fly."
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:50
+#: ../../manufacturing/management/bill_configuration.rst:47
 msgid ""
 "You may define the work operation or step in which each component is "
 "consumed using the field, **Consumed in Operation** under the **Components**"
@@ -107,11 +104,11 @@ msgid ""
 "consumed/produced at the final operation in the routing."
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:61
+#: ../../manufacturing/management/bill_configuration.rst:58
 msgid "Adding Byproducts to a BoM"
 msgstr "Bijproducten toevoegen aan een BoM"
 
-#: ../../manufacturing/management/bill_configuration.rst:63
+#: ../../manufacturing/management/bill_configuration.rst:60
 msgid ""
 "In Odoo, a byproduct is any product produced by a BoM in addition to the "
 "primary product."
@@ -119,13 +116,13 @@ msgstr ""
 "In Odoo is een bijproduct een product dat geproduceerd is via een BoM "
 "bovenop een primair product."
 
-#: ../../manufacturing/management/bill_configuration.rst:66
+#: ../../manufacturing/management/bill_configuration.rst:63
 msgid ""
 "To add byproducts to a BoM, you will first need to enable them from "
 ":menuselection:`Configuration --> Settings`."
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:72
+#: ../../manufacturing/management/bill_configuration.rst:69
 msgid ""
 "Once byproducts are enabled, you can add them to your bills of materials "
 "under the **Byproducts** tab of the bill of materials. You can add any "
@@ -133,11 +130,11 @@ msgid ""
 "of the routing as the primary product of the BoM."
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:81
+#: ../../manufacturing/management/bill_configuration.rst:78
 msgid "Setting up a BoM for a Product With Sub-Assemblies"
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:83
+#: ../../manufacturing/management/bill_configuration.rst:80
 #: ../../manufacturing/management/sub_assemblies.rst:5
 msgid ""
 "A subassembly is a manufactured product which is intended to be used as a "
@@ -147,7 +144,7 @@ msgid ""
 "that employs subassemblies is often referred to as a multi-level BoM."
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:90
+#: ../../manufacturing/management/bill_configuration.rst:87
 #: ../../manufacturing/management/sub_assemblies.rst:12
 msgid ""
 "Multi-level bills of materials in Odoo are accomplished by creating a top-"
@@ -157,11 +154,11 @@ msgid ""
 "subassembly is created as well."
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:97
+#: ../../manufacturing/management/bill_configuration.rst:94
 msgid "Configure the Top-Level Product BoM"
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:99
+#: ../../manufacturing/management/bill_configuration.rst:96
 #: ../../manufacturing/management/sub_assemblies.rst:21
 msgid ""
 "To configure a multi-level BoM, create the top-level product and its BoM. "
@@ -169,12 +166,12 @@ msgid ""
 "subassembly as you would for any product."
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:107
+#: ../../manufacturing/management/bill_configuration.rst:104
 #: ../../manufacturing/management/sub_assemblies.rst:29
 msgid "Configure the Subassembly Product Data"
 msgstr "Configureer de productgegevens van de subassemblage"
 
-#: ../../manufacturing/management/bill_configuration.rst:109
+#: ../../manufacturing/management/bill_configuration.rst:106
 #: ../../manufacturing/management/sub_assemblies.rst:31
 msgid ""
 "On the product form of the subassembly, you must select the routes "
@@ -183,7 +180,7 @@ msgid ""
 "effect."
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:117
+#: ../../manufacturing/management/bill_configuration.rst:114
 #: ../../manufacturing/management/sub_assemblies.rst:39
 msgid ""
 "If you would like to be able to purchase the subassembly in addition to "
@@ -191,11 +188,11 @@ msgid ""
 "subassembly product form may be configured according to your preference."
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:123
+#: ../../manufacturing/management/bill_configuration.rst:120
 msgid "Using a Single BoM to Describe Several Variants of a Single Product"
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:125
+#: ../../manufacturing/management/bill_configuration.rst:122
 #: ../../manufacturing/management/product_variants.rst:5
 msgid ""
 "Odoo allows you to use one bill of materials for multiple variants of the "
@@ -206,7 +203,7 @@ msgstr ""
 "varianten van hetzelfde product. Schakel varianten in via: menuselectie "
 "binnen Productie: Instellingen-> \"Instellingen\"."
 
-#: ../../manufacturing/management/bill_configuration.rst:132
+#: ../../manufacturing/management/bill_configuration.rst:129
 #: ../../manufacturing/management/product_variants.rst:12
 msgid ""
 "You will then be able to specify which component lines are to be used in the"
@@ -215,7 +212,7 @@ msgid ""
 "variants."
 msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:137
+#: ../../manufacturing/management/bill_configuration.rst:134
 #: ../../manufacturing/management/product_variants.rst:17
 msgid ""
 "When defining variant BoMs on a line-item-basis, the **Product Variant** "
@@ -263,7 +260,7 @@ msgstr ""
 #: ../../manufacturing/management/kit_shipping.rst:27
 #: ../../manufacturing/management/kit_shipping.rst:62
 msgid "Configuration"
-msgstr "Instelling"
+msgstr "Instellingen"
 
 #: ../../manufacturing/management/kit_shipping.rst:29
 msgid ""
@@ -416,6 +413,112 @@ msgstr "Hoe half afgewerkte producten beheren"
 msgid "Configure the Top -Level Product BoM"
 msgstr "Configureer de materiaallijst (BoM) op Top-niveau "
 
+#: ../../manufacturing/management/unbuild.rst:3
+msgid "Unbuild a product"
+msgstr ""
+
+#: ../../manufacturing/management/unbuild.rst:5
+msgid ""
+"In Odoo Manufacturing App, you can *Unbuild* products. Two use cases can be "
+"managed: (1) you can unbuild products you have built yourself or (2) you can"
+" unbuild products you have received."
+msgstr ""
+
+#: ../../manufacturing/management/unbuild.rst:9
+msgid ""
+"Let's take the first case, you are manufacturing products yourself. If one "
+"of your product presents some defect, you might want to unbuild it instead "
+"of scrapping it completely, allowing you to reuse some components of the "
+"product."
+msgstr ""
+
+#: ../../manufacturing/management/unbuild.rst:14
+msgid ""
+"In the second case, you are buying products for the sole purpose of "
+"unbuilding them and recycling them."
+msgstr ""
+
+#: ../../manufacturing/management/unbuild.rst:18
+msgid "Unbuild Order"
+msgstr "Uit elkaar haal orders"
+
+#: ../../manufacturing/management/unbuild.rst:20
+msgid ""
+"While in the Manufacturing App, under the *Operations* tab you will find the"
+" menu *Unbuild Orders*."
+msgstr ""
+
+#: ../../manufacturing/management/unbuild.rst:26
+msgid ""
+"When creating a new one, you can either select a MO if you are unbuilding "
+"something you manufactured or only select a product if you are unbuilding "
+"something you received."
+msgstr ""
+
+#: ../../manufacturing/management/unbuild.rst:33
+msgid "When you are done, just click unbuild and the process will be over."
+msgstr ""
+
+#: ../../manufacturing/management/unbuild.rst:35
+msgid ""
+"If you unbuild a product that you manufactured before, you will get the "
+"components from the MO back in stock."
+msgstr ""
+
+#: ../../manufacturing/management/unbuild.rst:38
+msgid ""
+"If you unbuild a product you bought, you will get the components from the "
+"BoM back in stock."
+msgstr ""
+
 #: ../../manufacturing/overview.rst:5
 msgid "Overview"
 msgstr "Overzicht"
+
+#: ../../manufacturing/repair.rst:5
+msgid "Repair Management"
+msgstr ""
+
+#: ../../manufacturing/repair/repair.rst:3
+msgid "Repair products"
+msgstr ""
+
+#: ../../manufacturing/repair/repair.rst:5
+msgid ""
+"The Odoo *Repair* app allows you to manage a complete after sales process "
+"but also to simply repair products you have manufactured, if they present a "
+"defect."
+msgstr ""
+
+#: ../../manufacturing/repair/repair.rst:10
+msgid "Create a Repair Order"
+msgstr ""
+
+#: ../../manufacturing/repair/repair.rst:12
+msgid ""
+"Once in the app, you can access your existing *Repair Orders* and create a "
+"new one."
+msgstr ""
+
+#: ../../manufacturing/repair/repair.rst:19
+msgid "Manage a repair"
+msgstr ""
+
+#: ../../manufacturing/repair/repair.rst:21
+msgid ""
+"When a customer sends you a product for repair, create a new *Repair Order*."
+" Fill it in with all the information you may need such as the product, the "
+"customer, if it has to be invoiced after or before the repair, the parts you"
+" might need, etc."
+msgstr ""
+
+#: ../../manufacturing/repair/repair.rst:29
+msgid ""
+"Once everything is done, you can then send the repair quotation to your "
+"customer. If it is approved, you can confirm the repair. You will then be "
+"able to start & end the repair when it is completed."
+msgstr ""
+
+#: ../../manufacturing/repair/repair.rst:36
+msgid "You can now invoice the repair."
+msgstr ""
diff --git a/locale/nl/LC_MESSAGES/mobile.po b/locale/nl/LC_MESSAGES/mobile.po
new file mode 100644
index 000000000..90cbabb15
--- /dev/null
+++ b/locale/nl/LC_MESSAGES/mobile.po
@@ -0,0 +1,117 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2015-TODAY, Odoo S.A.
+# This file is distributed under the same license as the Odoo package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo 11.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Martin Trigaux, 2018\n"
+"Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../../mobile/firebase.rst:5
+msgid "Mobile"
+msgstr "Mobiel"
+
+#: ../../mobile/firebase.rst:8
+msgid "Setup your Firebase Cloud Messaging"
+msgstr ""
+
+#: ../../mobile/firebase.rst:10
+msgid ""
+"In order to have mobile notifications in our Android app, you need an API "
+"key."
+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 "Maak een nieuw project aan"
+
+#: ../../mobile/firebase.rst:27
+msgid ""
+"First, make sure you to sign in to your Google Account. Then, go to "
+"`https://console.firebase.google.com "
+"<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."
+msgstr ""
diff --git a/locale/nl/LC_MESSAGES/point_of_sale.po b/locale/nl/LC_MESSAGES/point_of_sale.po
index 826a0b1cb..af3fc11e2 100644
--- a/locale/nl/LC_MESSAGES/point_of_sale.po
+++ b/locale/nl/LC_MESSAGES/point_of_sale.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-26 12:01+0200\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Erwin van der Ploeg <erwin@odooexperts.nl>, 2017\n"
+"Last-Translator: Gunther Clauwaert <gclauwae@hotmail.com>, 2018\n"
 "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -45,7 +45,7 @@ msgstr ""
 #: ../../point_of_sale/restaurant/split.rst:10
 #: ../../point_of_sale/shop/seasonal_discount.rst:10
 msgid "Configuration"
-msgstr "Instelling"
+msgstr "Instellingen"
 
 #: ../../point_of_sale/advanced/barcode.rst:11
 msgid ""
@@ -55,8 +55,8 @@ msgstr ""
 
 #: ../../point_of_sale/advanced/barcode.rst:14
 msgid ""
-"Under the PosBox / Hardware category, you will find *Barcode Scanner* select"
-" it."
+"Under the IoT Box / Hardware category, you will find *Barcode Scanner* "
+"select it."
 msgstr ""
 
 #: ../../point_of_sale/advanced/barcode.rst:21
@@ -533,25 +533,25 @@ msgstr ""
 "<http://trendnet.com/products/proddetail.asp?prod=265_TU-S9>`__)"
 
 #: ../../point_of_sale/belgian_fdm/setup.rst:32
-msgid "A registered POSBox per POS configuration"
-msgstr "Een geregistreerde POSBox per POS configuratie"
+msgid "A registered IoT Box per POS configuration"
+msgstr ""
 
 #: ../../point_of_sale/belgian_fdm/setup.rst:35
 msgid "Setup"
 msgstr "Setup"
 
 #: ../../point_of_sale/belgian_fdm/setup.rst:38
-msgid "POSBox"
-msgstr "POSBox"
+msgid "IoT Box"
+msgstr "IoT Box"
 
 #: ../../point_of_sale/belgian_fdm/setup.rst:40
 msgid ""
-"In order to use a Fiscal Data Module, you will need a registered POSBox. "
-"These POSBoxes are similar to the regular POSBoxes we sell, but they are "
+"In order to use a Fiscal Data Module, you will need a registered IoT Box. "
+"These IoT Boxes are similar to the regular IoT Boxes we sell, but they are "
 "registered with the Belgian government. This is required by law. Attempting "
-"to use a Fiscal Data Module on a non-registered POSBox will not work. You "
-"can verify that the Fiscal Data Module is recognized by the POSBox by going "
-"to the *Hardware status page* via the POSBox homepage."
+"to use a Fiscal Data Module on a non-registered IoT Box will not work. You "
+"can verify that the Fiscal Data Module is recognized by the IoT Box by going"
+" to the *Hardware status page* via the IoT Box homepage."
 msgstr ""
 
 #: ../../point_of_sale/belgian_fdm/setup.rst:52
@@ -564,12 +564,12 @@ msgid ""
 "**Belgian Registered Cash Register** app (technical name: "
 "``pos_blackbox_be``). Because of government restrictions imposed on us, this"
 " installation cannot be undone. After this, you will have to ensure that "
-"each POS configuration has a unique registered POSBox associated with it "
+"each POS configuration has a unique registered IoT Box associated with it "
 "(:menuselection:`Point of Sale --> Configuration --> Point of Sale` and "
-"ensure Hardware Proxy / POSBox and the serial number of your POSBox is set)."
-" The first time you open the Point of Sale and attempt to do a transaction, "
-"you will be asked to input the PIN that you received with your VAT signing "
-"card."
+"ensure Hardware Proxy / IoT Box and the serial number of your IoT Box is "
+"set). The first time you open the Point of Sale and attempt to do a "
+"transaction, you will be asked to input the PIN that you received with your "
+"VAT signing card."
 msgstr ""
 
 #: ../../point_of_sale/belgian_fdm/setup.rst:69
@@ -618,12 +618,12 @@ msgid "Selling products without a valid tax"
 msgstr "Producten verkopen zonder een valide belasting"
 
 #: ../../point_of_sale/belgian_fdm/setup.rst:90
-msgid "Multiple Odoo POS configurations per POSBox are not allowed"
-msgstr "Meerdere Odoo kassa configuraties per POSBox zijn niet toegestaan"
+msgid "Multiple Odoo POS configurations per IoT Box are not allowed"
+msgstr ""
 
 #: ../../point_of_sale/belgian_fdm/setup.rst:91
-msgid "Using the POS without a connection to the POSBox (and thus FDM)"
-msgstr "De Kassa gebruiken zonder een connectie naar de POSBox (en dus FDM)"
+msgid "Using the POS without a connection to the IoT Box (and thus FDM)"
+msgstr ""
 
 #: ../../point_of_sale/belgian_fdm/setup.rst:92
 msgid "Blacklisted modules: pos_discount, pos_reprint, pos_loyalty"
@@ -668,1076 +668,6 @@ msgid ""
 "any future transactions."
 msgstr ""
 
-#: ../../point_of_sale/overview/setup.rst:3
-msgid "Point of Sale Hardware Setup"
-msgstr "Kassa hardware opzet"
-
-#: ../../point_of_sale/overview/setup.rst:6
-msgid "POSBox Setup Guide"
-msgstr "POSBox opzet handleiding"
-
-#: ../../point_of_sale/overview/setup.rst:11
-#: ../../point_of_sale/overview/setup.rst:205
-msgid "Prerequisites"
-msgstr "Vereisten"
-
-#: ../../point_of_sale/overview/setup.rst:13
-msgid ""
-"Before you start setting up your POSBox make sure you have everything. You "
-"will need :"
-msgstr ""
-"Controleer dat u zeker alle benodigdheden heeft voor u de POSBox begint op "
-"te zetten. U heeft nodig:"
-
-#: ../../point_of_sale/overview/setup.rst:16
-msgid "The POSBox"
-msgstr "De POSBox"
-
-#: ../../point_of_sale/overview/setup.rst:17
-msgid "A 2A Power adapter"
-msgstr "Een 2A oplader"
-
-#: ../../point_of_sale/overview/setup.rst:18
-msgid "A computer or tablet with an up-to-date web browser"
-msgstr "Een computer of tablet met een geüpdatet webbrowser"
-
-#: ../../point_of_sale/overview/setup.rst:19
-msgid "A running SaaS or Odoo database with the Point of Sale installed"
-msgstr ""
-
-#: ../../point_of_sale/overview/setup.rst:20
-msgid "A local network set up with DHCP (this is the default setting)"
-msgstr "Een lokale netwerk opzet met DHCP (dit is de standaard instelling)"
-
-#: ../../point_of_sale/overview/setup.rst:21
-msgid ""
-"An Epson USB TM-T20 Printer or another ESC/POS compatible printer "
-"(officially supported printers are listed at the `POS Hardware page "
-"<https://www.odoo.com/page/pos-ipad-android-hardware>`_)"
-msgstr ""
-
-#: ../../point_of_sale/overview/setup.rst:24
-msgid "A Honeywell Eclipse USB Barcode Scanner or another compatible scanner"
-msgstr ""
-"Een Honeywell Eclipse USB Barcode scanner of een ander compatibel apparaat"
-
-#: ../../point_of_sale/overview/setup.rst:25
-msgid "An Epson compatible cash drawer"
-msgstr "Een Epson compatibele kassa lade"
-
-#: ../../point_of_sale/overview/setup.rst:26
-msgid "An RJ45 Ethernet Cable (optional, Wi-Fi is built in)"
-msgstr ""
-
-#: ../../point_of_sale/overview/setup.rst:29
-#: ../../point_of_sale/overview/setup.rst:213
-msgid "Step By Step Setup Guide"
-msgstr "Stap per stap opzethandleiding"
-
-#: ../../point_of_sale/overview/setup.rst:32
-msgid "Current version of the POSBox (since 2015)"
-msgstr "Huidige versie van de POSBox (sinds 2015)"
-
-#: ../../point_of_sale/overview/setup.rst:36
-msgid "Connect peripheral devices"
-msgstr "Connecteer externe toestellen"
-
-#: ../../point_of_sale/overview/setup.rst:38
-msgid ""
-"Officially supported hardware is listed on `the POS Hardware page "
-"<https://www.odoo.com/page/pos-ipad-android-hardware>`_, but other hardware "
-"might work as well."
-msgstr ""
-"Officieel ondersteunde hardware is opgelijst op `de POS Hardware pagina "
-"<https://www.odoo.com/page/pos-ipad-android-hardware>`_, maar andere "
-"hardware werkt mogelijk ook."
-
-#: ../../point_of_sale/overview/setup.rst:42
-msgid "**Printer**: Connect an ESC/POS printer to a USB port and power it on."
-msgstr ""
-"**Printer**: Connecteer een ECS/Kassa printer met een USB poort en zet deze "
-"aan."
-
-#: ../../point_of_sale/overview/setup.rst:45
-msgid ""
-"**Cash drawer**: The cash drawer should be connected to the printer with an "
-"RJ25 cable."
-msgstr ""
-"**Kassalade**: De kassalade moet geconnecteerd zijn met de printer via een "
-"RJ25 kabel."
-
-#: ../../point_of_sale/overview/setup.rst:48
-msgid ""
-"**Barcode scanner**: Connect your barcode scanner. In order for your barcode"
-" scanner to be compatible it must behave as a keyboard and must be "
-"configured in **US QWERTY**. It also must end barcodes with an Enter "
-"character (keycode 28). This is most likely the default configuration of "
-"your barcode scanner."
-msgstr ""
-"**Barcode scanner**: Connecteer uw barcode scanner. Om u barcode scanner "
-"compatibel te maken moet het zich voordoen als een toetsenbord en moet het "
-"geconfigureerd zijn in **US QWERTY**. Het moet barcodes ook beëindigen met "
-"een enter karakter (toetscode 28). Dit is normaal gezien de normale "
-"configuratie van uw barcode scanner."
-
-#: ../../point_of_sale/overview/setup.rst:54
-msgid "**Scale**: Connect your scale and power it on."
-msgstr "**Weegschaal**: Connecteer uw weegschaal en zet ze aan."
-
-#: ../../point_of_sale/overview/setup.rst:56
-msgid ""
-"**Ethernet**: If you do not wish to use Wi-Fi, plug in the Ethernet cable. "
-"Make sure this will connect the POSBox to the same network as your POS "
-"device."
-msgstr ""
-"**Internet**: Als u geen Wi-Fi wilt gebruiken steekt u de internetkabel in. "
-"Verzeker u van dat dit de POSBox connecteert met hetzelfde netwerk als uw "
-"POS toestel."
-
-#: ../../point_of_sale/overview/setup.rst:60
-msgid ""
-"**Wi-Fi**: The current version of the POSBox has Wi-Fi built in. Make sure "
-"not to plug in an Ethernet cable, because all Wi-Fi functionality will be "
-"bypassed when a wired network connection is available."
-msgstr ""
-
-#: ../../point_of_sale/overview/setup.rst:66
-msgid "Power the POSBox"
-msgstr "Zet de POSBox aan"
-
-#: ../../point_of_sale/overview/setup.rst:68
-msgid ""
-"Plug the power adapter into the POSBox, a bright red status led should light"
-" up."
-msgstr ""
-"Steek de oplader in uw POSbox, een helderrood status led licht zou moeten "
-"gaan branden."
-
-#: ../../point_of_sale/overview/setup.rst:72
-msgid "Make sure the POSBox is ready"
-msgstr "Verzeker er u van dat de POSBox klaar is"
-
-#: ../../point_of_sale/overview/setup.rst:74
-msgid ""
-"Once powered, The POSBox needs a while to boot. Once the POSBox is ready, it"
-" should print a status receipt with its IP address. Also the status LED, "
-"just next to the red power LED, should be permanently lit green."
-msgstr ""
-"Eenmaal voorzien van stroom heeft de POSBox een tijdje nodig om op te "
-"starten. Eenmaal de POSBox klaar is zou het een status ticket moeten printen"
-" met het IP adres op. De status LED, net naast de rode stroom LED, moet "
-"permanent groen branden."
-
-#: ../../point_of_sale/overview/setup.rst:80
-#: ../../point_of_sale/overview/setup.rst:292
-msgid "Setup the Point of Sale"
-msgstr "De kassa opzetten"
-
-#: ../../point_of_sale/overview/setup.rst:82
-msgid ""
-"To setup the POSBox in the Point of Sale go to :menuselection:`Point of Sale"
-" --> Configuration --> Point of Sale` and select your Point of Sale. Scroll "
-"down to the ``PoSBox / Hardware Proxy`` section and activate the options for"
-" the hardware you want to use through the POSBox. Specifying the IP of the "
-"POSBox is recommended (it is printed on the receipt that gets printed after "
-"booting up the POSBox). When the IP is not specified the Point of Sale will "
-"attempt to find it on the local network."
-msgstr ""
-
-#: ../../point_of_sale/overview/setup.rst:91
-msgid ""
-"If you are running multiple Point of Sale on the same POSBox, make sure that"
-" only one of them has Remote Scanning/Barcode Scanner activated."
-msgstr ""
-
-#: ../../point_of_sale/overview/setup.rst:94
-msgid ""
-"It might be a good idea to make sure the POSBox IP never changes in your "
-"network. Refer to your router documentation on how to achieve this."
-msgstr ""
-"Het is mogelijk een goed idee om de zorgen dat het IP van de POSBox nooit "
-"veranderd in uw netwerk. Kijk naar uw router documentatie om te zien hoe u "
-"dit kan doen."
-
-#: ../../point_of_sale/overview/setup.rst:99
-msgid "Launch the Point of Sale"
-msgstr "Lanceer de kassa"
-
-#: ../../point_of_sale/overview/setup.rst:101
-msgid ""
-"If you didn't specify the POSBox's IP address in the configuration, the POS "
-"will need some time to perform a network scan to find the POSBox. This is "
-"only done once."
-msgstr ""
-"Indien u de POSBox's IP adres niet heeft ingegeven op de configuratie zal de"
-" POS tijd nodig hebben om een netwerkscan uit te voeren om de POSBox te "
-"vinden. Dit wordt slechts éénmalig gedaan."
-
-#: ../../point_of_sale/overview/setup.rst:105
-msgid ""
-"The Point of Sale is now connected to the POSBox and your hardware should be"
-" ready to use."
-msgstr ""
-"De Kassa is nu verbonden met de POSBox en u hardware zou klaar moeten zijn "
-"om te kunnen gebruiken."
-
-#: ../../point_of_sale/overview/setup.rst:109
-msgid "Wi-Fi configuration"
-msgstr "Wi-Fi configuratie"
-
-#: ../../point_of_sale/overview/setup.rst:111
-msgid ""
-"The most recent version of the POSBox has Wi-Fi built in. If you're using an"
-" older version you'll need a Linux compatible USB Wi-Fi adapter. Most "
-"commercially available Wi-Fi adapters are Linux compatible. Officially "
-"supported are Wi-Fi adapters with a Ralink 5370 chipset."
-msgstr ""
-
-#: ../../point_of_sale/overview/setup.rst:117
-msgid ""
-"Make sure not to plug in an Ethernet cable, as all Wi-Fi related "
-"functionality will be disabled when a wired network connection is available."
-msgstr ""
-"Steek zeker geen internetkabel in, anders wordt alle Wi-Fi gerelateerde "
-"functionaliteit uitgeschakeld wanneer een bekabeld netwerk beschikbaar is."
-
-#: ../../point_of_sale/overview/setup.rst:121
-msgid ""
-"When the POSBox boots with a Wi-Fi adapter it will start its own Wi-Fi "
-"Access Point called \"Posbox\" you can connect to. The receipt that gets "
-"printed when the POSBox starts will reflect this. In order to make the "
-"POSBox connect to an already existing Wi-Fi network, go to the homepage of "
-"the POSBox (indicated on the receipt) and go to the Wi-Fi configuration "
-"page. On there you can choose a network to connect to. Note that we only "
-"support open and WPA(2)-PSK networks. When connecting to a WPA-secured "
-"network, fill in the password field. The POSBox will attempt to connect to "
-"the specified network and will print a new POSBox status receipt after it "
-"has connected."
-msgstr ""
-"Wanneer de POSBox opstart met een Wi-Fi adapter start deze zijn eigen Wi-Fi "
-"toegangspunt genaamd *Posbox* waar u mee kan verbinden. De tickets die "
-"geprint worden wanneer de POSBox opstart zullen dit tonen. Om de POSBox te "
-"doen connecteren met een al bestaand netwerk gaat u naar de home pagina van "
-"de POSBox (aangegeven op het ticket) en gaat u naar de Wi-Fi configuratie "
-"pagina. Van hieruit kan u een netwerk kiezen om mee te verbinden. Merk op "
-"dat wij enkel open en WPA(2)-PSK netwerken ondersteunen. Wanneer u "
-"connecteert met een WPA-beveiligd netwerk moet u het wachtwoord veld "
-"invullen. De POSBox zal proberen te connecteren met het opgegeven netwerk en"
-" print een nieuw POSBox status ticket nadat deze verbonden is."
-
-#: ../../point_of_sale/overview/setup.rst:132
-msgid ""
-"If you plan on permanently setting up the POSBox with Wi-Fi, you can use the"
-" \"persistent\" checkbox on the Wi-Fi configuration page when connecting to "
-"a network. This will make the network choice persist across reboots. This "
-"means that instead of starting up its own \"Posbox\" network it will always "
-"attempt to connect to the specified network after it boots."
-msgstr ""
-"Indien u plant om uw POSBox direct op te zetten met Wi-FI kan u de optie "
-"*blijvend* aanvinken op de Wi-Fi configuratie pagina wanneer u connecteert "
-"met een netwerk. Dit zal de netwerk keuze aanhouden doorheen verschillende "
-"heropstarten. Dit betekend dat in plaats van het opstarten van een eigen "
-"*Posbox* netwerk de POSBox altijd zal proberen om te connecteren met het "
-"opgegeven netwerk na een boot."
-
-#: ../../point_of_sale/overview/setup.rst:139
-msgid ""
-"When the POSBox fails to connect to a network it will fall back to starting "
-"it's own \"Posbox\" Access Point. If connection is lost with a Wi-Fi network"
-" after connecting to it, the POSBox will attempt to re-establish connection "
-"automatically."
-msgstr ""
-"Wanneer de POSBox niet kan verbinden valt deze terug op het starten van zijn"
-" eigen *Posbox* toegangspunt. Indien de connectie verloren gaat met een Wi-"
-"Fi netwerk na er mee te verbinden zal de POSBox proberen de connectie "
-"automatisch te herstellen."
-
-#: ../../point_of_sale/overview/setup.rst:145
-msgid "Multi-POS Configuration"
-msgstr "Multi-POS configuratie"
-
-#: ../../point_of_sale/overview/setup.rst:147
-msgid ""
-"The advised way to setup a multi Point of Sale shop is to have one POSBox "
-"per Point of Sale. In this case it is mandatory to manually specify the IP "
-"address of each POSBox in each Point of Sale. You must also configure your "
-"network to make sure the POSBox's IP addresses don't change. Please refer to"
-" your router documentation."
-msgstr ""
-"De geadviseerde weg om een mult-kassa winkel omgeving op te zetten is om één"
-" POSbox per kassa te hebben. In dit geval is het verplicht om manueel het IP"
-" adres van elke POSBox op te geven in elke kassa. U moet ook uw netwerk "
-"configureren om u er van te verzekeren dat de POSBoxen hun IP adressen niet "
-"veranderen. Bekijk hiervoor aub uw router documentatie."
-
-#: ../../point_of_sale/overview/setup.rst:154
-msgid "POSBoxless Guide (advanced)"
-msgstr "Kassa zonder POSBox handleiding (geavanceerd)"
-
-#: ../../point_of_sale/overview/setup.rst:158
-msgid ""
-"If you are running your Point of Sale on a Debian-based Linux distribution, "
-"you do not need the POSBox as you can run its software locally. However the "
-"installation process is not foolproof. You'll need at least to know how to "
-"install and run Odoo. You may also run into issues specific to your "
-"distribution or to your particular setup and hardware configuration."
-msgstr ""
-"Indien u uw Kassa draait in een Debian gebaseerde Linux distributie heeft u "
-"de POSBox niet nodig om de software lokaal te draaien. Hoewel de installatie"
-" niet waterdicht is. U moet minimaal weten hoe u Odoo installeert en "
-"configureert. U kan ook tegen problemen aanlopen die specifiek zijn aan uw "
-"distributie of tot uw specifieke opzet / hardware configuratie."
-
-#: ../../point_of_sale/overview/setup.rst:165
-msgid ""
-"Drivers for the various types of supported hardware are provided as Odoo "
-"modules. In fact, the POSBox runs an instance of Odoo that the Point of Sale"
-" communicates with. The instance of Odoo running on the POSBox is very "
-"different from a 'real' Odoo instance however. It does not handle *any* "
-"business data (eg. POS orders), but only serves as a gateway between the "
-"Point of Sale and the hardware."
-msgstr ""
-"Drivers voor de verschillende soorten ondersteunde hardware worden "
-"aangeboden door de Odoo modules. In feite draait de POSBox een instatie van "
-"Odoo waarmee de Kassa communiceert. De instantie van Odoo die draait op de "
-"POSBox is totaal anders dan de 'echte' Odoo instantie. Het verwerkt geen "
-"zakelijke data (bijvoorbeeld kassa orders), maar dient enkel als een poort "
-"tussen de Kassa en de hardware."
-
-#: ../../point_of_sale/overview/setup.rst:172
-msgid ""
-"The goal of this section will be to set up a local Odoo instance that "
-"behaves like the Odoo instance running on the POSBox."
-msgstr ""
-
-#: ../../point_of_sale/overview/setup.rst:176
-msgid "Image building process"
-msgstr "Afbeelding bouwen proces"
-
-#: ../../point_of_sale/overview/setup.rst:178
-msgid ""
-"We generate the official POSBox images using the scripts in "
-"https://github.com/odoo/odoo/tree/11.0/addons/point_of_sale/tools/posbox. "
-"More specifically, we run `posbox_create_image.sh "
-"<https://github.com/odoo/odoo/blob/11.0/addons/point_of_sale/tools/posbox/posbox_create_image.sh>`_."
-" This builds an image called ``posbox.img``, which we zip and upload to "
-"`nightly.odoo.com <https://nightly.odoo.com>`_ for users to download."
-msgstr ""
-
-#: ../../point_of_sale/overview/setup.rst:186
-msgid ""
-"The scripts in this directory might be useful as a reference if you get "
-"stuck or want more detail about something."
-msgstr ""
-"De scripts in deze map zijn mogelijk handig als een referentie als u vastzit"
-" of meer details over iets wilt."
-
-#: ../../point_of_sale/overview/setup.rst:190
-msgid "Summary of the image creation process"
-msgstr "Samenvatting van het afbeelding bouw proces"
-
-#: ../../point_of_sale/overview/setup.rst:192
-msgid ""
-"The image creation process starts by downloading the latest `Raspbian "
-"<https://www.raspbian.org/>`_ image. It then locally mounts this Raspbian "
-"image and copies over some files and scripts that will make the Raspbian "
-"image turn itself into a POSBox when it boots. These scripts will update "
-"Raspbian, remove non-essential packages and install required packages. In "
-"order to boot Raspbian we use qemu, which is capable of providing ARM "
-"emulation. After this, the emulated Raspbian OS will shut itself down. We "
-"then once again locally mount the image, remove the scripts that were used "
-"to initialize the image at boot and we copy over some extra configuration "
-"files. The resulting image is then ready to be tested and used."
-msgstr ""
-"Het afbeelding aanmaak proces start door het downloaden van de laatste "
-"`Raspbian <https://www.raspbian.org/>`_ afbeelding. Deze mount vervolgens "
-"lokaal de Raspbian afbeelding en kopieert sommige bestanden en scripten die "
-"de Raspbian afbeelding veranderen in een POSBox wanneer deze opstart. Deze "
-"scripts updaten de Raspbian, verwijderen niet essentiële pakketten en "
-"installeren benodigde pakketten. Om de Raspbian op te starten gebruiken we "
-"qemu, wat mogelijkheid biedt om een ARM emulatie te doen. Hierna zal de "
-"geëmuleerde Raspbian OS zichzelf afsluiten. Vervolgens mounten we opnieuw de"
-" lokale afbeelding, verwijderen we de scripten die gebruikt zijn om de "
-"afbeelding bij de boot te initialiseren en we kopiëren configuratie "
-"bestanden. De resulterende afbeelding is dan klaar om te testen en te "
-"gebruiken."
-
-#: ../../point_of_sale/overview/setup.rst:207
-msgid "A Debian-based Linux distribution (Debian, Ubuntu, Mint, etc.)"
-msgstr "Een Debian gebaseerde Linux distributie (Debian, Ubuntu, Mint, etc.)"
-
-#: ../../point_of_sale/overview/setup.rst:208
-msgid "A running Odoo instance you connect to load the Point of Sale"
-msgstr ""
-
-#: ../../point_of_sale/overview/setup.rst:209
-msgid ""
-"You must uninstall any ESC/POS printer driver as it will conflict with "
-"Odoo's built-in driver"
-msgstr ""
-"U moet alle ECS/POS printer drivers verwijderen aangezien deze conflicteren "
-"met de Odoo ingebouwde driver"
-
-#: ../../point_of_sale/overview/setup.rst:216
-msgid "Extra dependencies"
-msgstr "Extra afhankelijkheden"
-
-#: ../../point_of_sale/overview/setup.rst:218
-msgid ""
-"Because Odoo runs on Python 2, you need to check which version of pip you "
-"need to use."
-msgstr ""
-"Omdat Odoo draait op Pyton 2 moet u controleren welke versie van pip u moet "
-"gebruiken."
-
-#: ../../point_of_sale/overview/setup.rst:221
-msgid "``# pip --version``"
-msgstr "``# pip --version``"
-
-#: ../../point_of_sale/overview/setup.rst:223
-#: ../../point_of_sale/overview/setup.rst:229
-msgid "If it returns something like::"
-msgstr "Als het iets terugstuurt zoals:"
-
-#: ../../point_of_sale/overview/setup.rst:227
-msgid "You need to try pip2 instead."
-msgstr "Moet u pip2 in de plaats gebruiken."
-
-#: ../../point_of_sale/overview/setup.rst:233
-msgid "You can use pip."
-msgstr "Kan u pip gebruiken."
-
-#: ../../point_of_sale/overview/setup.rst:235
-msgid "The driver modules requires the installation of new python modules:"
-msgstr "De driver module vereist de installatie van nieuwe Python modules:"
-
-#: ../../point_of_sale/overview/setup.rst:237
-msgid "``# pip install pyserial``"
-msgstr "``# pip install pyserial``"
-
-#: ../../point_of_sale/overview/setup.rst:239
-msgid "``# pip install pyusb==1.0.0b1``"
-msgstr "``# pip install pyusb==1.0.0b1``"
-
-#: ../../point_of_sale/overview/setup.rst:241
-msgid "``# pip install qrcode``"
-msgstr "``# pip install qrcode``"
-
-#: ../../point_of_sale/overview/setup.rst:244
-msgid "Access Rights"
-msgstr "Toegangsrechten"
-
-#: ../../point_of_sale/overview/setup.rst:246
-msgid ""
-"The drivers need raw access to the printer and barcode scanner devices. "
-"Doing so requires a bit system administration. First we are going to create "
-"a group that has access to USB devices"
-msgstr ""
-"Deze driver heeft ruwe toegang nodig tot de printer en barcode scanner "
-"toestellen. Om dit te doen is er wat systeem administratie nodig. Eerst "
-"maken we een groep die toegang heeft tot de USB toestellen"
-
-#: ../../point_of_sale/overview/setup.rst:250
-msgid "``# groupadd usbusers``"
-msgstr "``# groupadd usbusers``"
-
-#: ../../point_of_sale/overview/setup.rst:252
-msgid "Then we add the user who will run the OpenERP server to ``usbusers``"
-msgstr ""
-"Vervolgens voegen we de gebruiker toe aan ``usbusers`` die de Odoo server "
-"zal uitvoeren"
-
-#: ../../point_of_sale/overview/setup.rst:254
-msgid "``# usermod -a -G usbusers USERNAME``"
-msgstr "``# usermod -a -G usbusers USERNAME``"
-
-#: ../../point_of_sale/overview/setup.rst:256
-msgid ""
-"Then we need to create a udev rule that will automatically allow members of "
-"``usbusers`` to access raw USB devices. To do so create a file called "
-"``99-usbusers.rules`` in the ``/etc/udev/rules.d/`` directory with the "
-"following content::"
-msgstr ""
-
-#: ../../point_of_sale/overview/setup.rst:264
-msgid "Then you need to reboot your machine."
-msgstr "Dan moet u uw machine opnieuw opstarten."
-
-#: ../../point_of_sale/overview/setup.rst:267
-msgid "Start the local Odoo instance"
-msgstr "Start de lokale Odoo instantie"
-
-#: ../../point_of_sale/overview/setup.rst:269
-msgid "We must launch the Odoo server with the correct settings"
-msgstr "We moeten de Odoo server lanceren met de correcte instellingen"
-
-#: ../../point_of_sale/overview/setup.rst:271
-msgid ""
-"``$ ./odoo.py "
-"--load=web,hw_proxy,hw_posbox_homepage,hw_posbox_upgrade,hw_scale,hw_scanner,hw_escpos``"
-msgstr ""
-"``$ ./odoo.py "
-"--load=web,hw_proxy,hw_posbox_homepage,hw_posbox_upgrade,hw_scale,hw_scanner,hw_escpos``"
-
-#: ../../point_of_sale/overview/setup.rst:274
-msgid "Test the instance"
-msgstr "Test de instantie"
-
-#: ../../point_of_sale/overview/setup.rst:276
-msgid ""
-"Plug all your hardware to your machine's USB ports, and go to "
-"``http://localhost:8069/hw_proxy/status`` refresh the page a few times and "
-"see if all your devices are indicated as *Connected*. Possible source of "
-"errors are: The paths on the distribution differ from the paths expected by "
-"the drivers, another process has grabbed exclusive access to the devices, "
-"the udev rules do not apply or a superseded by others."
-msgstr ""
-"Plug alle hardware in uw machine zijn USB poorten, en ga naar "
-"``http://localhost:8069/hw_proxy/status``. Ververs de pagina een paar keer "
-"en zie of al uw apparaten aangeven dat ze **Verbonden** zijn. Mogelijke "
-"problemen zijn: De paden naar de distributie zijn anders dan die van de "
-"drivers, een ander proces heeft exclusieve toegang gekregen tot de "
-"toestellen, de udev regels worden niet toegepast of overheerst door anderen."
-
-#: ../../point_of_sale/overview/setup.rst:284
-msgid "Automatically start Odoo"
-msgstr "Start automatisch Odoo"
-
-#: ../../point_of_sale/overview/setup.rst:286
-msgid ""
-"You must now make sure that this Odoo install is automatically started after"
-" boot. There are various ways to do so, and how to do it depends on your "
-"particular setup. Using the init system provided by your distribution is "
-"probably the easiest way to accomplish this."
-msgstr ""
-"U moet er zich nu van verzekeren dat de Odoo installatie automatisch start "
-"na het opstarten van de PC. Er zijn verschillende manieren om dit te doen en"
-" dit is afhankelijk van uw opzet. Het gebruik van het init systeem van uw "
-"distributie is waarschijnlijk de gemakkelijkste weg om dit te bereiken."
-
-#: ../../point_of_sale/overview/setup.rst:294
-msgid ""
-"The IP address field in the POS configuration must be either ``127.0.0.1`` "
-"or ``localhost`` if you're running the created Odoo server on the machine "
-"that you'll use as the Point of Sale device. You can also leave it empty."
-msgstr ""
-"Het IP adres veld in de Kassa configuratie moet ``127.0.0.1`` of "
-"``localhost`` zijn als u de aangemaakte Odoo server heeft draaien op "
-"hetzelfde apparaat als waar u de Kassa op gebruikt. U kan het ook leeg "
-"laten."
-
-#: ../../point_of_sale/overview/setup.rst:300
-msgid "POSBox Technical Documentation"
-msgstr "Technische documentatie POSBox"
-
-#: ../../point_of_sale/overview/setup.rst:303
-msgid "Technical Overview"
-msgstr "Technisch overzicht"
-
-#: ../../point_of_sale/overview/setup.rst:306
-msgid "The POSBox Hardware"
-msgstr "De POSBox Hardware"
-
-#: ../../point_of_sale/overview/setup.rst:308
-msgid ""
-"The POSBox's Hardware is based on a `Raspberry Pi 2 "
-"<https://www.raspberrypi.org/products/raspberry-pi-2-model-b/>`_, a popular "
-"single-board computer. The Raspberry Pi 2 is powered with a 2A micro-usb "
-"power adapter. 2A is needed to give enough power to the barcode scanners. "
-"The Software is installed on a 8Gb Class 10 or Higher SD Card. All this "
-"hardware is easily available worldwide from independent vendors."
-msgstr ""
-"De POSBox zijn hardware is gebaseerd op een `Raspberry Pi 2 "
-"<https://www.raspberrypi.org/products/raspberry-pi-2-model-b/>`_, een "
-"populaire mini-computer. De Raspberry Pi 2 krijgt stroom via een 2A micro-"
-"usb lader. 2A is nodig om genoeg stroom te geven aan de barcode scanners. De"
-" software is geïnstalleerd op een 8GB klasse 10 of hoger SD kaart. Al deze "
-"hardware is wereldwijd gemakkelijk verkrijgbaar van onafhankelijke "
-"leveranciers."
-
-#: ../../point_of_sale/overview/setup.rst:317
-msgid "Compatible Peripherals"
-msgstr "Compatibele apparaten"
-
-#: ../../point_of_sale/overview/setup.rst:319
-msgid ""
-"Officially supported hardware is listed on the `POS Hardware page "
-"<https://www.odoo.com/page/pos-ipad-android-hardware>`_."
-msgstr ""
-"Officieel ondersteunde hardware is opgelijst op `de POS Hardware pagina "
-"<https://www.odoo.com/page/pos-ipad-android-hardware>`_,"
-
-#: ../../point_of_sale/overview/setup.rst:323
-msgid "The POSBox Software"
-msgstr "De POSBox software"
-
-#: ../../point_of_sale/overview/setup.rst:325
-msgid ""
-"The POSBox runs a heavily modified Raspbian Linux installation, a Debian "
-"derivative for the Raspberry Pi. It also runs a barebones installation of "
-"Odoo which provides the webserver and the drivers. The hardware drivers are "
-"implemented as Odoo modules. Those modules are all prefixed with ``hw_*`` "
-"and they are the only modules that are running on the POSBox. Odoo is only "
-"used for the framework it provides. No business data is processed or stored "
-"on the POSBox. The Odoo instance is a shallow git clone of the ``8.0`` "
-"branch."
-msgstr ""
-"De POSBox draait een hevig gewijzigde Raspbian Linux installatie, een Debian"
-" afgeleide van de Raspberry Pi. Het draait ook een basis installatie van "
-"Odoo die de webserver en de drivers aanbied. De hardware drivers zijn "
-"geïmplementeerd door Odoo modules. Deze drivers zijn allemaal prefixed met "
-"``hw_*``  en zijn de enige modules die op de POSBox draaien. Odoo wordt "
-"enkel gebruikt voor het framewerk dat het aanbied. Er wordt geen zakelijke "
-"data verwerkt of opgeslagen op de POSBox. De Odoo instantie is een kale git "
-"clone van de ``8.0`` branch."
-
-#: ../../point_of_sale/overview/setup.rst:334
-msgid ""
-"The root partition on the POSBox is mounted read-only, ensuring that we "
-"don't wear out the SD card by writing to it too much. It also ensures that "
-"the filesystem cannot be corrupted by cutting the power to the POSBox. Linux"
-" applications expect to be able to write to certain directories though. So "
-"we provide a ramdisk for /etc and /var (Raspbian automatically provides one "
-"for /tmp). These ramdisks are setup by ``setup_ramdisks.sh``, which we run "
-"before all other init scripts by running it in ``/etc/init.d/rcS``. The "
-"ramdisks are named /etc_ram and /var_ram respectively. Most data from /etc "
-"and /var is copied to these tmpfs ramdisks. In order to restrict the size of"
-" the ramdisks, we do not copy over certain things to them (eg. apt related "
-"data). We then bind mount them over the original directories. So when an "
-"application writes to /etc/foo/bar it's actually writing to "
-"/etc_ram/foo/bar. We also bind mount / to /root_bypass_ramdisks to be able "
-"to get to the real /etc and /var during development."
-msgstr ""
-"De root partitie op de POSbox is gemount als enkel leesbaar, wat ons "
-"verzekert dat we de SD kaart niet te veel belastingen door er zo vaak naar "
-"te schrijven. Het verzekert ons er ook van dat het bestandssysteem niet "
-"corrupt kan geraken door het uitvallen van de stroom op de POSBox maar Linux"
-" verwacht dat er kan geschreven worden naar verschillende mappen. Dus "
-"voorzien we een ramdisk voor /etc en /var (Raspbian biedt automatisch één "
-"aan voor /tp). Deze ramdisks zijn opgezet door ``setup_ramdisks.sh``, wat we"
-" uitvoeren voor alle andere init scripts door het te doen draaien in "
-"``/etc/init.d/rcS``. De ramdisks hebben de namen /etc_ram en /var_ram. De "
-"meeste data van /etc en /var is gekopieerd naar deze tmpfs ramdisks. Om de "
-"grootte van de ramdisks te limiteren kopieren we verschillende dingen niet "
-"over (bijvoorbeeld apt gerelateerde data). We bind mounten ze vervolgens "
-"over de originele mappen. Wanneer een applicatie schrijft naar /etc/foo/bar "
-"zal het dus eigenlijk schrijven naar /etc_ram/foo/bar. We bind mounten /to "
-"/root_bypass_rasms om de echte /etc en /var te kunnen bereiken tijdens "
-"ontwikkeling."
-
-#: ../../point_of_sale/overview/setup.rst:350
-msgid "Logs of the running Odoo server can be found at:"
-msgstr "Logs van de draaiende Odoo server kunnen gevonden worden onder:"
-
-#: ../../point_of_sale/overview/setup.rst:352
-msgid "``/var/log/odoo/odoo.log``"
-msgstr "``/var/log/odoo/odoo.log``"
-
-#: ../../point_of_sale/overview/setup.rst:354
-msgid ""
-"Various POSBox related scripts (eg. wifi-related scripts) running on the "
-"POSBox will log to /var/log/syslog and those messages are tagged with "
-"``posbox_*``."
-msgstr ""
-"Verschillende POSBox gerelateerde scripts (bijvoorbeeld Wi-Fi gerelateerde "
-"scripts) die op de POSBox draaien loggen onder /var/log/syslog en deze "
-"berichten zijn getagd met ``posbox_*``."
-
-#: ../../point_of_sale/overview/setup.rst:359
-msgid "Accessing the POSBox"
-msgstr "Toegang krijgen tot de POSBox"
-
-#: ../../point_of_sale/overview/setup.rst:362
-msgid "Local Access"
-msgstr "Lokale toegang"
-
-#: ../../point_of_sale/overview/setup.rst:364
-msgid ""
-"If you plug a QWERTY USB keyboard into one of the POSBox's USB ports, and if"
-" you connect a computer monitor to the *HDMI* port of the POSBox, you can "
-"use it as a small GNU/Linux computer and perform various administration "
-"tasks, like viewing some logs."
-msgstr ""
-"Als u een QWERTY USB toetsenbord in één van de POSBox zijn USB poorten "
-"insteekt en u een computerscherm connecteert met de *HDMI* port van de "
-"POSbox, kan u het gebruiken als een kleine GNU/Linux computer en "
-"verschillende administratieve taken uitvoeren, zoals het bekijken van de log"
-" bestanden."
-
-#: ../../point_of_sale/overview/setup.rst:369
-msgid "The POSBox will automatically log in as root on the default tty."
-msgstr "De POSBox logt automatisch in als root op de standaard tty."
-
-#: ../../point_of_sale/overview/setup.rst:372
-msgid "Remote Access"
-msgstr "Toegang van op afstand"
-
-#: ../../point_of_sale/overview/setup.rst:374
-msgid ""
-"If you have the POSBox's IP address and an SSH client you can access the "
-"POSBox's system remotely. The login credentials are ``pi``/``raspberry``."
-msgstr ""
-"Indien u de POSBox zijn IP adres hebt en een SSH cliënt hebt kan u het "
-"POSBox systeem van op afstand bereiken. De login gegevens zijn "
-"``pi``/``raspberry``."
-
-#: ../../point_of_sale/overview/setup.rst:379
-msgid "Updating The POSBox Software"
-msgstr "De POSBox software updaten"
-
-#: ../../point_of_sale/overview/setup.rst:381
-msgid ""
-"Only upgrade the POSBox if you experience problems or want to use newly "
-"implemented features."
-msgstr ""
-"Upgrade enkel de POSBox als u problemen ondervind of nieuw geïmplementeerde "
-"opties wilt gebruiken."
-
-#: ../../point_of_sale/overview/setup.rst:384
-msgid ""
-"The best way to update the POSBox software is to download a new version of "
-"the image and flash the SD-Card with it. This operation is described in "
-"detail in `this tutorial <http://elinux.org/RPi_Easy_SD_Card_Setup>`_, just "
-"replace the standard Raspberry Pi image with the latest one found at `the "
-"official POSBox image page <http://nightly.odoo.com/master/posbox/>`_. This "
-"method of upgrading will ensure that you're running the latest version of "
-"the POSBox software."
-msgstr ""
-"De beste manier om de POSBox software te updaten is door een nieuwe versie "
-"van de afbeelding te downloaden en de SD kaart er mee te flashen. Deze "
-"operatie is in detail uitgelegd in `deze tutorial "
-"<http://elinux.org/RPi_Easy_SD_Card_Setup>`_, vervang gewoon de standaard "
-"Raspberry PI afbeelding met de laatste op `de officiële POSBox afbeelding "
-"pagina <http://nightly.odoo.com/master/posbox/>`_. Deze methode van upgraden"
-" verzekert u er van dat u de laatste versie van de POSBox software heeft "
-"draaien."
-
-#: ../../point_of_sale/overview/setup.rst:393
-msgid ""
-"The second way of upgrading is through the built in upgrade interface that "
-"can be reached through the POSBox homepage. The nice thing about upgrading "
-"like this is that you don't have to flash a new image. This upgrade method "
-"is limited to what it can do however. It can not eg. update installed "
-"configuration files (like eg. /etc/hostapd.conf). It can only upgrade:"
-msgstr ""
-"De tweede manier om te upgraden is door de ingebouwde update interface die u"
-" kan vinden op de POSBox home pagina. Het mooie aan het upgraden via deze "
-"manier is dat u geen nieuwe afbeelding hoeft te flashen. De upgrade methode "
-"is gelimiteerd in wat het kan doen. Het kan geen geïnstalleerde configuratie"
-" bestanden updaten bijvoorbeeld (zoals /etc/hostapd.conf). Het kan enkel het"
-" volgende upgraden:"
-
-#: ../../point_of_sale/overview/setup.rst:400
-msgid "The internal Odoo application"
-msgstr "De interne Odoo applicatie"
-
-#: ../../point_of_sale/overview/setup.rst:401
-msgid ""
-"Scripts in the folder "
-"``odoo/addons/point_of_sale/tools/posbox/configuration/``"
-msgstr ""
-"Scripts in de folder "
-"``odoo/addons/point_of_sale/tools/posbox/configuration/``"
-
-#: ../../point_of_sale/overview/setup.rst:403
-msgid "When in doubt, always use the first method of upgrading."
-msgstr "Wanneer u twijfelt gebruikt u altijd de eerste methode van upgraden."
-
-#: ../../point_of_sale/overview/setup.rst:406
-msgid "Troubleshoot"
-msgstr "Troubleshoot"
-
-#: ../../point_of_sale/overview/setup.rst:409
-msgid "The POS cannot connect to the POSBox"
-msgstr "De kassa kan niet connecteren met de POSBox"
-
-#: ../../point_of_sale/overview/setup.rst:411
-msgid ""
-"The easiest way to make sure the POSBox is properly set-up is to turn it on "
-"with the printer plugged in as it will print a receipt indicating any error "
-"if encountered or the POSBox's IP address in case of success. If no receipt "
-"is printed, check the following steps:"
-msgstr ""
-"De gemakkelijkste manier om u er van te verzekeren dat de POSBox correct is "
-"opgezet is om de POSBox aan te zetten met de printer ingeplugd. De printer "
-"zal een ticket uitprinten waar eender welke foutmelding op wordt geprint of "
-"het IP adres van de POSBox indien alles in orde is. Controleer de volgende "
-"stappen als er geen ticket wordt geprint:"
-
-#: ../../point_of_sale/overview/setup.rst:415
-msgid ""
-"Make sure the POSBox is powered on, indicated by a brightly lit red status "
-"LED."
-msgstr ""
-"Verzeker u er van dat de POSBox opstaat en dat de LED een heldere rode "
-"status kleur heeft."
-
-#: ../../point_of_sale/overview/setup.rst:417
-msgid ""
-"Make sure the POSBox is ready, this is indicated by a brightly lit green "
-"status LED just next to the red power status LED. The POSBox should be ready"
-" ~2 minutes after it is started."
-msgstr ""
-"Verzeker u er van dat de POSBox klaar is, dit is aangegeven door een heldere"
-" groene status LED net naast de rode status LED. De POSBox zou klaar moeten "
-"zijn ~2 minuten nadat deze is opgestart."
-
-#: ../../point_of_sale/overview/setup.rst:420
-msgid ""
-"Make sure the POSBox is connected to the same network as your POS device. "
-"Both the device and the POSBox should be visible in the list of connected "
-"devices on your network router."
-msgstr ""
-"Verzeker u er van dat de POSBox is geconnecteerd met hetzelfde netwerk als "
-"uw Kassa toestel. Beide het toestel en de POSBox moeten zichtbaar zijn in de"
-" lijst van verbonden toestellen op uw netwerk router."
-
-#: ../../point_of_sale/overview/setup.rst:423
-msgid ""
-"Make sure that your LAN is set up with DHCP, and gives IP addresses in the "
-"range 192.168.0.X, 192.168.1.X, 10.0.0.X. If you cannot setup your LAN that "
-"way, you must manually set up your POSBox's IP address."
-msgstr ""
-
-#: ../../point_of_sale/overview/setup.rst:427
-msgid ""
-"If you have specified the POSBox's IP address in the configuration, make "
-"sure it correspond to the printed on the POSBox's status receipt."
-msgstr ""
-"Indien u de POSBox zijn IP heeft ingegeven op de configuratie moet u zich er"
-" van verzekeren dat deze correspondeert met het geprinte POSBox status "
-"ticket."
-
-#: ../../point_of_sale/overview/setup.rst:430
-msgid "Make sure that the POS is not loaded over HTTPS."
-msgstr "Verzeker u er van dat de POS niet over HTTPS laad."
-
-#: ../../point_of_sale/overview/setup.rst:431
-msgid ""
-"A bug in Firefox's HTTP implementation prevents the autodiscovery from "
-"working reliably. When using Firefox you should manually set up the POSBox's"
-" IP address in the POS configuration."
-msgstr ""
-"Een bug in Firefox zijn HTTP implementatie voorkomt de goede werking van de "
-"automatische ontdekking. Wanneer u Firefox gebruikt moet u manueel de POSBox"
-" zijn IP adres ingeven in de Kassa configuratie."
-
-#: ../../point_of_sale/overview/setup.rst:436
-msgid "The Barcode Scanner is not working"
-msgstr "De Barcode Scanner werkt niet"
-
-#: ../../point_of_sale/overview/setup.rst:438
-msgid ""
-"The barcode scanner must be configured in US QWERTY and emit an Enter after "
-"each barcode. This is the default configuration of most barcode readers. "
-"Refer to the barcode reader documentation for more information."
-msgstr ""
-"De barcode scanner moet geconfigureerd zijn in US QWERTY en moet een enter "
-"toevoegen achter de barcode. Dit is de standaard configuratie voor de meeste"
-" barcode lezers. Kijk naar de barcode documentatie voor meer informatie."
-
-#: ../../point_of_sale/overview/setup.rst:442
-msgid ""
-"The POSBox needs a 2A power supply to work with some barcode scanners. If "
-"you are not using the provided power supply, make sure the one you use has "
-"enough power."
-msgstr ""
-"De POSBox heeft ene 2A voeding nodig om te werken met sommige barcode "
-"scanners. Zorg ervoor dat de voeding die u gebruikt genoeg kracht heeft "
-"indien u niet de mee aangeboden voeding gebruikt."
-
-#: ../../point_of_sale/overview/setup.rst:445
-msgid ""
-"Some barcode scanners will need more than 2A and will not work, or will work"
-" unreliably, even with the provided power supply. In those case you can plug"
-" the barcode scanner in a self-powered USB hub."
-msgstr ""
-"Sommige barcode scanners hebben meer dan 2A nodig en zullen niet of "
-"onbetrouwbaar werken, zelfs met de meegeleverde voeding. In die gevallen kan"
-" u een barcode scanner inpluggen in een zelfvoorzienende USB hub."
-
-#: ../../point_of_sale/overview/setup.rst:448
-msgid ""
-"Some poorly built barcode scanners do not advertise themselves as barcode "
-"scanners but as a usb keyboard instead, and will not be recognized by the "
-"POSBox."
-msgstr ""
-"Sommige slechtgebouwde scanners adverteren zichzelf niet als barcode "
-"scanners maar als usb toetsenborden en zullen niet herkend worden door de "
-"POSBox."
-
-#: ../../point_of_sale/overview/setup.rst:453
-msgid "The Barcode Scanner is not working reliably"
-msgstr "De Barcode Scanner werkt niet betrouwbaar"
-
-#: ../../point_of_sale/overview/setup.rst:455
-msgid ""
-"Make sure that no more than one device with 'Scan via Proxy'/'Barcode "
-"Scanner' enabled are connected to the POSBox at the same time."
-msgstr ""
-"Zorg ervoor dat er niet meer dan één apparaat met de optie 'Scan via "
-"Proxy'/'Barcode Scanner' is aangevinkt en geconnecteerd is met de POSBox op "
-"dezelfde tijd."
-
-#: ../../point_of_sale/overview/setup.rst:460
-msgid "Printing the receipt takes too much time"
-msgstr "Het ticket printen duurt te lang"
-
-#: ../../point_of_sale/overview/setup.rst:462
-msgid ""
-"A small delay before the first print is expected, as the POSBox will do some"
-" preprocessing to speed up the next printings. If you suffer delays "
-"afterwards it is most likely due to poor network connection between the POS "
-"and the POSBox."
-msgstr ""
-"Een kleine vertraging voor de eerste print is normaal, aangezien de POSBox "
-"op voorhand wat verwerking doet om de volgende printopdrachten te "
-"versnellen. Als u hierna nog vertragingen heeft bij het printen is dit "
-"mogelijk door een slechte netwerkconnectie tussen de Kassa en de POSBox."
-
-#: ../../point_of_sale/overview/setup.rst:468
-msgid "Some characters are not correctly printed on the receipt"
-msgstr "Sommige karakters zijn niet correct afgedrukt op het ticket"
-
-#: ../../point_of_sale/overview/setup.rst:470
-msgid ""
-"The POSBox does not support all languages and characters. It currently "
-"supports Latin and Cyrillic based scripts, with basic Japanese support."
-msgstr ""
-"De POSBox ondersteunt niet alle talen en karakters. Het ondersteund "
-"momenteel Latin en Cyrillic gebaseerde scripts, met basis Japanse "
-"ondersteuning."
-
-#: ../../point_of_sale/overview/setup.rst:475
-msgid "The printer is offline"
-msgstr "De printer is offline"
-
-#: ../../point_of_sale/overview/setup.rst:477
-msgid ""
-"Make sure the printer is connected, powered, has enough paper and has its "
-"lid closed, and is not reporting an error. If the error persists, please "
-"contact support."
-msgstr ""
-"Verzeker u er van dat de printer verbonden is, opstaat, genoeg papier heeft,"
-" dat het deksel gesloten is en dat de printer geen fouten meld. Gelieve "
-"support te contacteren als deze fout zich blijft voordoen."
-
-#: ../../point_of_sale/overview/setup.rst:482
-msgid "The cashdrawer does not open"
-msgstr "De kassalade opent niet"
-
-#: ../../point_of_sale/overview/setup.rst:484
-msgid ""
-"The cashdrawer should be connected to the printer and should be activated in"
-" the POS configuration."
-msgstr ""
-"De kassalade moet verbonden zijn met de printer en moet geactiveerd worden "
-"in de POS configuratie."
-
-#: ../../point_of_sale/overview/setup.rst:488
-msgid "Credits"
-msgstr "Krediet"
-
-#: ../../point_of_sale/overview/setup.rst:489
-msgid ""
-"The POSBox project was developed by Frédéric van der Essen with the kind "
-"help of Gary Malherbe, Fabien Meghazi, Nicolas Wisniewsky, Dimitri Del "
-"Marmol, Joren Van Onder and Antony Lesuisse."
-msgstr ""
-"Het POSBox project was ontwikkeld door Frédéric van der Essen met de hulp "
-"van Gary Malherbe, Fabien Meghazi, Nicolas Wisniewsky, Dimitri Del Marmol, "
-"Joren Van Onder en Antony Lesuisse."
-
-#: ../../point_of_sale/overview/setup.rst:493
-msgid ""
-"This development would not have been possible without the Indiegogo campaign"
-" and those who contributed to it. Special thanks goes to the partners who "
-"backed the campaign with founding partner bundles:"
-msgstr ""
-"Deze ontwikkeling zou niet mogelijk zijn zonder de Indiegogo campagne en de "
-"mensen die hier aan hebben bijgedragen. Speciale dank gaat naar de partners "
-"die de campagne hebben gesteund met de POSBox oprichters bundel:"
-
-#: ../../point_of_sale/overview/setup.rst:497
-msgid "Camptocamp"
-msgstr "Camptocamp"
-
-#: ../../point_of_sale/overview/setup.rst:498
-msgid "BHC"
-msgstr "BHC"
-
-#: ../../point_of_sale/overview/setup.rst:499
-msgid "openBig"
-msgstr "openBig"
-
-#: ../../point_of_sale/overview/setup.rst:500
-msgid "Eeezee-IT"
-msgstr "Eeezee-IT"
-
-#: ../../point_of_sale/overview/setup.rst:501
-msgid "Solarsis LDA"
-msgstr "Solarsis LDA"
-
-#: ../../point_of_sale/overview/setup.rst:502
-msgid "ACSONE"
-msgstr "ACSONE"
-
-#: ../../point_of_sale/overview/setup.rst:503
-msgid "Vauxoo"
-msgstr "Vauxoo"
-
-#: ../../point_of_sale/overview/setup.rst:504
-msgid "Ekomurz"
-msgstr "Ekomurz"
-
-#: ../../point_of_sale/overview/setup.rst:505
-msgid "Datalp"
-msgstr "Datalp"
-
-#: ../../point_of_sale/overview/setup.rst:506
-msgid "Dao Systems"
-msgstr "Dao Systems"
-
-#: ../../point_of_sale/overview/setup.rst:507
-msgid "Eggs Solutions"
-msgstr "Eggs Solutions"
-
-#: ../../point_of_sale/overview/setup.rst:508
-msgid "OpusVL"
-msgstr "OpusVL"
-
-#: ../../point_of_sale/overview/setup.rst:510
-msgid ""
-"And also the partners who've backed the development with the Founding POSBox"
-" Bundle:"
-msgstr ""
-"En ook de partners die de ontwikkeling hebben gesteund met de POSBox "
-"oprichters bundel:"
-
-#: ../../point_of_sale/overview/setup.rst:513
-msgid "Willow IT"
-msgstr "Willow IT"
-
-#: ../../point_of_sale/overview/setup.rst:514
-msgid "E\\. Akhalwaya & Sons"
-msgstr "E\\. Akhalwaya & Sons"
-
-#: ../../point_of_sale/overview/setup.rst:515
-msgid "Multibase"
-msgstr "Multibasis"
-
-#: ../../point_of_sale/overview/setup.rst:516
-msgid "Mindesa"
-msgstr "Mindesa"
-
-#: ../../point_of_sale/overview/setup.rst:517
-msgid "bpso.biz"
-msgstr "bpso.biz"
-
-#: ../../point_of_sale/overview/setup.rst:518
-msgid "Shine IT."
-msgstr "Shine IT."
-
 #: ../../point_of_sale/overview/start.rst:3
 msgid "Getting started with Odoo Point of Sale"
 msgstr "Starten met de Odoo kassa"
@@ -1894,6 +824,12 @@ msgstr ""
 msgid "It's done, you have now closed your first PoS session."
 msgstr ""
 
+#: ../../point_of_sale/overview/start.rst:133
+msgid ""
+"To connect the PoS to hardware with an Odoo IoT Box, please see the section "
+":doc:`../../../iot/connect` and :doc:`../../../iot/pos`"
+msgstr ""
+
 #: ../../point_of_sale/restaurant.rst:3
 msgid "Advanced Restaurant Features"
 msgstr "Geavanceerde Restaurant opties"
@@ -1959,7 +895,7 @@ msgstr ""
 
 #: ../../point_of_sale/restaurant/kitchen_printing.rst:16
 msgid ""
-"Under the PosBox / Hardware Proxy category, you will find *Order Printers*."
+"Under the IoT Box / Hardware Proxy category, you will find *Order Printers*."
 msgstr ""
 
 #: ../../point_of_sale/restaurant/kitchen_printing.rst:19
@@ -2251,7 +1187,7 @@ msgstr ""
 
 #: ../../point_of_sale/shop/cash_control.rst:24
 msgid ""
-"When clicking on *->Opening/Closing Values* you will be able to create those"
+"When clicking on **Opening/Closing Values** you will be able to create those"
 " values."
 msgstr ""
 
diff --git a/locale/nl/LC_MESSAGES/practical.po b/locale/nl/LC_MESSAGES/practical.po
index e7b33446c..eef21647f 100644
--- a/locale/nl/LC_MESSAGES/practical.po
+++ b/locale/nl/LC_MESSAGES/practical.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2015-TODAY, Odoo S.A.
-# This file is distributed under the same license as the Odoo Business package.
+# This file is distributed under the same license as the Odoo package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 10.0\n"
+"Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-07 09:30+0200\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Yenthe Van Ginneken <yenthespam@gmail.com>, 2017\n"
+"Last-Translator: Yenthe Van Ginneken <yenthespam@gmail.com>, 2018\n"
 "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/locale/nl/LC_MESSAGES/project.po b/locale/nl/LC_MESSAGES/project.po
index b2571bd5f..030c3c4d6 100644
--- a/locale/nl/LC_MESSAGES/project.po
+++ b/locale/nl/LC_MESSAGES/project.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-26 12:01+0200\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Cas Vissers <casvissers@brahoo.nl>, 2017\n"
+"Last-Translator: Eric Geens <eric.geens@vitabiz.be>, 2018\n"
 "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -192,10 +192,6 @@ msgstr ""
 "website knop in de rechterbovenhoek en het te bevestigen in de voorkant van "
 "de website."
 
-#: ../../project/advanced/feedback.rst:111
-msgid ":doc:`claim_issue`"
-msgstr ":doc:`claim_issue`"
-
 #: ../../project/advanced/so_to_task.rst:3
 msgid "How to create tasks from sales orders?"
 msgstr "Hoe taken aanmaken vanuit verkooporders?"
@@ -246,7 +242,7 @@ msgstr ""
 #: ../../project/configuration/time_record.rst:12
 #: ../../project/planning/assignments.rst:10
 msgid "Configuration"
-msgstr "Instelling"
+msgstr "Instellingen"
 
 #: ../../project/advanced/so_to_task.rst:27
 msgid "Install the required applications"
diff --git a/locale/nl/LC_MESSAGES/purchase.po b/locale/nl/LC_MESSAGES/purchase.po
index 30525ce93..5a6396afa 100644
--- a/locale/nl/LC_MESSAGES/purchase.po
+++ b/locale/nl/LC_MESSAGES/purchase.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2015-TODAY, Odoo S.A.
-# This file is distributed under the same license as the Odoo Business package.
+# This file is distributed under the same license as the Odoo package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 10.0\n"
+"Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-22 15:27+0100\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Eric Geens <ericgeens@yahoo.com>, 2017\n"
+"Last-Translator: Erwin van der Ploeg <erwin@odooexperts.nl>, 2018\n"
 "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,450 +20,7 @@ msgstr ""
 
 #: ../../purchase.rst:5
 msgid "Purchase"
-msgstr "Inkoop"
-
-#: ../../purchase/overview.rst:3
-#: ../../purchase/replenishment/flows/dropshipping.rst:6
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:6
-#: ../../purchase/replenishment/flows/warning_triggering.rst:6
-#: ../../purchase/replenishment/multicompany/setup.rst:6
-msgid "Overview"
-msgstr "Overzicht"
-
-#: ../../purchase/overview/process.rst:3
-msgid "Process Overview"
-msgstr "Proces overzicht"
-
-#: ../../purchase/overview/process/difference.rst:3
-msgid "Request for Quotation, Purchase Tender or Purchase Order?"
-msgstr "Offerteaanvraag, lastenboek of inkooporder ?"
-
-#: ../../purchase/overview/process/difference.rst:5
-msgid ""
-"Although they are intimately related, Requests for Quotation, Purchase "
-"Tenders and Purchase Orders are not the same."
-msgstr ""
-"Hoewel ze nauw met elkaar verbonden zijn, zijn een offerteaanvraag, een "
-"lastenboek of een inkooporder niet hetzelfde."
-
-#: ../../purchase/overview/process/difference.rst:8
-msgid ""
-"A **Request for Quotation** (RfQ) is used when you plan to purchase some "
-"products and you would like to receive a quote for those products. In Odoo, "
-"the Request for Quotation is used to send your list of desired products to "
-"your supplier. Once your supplier has answered your request, you can choose "
-"to go ahead with the offer and purchase or to turn down the offer."
-msgstr ""
-"Men spreekt van een **Offerteaanvraag** ( ook Request for Quotation of RfQ "
-"genoemd) wanneer u van plan bent een ​​aantal producten aan te kopen, en u "
-"wilt graag voor deze producten een offerte ontvangen. De offerteaanvraag is "
-"een lijst van gewenste producten waarvoor u bij uw leverancier om een "
-"prijsaanbod vraagt. Zodra uw leverancier uw vraag heeft beantwoord, kunt u "
-"ervoor kiezen om het aanbod te aanvaarden en over te gaan tot aankoop, of u "
-"kunt het aanbod afwijzen ."
-
-#: ../../purchase/overview/process/difference.rst:15
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:5
-msgid ""
-"A **Purchase Tender** (PT), also known as Call for Bids, is used to drive "
-"competition between several suppliers in order to get the best offer for a "
-"list of products. In comparison to the RfQ, a Purchase Tender is sent to "
-"multiple suppliers, stating each are competing with one another, and that "
-"the best offer will win. The main interest is that it usually leads to "
-"better offers."
-msgstr ""
-"Een **Lastenboek** (ook bekend als een Aanbesteding) wordt gebruikt om de "
-"concurrentie tussen verschillende leveranciers uit te spelen om zo het beste"
-" aanbod in de wacht te slepen. In tegenstelling tot de offerteaanvraag, "
-"wordt een lastenboek naar meerdere leveranciers verstuurd, waarin gemeld "
-"wordt dat het meest concurrentiële aanbod de opdracht zal worden toegewezen."
-" De voornaamste reden om een lastenboek uit te schrijven, is dat dit meestal"
-" leidt tot betere aanbiedingen."
-
-#: ../../purchase/overview/process/difference.rst:22
-msgid ""
-"The **Purchase Order** (PO) is the actual order that you place to the "
-"supplier that you chose, either through a RfQ, a Purchase Tender, or simply "
-"when you already know which supplier to order from."
-msgstr ""
-"Het **inkooporder** (de PO, of de bestelling) is de daadwerkelijke "
-"bestelling die u plaatst bij de leverancier van uw keuze. Dat kan door "
-"middel van een offerteaanvraag, een aanbesteding, of gewoon omdat u al weet "
-"bij welke leverancier u wenst te bestellen."
-
-#: ../../purchase/overview/process/difference.rst:27
-msgid "When to use?"
-msgstr "Wanneer te gebruiken?"
-
-#: ../../purchase/overview/process/difference.rst:29
-msgid ""
-"A **RfQ** is interesting when you have never purchased the products with "
-"that supplier before and therefore don't know their price. It is also useful"
-" if you want to challenge your suppliers once you have a well-established "
-"relationship with them. You can also use it to assess the cost of a project "
-"and see if it makes it feasible."
-msgstr ""
-"Een **offerteaanvraag\" is interessant wanneer u nog nooit producten bij een"
-" bepaalde leverancier hebt aangekocht, en u wilt de prijs ervan kennen. U "
-"kunt het ook gebruiken om leveranciers opnieuw te evalueren wanneer u reeds "
-"een gevestigde relatie met hen hebt. U kunt het zelfs gebruiken om de kosten"
-" van een project te beoordelen, en dan te bepalen of het wel haalbaar is."
-
-#: ../../purchase/overview/process/difference.rst:35
-msgid ""
-"A **Purchase Tender** is used for public offers that require an open "
-"offering from several suppliers. It is also useful when you need to make a "
-"one-off order for a product and you would like to get the best offer, no "
-"matter which supplier it is. It may be used when your supplier has not been "
-"up to your standards and you would like to either push them to deliver a "
-"better service, or find a replacement in their competitors."
-msgstr ""
-"Een **lastenboek** (of aanbesteding) wordt gebruikt voor openbare "
-"aanbiedingen waarbij een publiek aanbod van verschillende leveranciers nodig"
-" is. Wanneer u een eenmalige aankoop wilt doen en u wilt daarvoor de beste "
-"prijs ongeacht de leverancier, dan kunt u gebruik maken van een lastenboek. "
-"Ook wanneer u vindt dat uw leverancier niet aan uw eisen beantwoordt, kunt u"
-" een lastenboek inroepen om hem tot een betere dienstverlening aan te "
-"zetten, of een vervanger onder zijn concurrenten te vinden."
-
-#: ../../purchase/overview/process/difference.rst:43
-msgid "When not to use?"
-msgstr "Wanneer niet te gebruiken?"
-
-#: ../../purchase/overview/process/difference.rst:45
-msgid ""
-"**RfQ**\\ s become unnecessary once you have established your favorite "
-"supplier for each item, and will only increase the delay in the delivery of "
-"your items. In that case, the process will be simpler by starting straight "
-"from a Purchase Order."
-msgstr ""
-"**Offerteaanvragen** worden overbodig van zodra u een bevoorrechte relatie "
-"hebt met de leverancier van uw keuze; in dat geval vertraagt een "
-"offerteaanvraag enkel maar de levering van uw goederen. U kunt dan beter het"
-" proces eenvoudig houden en meteen een inkooporder plaatsen."
-
-#: ../../purchase/overview/process/difference.rst:50
-msgid ""
-"**Purchase Tenders** are a long and tedious process that will likely take "
-"more than several weeks in the best cases. If you need a quick delivery, "
-"this is not the way to go. Also, if you have a well-established relationship"
-" with one supplier, think twice before you initiate a PT with them as it "
-"might tear the relationship and finally lead to less interesting deals."
-msgstr ""
-"**Aanbestedingen** zijn een lang en moeizaam proces dat in de meeste "
-"gevallen enkele weken tot maanden in beslag neemt. Als u een snelle levering"
-" wenst, is een aanbesteding zeker af te raden. Hebt u reeds een lange "
-"relatie met een bestaande leverancier? Dan doet u er misschien goed aan om "
-"even na te denken of een aanbesteding nodig is; mogelijks komt de relatie in"
-" het gedrang. En tevens loopt u het risico om minder goede aanbiedingen in "
-"de toekomst te zullen krijgen."
-
-#: ../../purchase/overview/process/difference.rst:58
-#: ../../purchase/replenishment/flows/compute_date.rst:139
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:39
-msgid "Example"
-msgstr "Voorbeeld"
-
-#: ../../purchase/overview/process/difference.rst:60
-msgid ""
-"My company builds wooden furniture. For the new series of table we are "
-"designing, we need some screws, metal frames and rubber protections."
-msgstr ""
-"Mijn bedrijf vervaardigt houten meubelen. Voor een nieuwe reeks tafels die "
-"we ontwerpen, hebben we schroeven, metalen kaders en rubberen "
-"beveiligingsonderdelen nodig."
-
-#: ../../purchase/overview/process/difference.rst:63
-msgid ""
-"I create a Request for Quotation in Odoo with those products to my usual "
-"supplier, and send it by email. He answers back with an offer. However, I am"
-" not convinced by the offer, and I want to see if anyone can give a better "
-"one."
-msgstr ""
-"Ik maak een offerteaanvraag met deze producten aan in Odoo, en stuur ze via "
-"e-mail naar mijn gebruikelijke leverancier. Hij antwoord met een offerte. "
-"Het aanbod overtuigt me echter niet, en ik vraag me af of iemand anders geen"
-" betere offerte kan maken."
-
-#: ../../purchase/overview/process/difference.rst:68
-msgid ""
-"I decide to push competition a bit and set up a Purchase Tender, that Odoo "
-"will send to a list of suppliers I specified. Out of the 8 offers I receive,"
-" one gets my attention and I decide to go ahead with that one."
-msgstr ""
-"Ik besluit om de concurrentie uit te spelen, en schrijf een aanbesteding "
-"uit. Ik selecteer een aantal leveranciers, en Odoo stuurt automatisch de "
-"aanbesteding uit. Van de 8 antwoorden die ik ontvang, is er één die mijn "
-"aandacht trekt, en ik besluit dan ook verder te gaan met deze leverancier."
-
-#: ../../purchase/overview/process/difference.rst:72
-msgid ""
-"I confirm the order to the supplier by creating a Purchase Order from the "
-"PT, and Odoo automatically asks delivery of the items to the supplier."
-msgstr ""
-"Vanuit de aanbesteding bevestig ik de bestelling bij de leverancier door een"
-" inkooporder te plaatsen, en Odoo vraagt automatisch aan de leverancier om "
-"de producten te leveren."
-
-#: ../../purchase/overview/process/difference.rst:77
-#: ../../purchase/purchases/master/suppliers.rst:16
-#: ../../purchase/purchases/master/uom.rst:22
-#: ../../purchase/purchases/rfq/3_way_matching.rst:18
-#: ../../purchase/purchases/rfq/analyze.rst:24
-#: ../../purchase/purchases/rfq/bills.rst:31
-#: ../../purchase/purchases/rfq/create.rst:16
-#: ../../purchase/purchases/rfq/reception.rst:14
-#: ../../purchase/purchases/tender/partial_purchase.rst:14
-#: ../../purchase/replenishment/flows/dropshipping.rst:13
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:58
-#: ../../purchase/replenishment/flows/warning_triggering.rst:21
-msgid "Configuration"
-msgstr "Instelling"
-
-#: ../../purchase/overview/process/difference.rst:79
-msgid ""
-"If you want to know how to create a **Purchase Order**, read the "
-"documentation on :doc:`from_po_to_invoice`"
-msgstr ""
-"Wilt u weten hoe u een **inkooporder** aanmaakt? Lees dan de documentatie op"
-" :doc:`from_po_to_invoice`"
-
-#: ../../purchase/overview/process/difference.rst:82
-msgid ""
-"If you want to know how to create a **RfQ**, read the documentation on "
-":doc:`../../purchases/rfq/create`"
-msgstr ""
-"Als u wilt weten hoe u een **RfQ** aanmaakt, lees dan de documentatie op "
-":doc:`../../purchases/rfq/create`"
-
-#: ../../purchase/overview/process/difference.rst:85
-msgid ""
-"If you want to know how to create a **Purchase Tender**, read the "
-"documentation on :doc:`../../purchases/tender/manage_multiple_offers`"
-msgstr ""
-"En om te weten hoe u een **aanbesteding of lastenboek** opmaakt, leest u de "
-"documentatie op :doc:`../../purchases/tender/manage_multiple_offers`"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:3
-msgid "From purchase order to invoice and receptions"
-msgstr "Van inkooporder naar factuur en ontvangst"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:5
-msgid ""
-"For most of your everyday purchases, chances are you already know where to "
-"purchase and at what price. For these cases, a simple Purchase Order (PO) "
-"will allow you to handle the whole process."
-msgstr ""
-"Voor de meeste van uw dagelijkse aankopen weet u waarschijnlijk al bij wie u"
-" wilt aankopen en aan welke prijs. Voor dit soort inkopen volstaat een "
-"eenvoudig inkooporder (ook wel PO genoemd) om het volledige inkoopproces af "
-"te handelen."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:9
-msgid ""
-"In Odoo, a purchase order can be created as is, but can also be the result "
-"of a Request for Quotation or of a Purchase Tender. Therefore, every "
-"purchase made in Odoo has a PO."
-msgstr ""
-"U kunt gewoon een inkooporder opmaken, maar zo'n order kan ook het resultaat"
-" zijn van een offerteaanvraag of een aanbesteding. Daarom wordt elke aankoop"
-" binnen Odoo aan een inkooporder gelinkt. "
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:13
-msgid ""
-"The PO will generate an invoice, and depending on the contract with your "
-"supplier, you will be required to pay the invoice before or after delivery."
-msgstr ""
-"Zo\"n inkooporder maakt een inkoopfactuur aan. Naargelang het contract dat u"
-" met uw leverancier hebt, moet u deze factuur betalen voor of na de "
-"levering."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:18
-msgid "Install the Purchase Management application"
-msgstr "Installeren van de applicatie Inkoopbeheer"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:20
-msgid ""
-"From the **Apps** application, search and install the **Purchase "
-"Management** application."
-msgstr ""
-"Ga naar de module **Applicaties**. Zoek naar **Inkoopbeheer** en installeer "
-"de applicatie."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:27
-msgid "Creating a Purchase Order"
-msgstr "Een inkooporder aanmaken"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:29
-msgid ""
-"In the **Purchases** app, open the **Purchase** menu and click on **Purchase"
-" Orders**."
-msgstr ""
-"Open het menu **Inkoop** in de applicatie **Inkopen**, en klik op "
-"**Inkooporders**."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:32
-msgid "In the **Purchase Orders** window, click on **Create**."
-msgstr "In het scherm **Inkooporders** klikt u op **Aanmaken**."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:37
-msgid ""
-"From the new window, insert the **Vendor** and type in the **Order Date**."
-msgstr ""
-"U kunt nu een **Leverancier** uit de lijst kiezen. U kunt opteren om de "
-"standaard besteldatum te gebruiken, of een andere datum te kiezen. U kunt "
-"eveneens de referentie van de leverancier invoeren, zodat u het inkooporder "
-"eenvoudig kan terugvinden."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:40
-msgid "In the **Products** section, click on **Add an item**."
-msgstr "In het tabblad **Producten** klikt u op **Item toevoegen**."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:45
-msgid "Select your product from the list and add a description if necessary."
-msgstr ""
-"Selecteer het gewenste product uit de lijst, en voeg een omschrijving toe "
-"indien nodig."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:47
-msgid "The **Scheduled Date** menu corresponds to the expected delivery date."
-msgstr "In het veld **Geplande datum** vult u de verwachte leverdatum in. "
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:49
-msgid ""
-"Type in the quantity which you wish to purchase, then click on **Save** and "
-"on **Confirm Order**."
-msgstr ""
-"U voert de hoeveelheid in die u wilt aankopen. Daarna klikt u op **Opslaan**"
-" en uiteindelijk op **Bevestig order** om het inkooporder daadwerkelijk te "
-"plaatsen."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:53
-msgid ""
-"If you wish to go through the complete flow and create a **Request for "
-"Quotation** for this order, refer to the document on "
-":doc:`../../purchases/rfq/create`"
-msgstr ""
-"Als u het volledige proces wil doorlopen en voorafgaand aan het order een "
-"**Offerteaanvraag** wil lanceren, dan verwijzen we u naar het hoofdstuk "
-":doc:`../../purchases/rfq/create`"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:57
-msgid ""
-"As you can see, the status of the PO has switched to ``Purchase Order``."
-msgstr ""
-"U ziet bovenaan de statusbalk dat de status van het order gewijzigd is in "
-"``Inkooporder``."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:63
-msgid "Registering invoice, payments and receiving products"
-msgstr "Facturatie, betaling en ontvangst van goederen"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:65
-msgid ""
-"Depending on the contract you have with your supplier, you can either pay "
-"for the purchase upon delivery of the goods, or get the goods delivered "
-"after payment."
-msgstr ""
-"Naargelang het contract dat u met uw leverancier heeft, moet u de "
-"aangekochte goederen bij of na levering betalen. Het kan echter ook zijn dat"
-" u de goederen vooraf dient te betalen vooraleer ze geleverd worden."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:70
-msgid "Payment upon or after reception"
-msgstr "Betaling bij of na levering"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:72
-msgid "Still from your purchase order, click on **Receive Products**."
-msgstr ""
-"Om de goederen te ontvangen, gaat u naar de lijst van inkooporders. U zoekt "
-"het desbetreffende inkooporder en klikt u op **Producten ontvangen**."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:74
-msgid ""
-"In the next page, check that the number of products received corresponds to "
-"the number ordered, then manually enter the delivered quantity and click on "
-"**Validate**."
-msgstr ""
-"Controleer of het geleverde aantal overeenstemt met het aantal bestelde. "
-"Klik op **Bewerken** en vul manueel het geleverde aantal in in de kolom "
-"'Voltooid'. Klik daarna op **Bevestig**."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:81
-msgid ""
-"Go back to the PO. In the PO, a **Shipment** and an **Invoice** button have "
-"appeared."
-msgstr ""
-"Ga terug naar het inkooporder. U ziet dat er bovenaan het document twee "
-"knoppen zijn toegevoegd: **Levering** en **Facturen**."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:87
-msgid ""
-"Click on the **Invoices** button, then click on **Validate**. The invoice is"
-" now registered in the system. Click on **Register Payment**, insert the "
-"detail of the payment, and click on **Validate**."
-msgstr ""
-"Klik op **Facturen**, en daarna op **Bevestigen**. De inkoopfactuur is nu in"
-" het systeem opgenomen en wacht op betaling. Wanneer u de factuur wil "
-"betalen, klikt u op **Betaling registreren**. U vult de diverse gegevens "
-"betreffende de betaling in, en klikt op **Bevestigen**."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:94
-#: ../../purchase/overview/process/from_po_to_invoice.rst:124
-msgid ""
-"Your products are now ready for picking and storage, and the invoice is "
-"marked as paid."
-msgstr ""
-"Uw producten zijn nu klaar om in het magazijn te worden opgenomen, en ze te "
-"verzenden aan uw klanten. De factuur wordt afgehandeld als betaald."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:98
-msgid "Upfront payment"
-msgstr "Vooruitbetaling"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:100
-msgid ""
-"From the **Purchase Order** page, open the **Invoices** tab, then click on "
-"**Create**."
-msgstr ""
-"Maak een nieuw inkooporder aan zoals hierboven beschreven via het menu "
-"**Inkooporders**. Kies een leverancier, vul de gewenste producten in en maak"
-" bevestig het order. U ziet nu bovenaan het tabblad **Facturen**. Klik erop,"
-" en klik daarna op **Aanmaken**."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:103
-msgid ""
-"In the next page, click on **Validate**. The invoice is now registered in "
-"the system. Click on **Register Payment**, insert the detail of the payment,"
-" and click on **Validate**."
-msgstr ""
-"Klik op **Facturen**, en daarna op **Bevestigen**. De inkoopfactuur is nu in"
-" het systeem opgenomen en wacht op betaling. Wanneer u de factuur wil "
-"betalen, klikt u op **Betaling registreren**. U vult de diverse gegevens "
-"betreffende de betaling in, en klikt op **Bevestigen**."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:110
-msgid ""
-"Go back to the PO. In the PO, a **Shipment** tab and an **Invoice** tab have"
-" appeared."
-msgstr ""
-"Ga terug naar het inkooporder. U ziet dat er bovenaan het document twee "
-"tabbladen zijn toegevoegd: **Levering** en **Facturen**."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:116
-msgid ""
-"Click on **Receive Products**, then in the new page, click on **Validate**."
-msgstr ""
-"Klik op **Goederen ontvangen** en klik vervolgens in de nieuwe pagina op "
-"**Valideren**."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:121
-msgid ""
-"A window will appear, asking if you wish to process every item at once. "
-"Click on **Apply**."
-msgstr ""
-"Een venster verschijnt dat vraagt of u elk product in één keer wilt "
-"verwerken. Klik op **Toepassen**."
+msgstr "Inkopen"
 
 #: ../../purchase/purchases.rst:3
 msgid "Purchases"
@@ -474,458 +31,92 @@ msgid "Master Data"
 msgstr "Stamgegevens"
 
 #: ../../purchase/purchases/master/import.rst:3
-msgid "How to import supplier pricelists?"
-msgstr "Hoe leverancier prijslijsten te importeren?"
+msgid "Import vendors pricelists"
+msgstr ""
 
-#: ../../purchase/purchases/master/import.rst:6
-msgid "Introduction"
-msgstr "Introductie"
-
-#: ../../purchase/purchases/master/import.rst:8
+#: ../../purchase/purchases/master/import.rst:5
 msgid ""
-"Big companies use to import supplier pricelists day to day. Indeed, prices "
-"are always changing and you need to get price up to date to deal with a high"
-" number of products."
+"It is key for companies to be able to import vendors pricelists to stay up "
+"to date on products pricing."
 msgstr ""
-"Grote bedrijven zijn het gewoon om prijslijsten van leveranciers dagelijks "
-"te importeren. Dat is nodig want prijzen kunnen dagelijks wijzigen, en u "
-"moet dus snel uw prijzen kunnen bijwerken als u met een groot aantal "
-"producten werkt."
 
-#: ../../purchase/purchases/master/import.rst:12
+#: ../../purchase/purchases/master/import.rst:9
+#: ../../purchase/purchases/master/uom.rst:22
+#: ../../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/create.rst:13
+#: ../../purchase/purchases/rfq/lock_orders.rst:9
+#: ../../purchase/purchases/rfq/reception.rst:14
+#: ../../purchase/purchases/rfq/warning.rst:14
+#: ../../purchase/purchases/tender/blanket_orders.rst:10
+#: ../../purchase/purchases/tender/call_for_tender.rst:9
+#: ../../purchase/replenishment/flows/dropshipping.rst:13
+msgid "Configuration"
+msgstr "Instellingen"
+
+#: ../../purchase/purchases/master/import.rst:11
 msgid ""
-"To manage supplier prices on product form, read this document "
-"(:doc:`suppliers`). Here we will show you how to import customer prices."
+"For this feature to work, go to :menuselection:`Purchases --> Configuration "
+"--> Settings` and tick the box in front of \"Vendor Pricelists\"."
 msgstr ""
-"Als u de prijzen van uw leveranciers in het productformulier wil beheren, "
-"lees dan eerst dit document (:doc:`suppliers`). Wilt u prijzen van "
-"leveranciers importeren, lees dan verder. "
 
-#: ../../purchase/purchases/master/import.rst:16
-msgid "Required configuration"
-msgstr "Vereiste configuratie"
-
-#: ../../purchase/purchases/master/import.rst:18
-msgid "In purchase settings, you have 2 options:"
-msgstr "In de inkoop instellingen heeft u 2 opties:"
-
-#: ../../purchase/purchases/master/import.rst:20
-msgid "Manage vendor price on the product form"
-msgstr "Beheer leveranciersprijs op het productformulier"
-
-#: ../../purchase/purchases/master/import.rst:22
-msgid "Allow using and importing vendor pricelists"
-msgstr "Sta gebruiken en importeren van Leverancier prijslijsten toe"
-
-#: ../../purchase/purchases/master/import.rst:24
-msgid "Here we are selecting: **Allow using and importing vendor pricelists**"
+#: ../../purchase/purchases/master/import.rst:15
+msgid "Don't forget to save your settings in the top left corner."
 msgstr ""
-"We selecteren hier de optie **Sta gebruiken en importeren van "
-"leveranciersprijslijsten toe**."
 
-#: ../../purchase/purchases/master/import.rst:30
-msgid "Import vendor pricelists"
-msgstr "Importeer leverancier prijslijsten"
+#: ../../purchase/purchases/master/import.rst:21
+msgid "Import a pricelist"
+msgstr ""
 
-#: ../../purchase/purchases/master/import.rst:32
+#: ../../purchase/purchases/master/import.rst:23
+msgid "To import go to :menuselection:`Purchase --> Vendor Pricelists`"
+msgstr ""
+
+#: ../../purchase/purchases/master/import.rst:25
 msgid ""
-"There are 2 scenarios: import the vendor pricelist for the first time, or "
-"update an existing vendor pricelist. In both scenarios, we assume your "
-"product list and vendor list is updated and you want to import the price "
-"list of vendors for a given product."
+"Load your file, then you can check if everything is correct before clicking "
+"import."
 msgstr ""
-"Er zijn 2 scenario's mogelijk: een leveranciersprijslijst voor een eerste "
-"keer importeren, of een bestaande prijslijst bijwerken. In beide scenario's "
-"gaan we ervan uit dat u reeds een lijst met producten en leveranciers hebt, "
-"en dat u nu de prijslijst voor een bepaald product of een reeks producten "
-"wilt importeren."
 
-#: ../../purchase/purchases/master/import.rst:40
+#: ../../purchase/purchases/master/import.rst:28
+msgid "See below a template of the columns used."
+msgstr ""
+
+#: ../../purchase/purchases/master/import.rst:33
 msgid ""
-"To import a list from a document, the best pratice is to export first to get"
-" an example of data formating and a proper header to reimport."
+"`Template download "
+"<https://docs.google.com/spreadsheets/d/1N8c_eejLV_8NhYMGCfZau_oGCnRkUIT9nwdX7n0shhY/edit#gid=964193981>`__"
 msgstr ""
-"De beste manier om te weten hoe u een lijst moet importeren, is eerst een "
-"bestaand item te exporteren, zodat u weet hoe u de gegevens moet formatteren"
-" en hoe u een lijst met de juiste kolomkoppen terug kan importeren."
-
-#: ../../purchase/purchases/master/import.rst:50
-msgid "Import the list for the first time"
-msgstr "Een lijst voor de eerste keer importeren"
-
-#: ../../purchase/purchases/master/import.rst:53
-msgid "Prepare the document"
-msgstr "Het document voorbereiden"
-
-#: ../../purchase/purchases/master/import.rst:55
-msgid ""
-"In :menuselection:`Purchase --> Purchase --> Supplier Pricelists`, export a "
-"template of document to get import/export compatible and get the right "
-"format to import in mass. Create manually a data and export it "
-"(:menuselection:`select --> Action --> Export`)"
-msgstr ""
-"Ga naar :menuselection:`Inkoop --> Inkoop --> Leveranciersprijslijsten` en "
-"selecteer een lijn (Maak indien nodig een lijn aan als u nog geen enkele "
-"prijslist gedefiniëerd hebt). Klik dan op :menuselection:`Meer --> "
-"Exporteren`. Maak nu een exportsjabloon aan dat import/export-compatibel is "
-"en kies ook het juiste gegevensformaat (csv of Excel) dat u voor de latere "
-"import wilt gebruiken. Selecteer de gewenste velden en exporteer."
-
-#: ../../purchase/purchases/master/import.rst:63
-msgid "Here is the list of fields you can import:"
-msgstr ""
-"Dit is de lijst van velden die u moet importeren om een prijslijst succesvol"
-" te uploaden:"
-
-#: ../../purchase/purchases/master/import.rst:66
-msgid "**Header of the document to import (csv, xls)**"
-msgstr "**Kolomkop van het importdocument (csv, xls)**"
-
-#: ../../purchase/purchases/master/import.rst:66
-msgid "**Meaning and how to get it**"
-msgstr "**Wat betekent dit,en waar kunt u het vinden?**"
-
-#: ../../purchase/purchases/master/import.rst:66
-msgid "**Example**"
-msgstr "**Voorbeeld**"
-
-#: ../../purchase/purchases/master/import.rst:68
-msgid "name_id"
-msgstr "name_id"
-
-#: ../../purchase/purchases/master/import.rst:68
-msgid "Vendor ID -> export supplier list to get it"
-msgstr ""
-"Vendor ID (code van de leverancier) -> om deze te kennen exporteert u uw "
-"lijst van leveranciers"
-
-#: ../../purchase/purchases/master/import.rst:68
-msgid "\\_\\_export\\_\\_.res\\_partner\\_12"
-msgstr "\\_\\_export\\_\\_.res\\_partner\\_12"
-
-#: ../../purchase/purchases/master/import.rst:70
-msgid "product_code"
-msgstr "product_code"
-
-#: ../../purchase/purchases/master/import.rst:70
-msgid "Vendor product Code -> free text"
-msgstr "Productcode van de leverancier -> vrije invoer"
-
-#: ../../purchase/purchases/master/import.rst:70
-msgid "569874"
-msgstr "569874"
-
-#: ../../purchase/purchases/master/import.rst:72
-msgid "price"
-msgstr "prijs"
-
-#: ../../purchase/purchases/master/import.rst:72
-msgid "Vendor Price -> free text"
-msgstr "Aankoopprijs bij leverancier -> vrije invoer"
-
-#: ../../purchase/purchases/master/import.rst:72
-msgid "1500"
-msgstr "1500"
-
-#: ../../purchase/purchases/master/import.rst:74
-msgid "product_tmpl_id.id"
-msgstr "product_tmpl_id.id"
-
-#: ../../purchase/purchases/master/import.rst:74
-msgid "Product Template ID -> export you product list to get it"
-msgstr ""
-"Product Template ID (Productcode) -> om deze te kennen exporteert u uw lijst"
-" van producten"
-
-#: ../../purchase/purchases/master/import.rst:74
-msgid "\\_\\_export\\_\\_.product_template_13"
-msgstr "\\_\\_export\\_\\_.product_template_13"
-
-#: ../../purchase/purchases/master/import.rst:76
-msgid "currency_id.id"
-msgstr "currency_id.id"
-
-#: ../../purchase/purchases/master/import.rst:76
-msgid "Currency -> to get it export the currency list"
-msgstr "Valuta -> om deze te kennen exporteert u de lijst met valuta"
-
-#: ../../purchase/purchases/master/import.rst:78
-msgid "date_end"
-msgstr "date_end"
-
-#: ../../purchase/purchases/master/import.rst:78
-msgid "End date of the price validity"
-msgstr "\"Einddatum van de prijsgeldigheid"
-
-#: ../../purchase/purchases/master/import.rst:78
-msgid "2015-10-22"
-msgstr "2015-10-22"
-
-#: ../../purchase/purchases/master/import.rst:80
-msgid "min_qty"
-msgstr "min_qty"
-
-#: ../../purchase/purchases/master/import.rst:80
-msgid "Minimal quantity to purchase from this vendor"
-msgstr "Minimale aankoophoeveelheid bij deze leverancier"
-
-#: ../../purchase/purchases/master/import.rst:80
-msgid "2"
-msgstr "2"
-
-#: ../../purchase/purchases/master/import.rst:82
-msgid "product_id.id"
-msgstr "product_id.id"
-
-#: ../../purchase/purchases/master/import.rst:82
-msgid "Product Variante name -> export your variant list to get it"
-msgstr ""
-"Variantnaam van het product -> om deze te kennen exporteert u de lijst van "
-"varianten"
-
-#: ../../purchase/purchases/master/import.rst:82
-msgid "\\_\\_export\\_\\_.product\\_13"
-msgstr "\\_\\_export\\_\\_.product\\_13"
-
-#: ../../purchase/purchases/master/import.rst:84
-msgid "date_start"
-msgstr "date_start"
-
-#: ../../purchase/purchases/master/import.rst:84
-msgid "Start date of price validity"
-msgstr "Startdatum van de prijs validiteit"
-
-#: ../../purchase/purchases/master/import.rst:84
-msgid "2015-12-31"
-msgstr "2015-12-31"
-
-#: ../../purchase/purchases/master/import.rst:87
-msgid "You obtain a document which can be imported, fill in your vendor pices"
-msgstr ""
-"Als u al uw opzoekingen van leveranciers en producten hebt verricht, kan u "
-"uw lijst verrijken met de productcodes en -omschrijvingen, hun aankoopprijs "
-"en de start- en einddatum van de prijsgeldigheid. Op die manier krijgt u een"
-" volledige prijslijst die u kan opladen in Odoo via import."
-
-#: ../../purchase/purchases/master/import.rst:92
-msgid ""
-"Import this document in Odoo. Click on **Import** in the list view and "
-"upload your document. You can validate and check error. Once the system "
-"tells you everything is ok, you can import the list."
-msgstr ""
-"Om het document in Odoo te importeren, drukt u op **Importeren** in de "
-"lijstweergave. U kunt nog wijzigingen aanbrengen indien nodig; als u "
-"tevreden bent hoe de import zal gebeuren, drukt u op **Valideren**. Odoo "
-"controleert of alle gegevens juist geïmporteerd kunnen worden - mogelijk "
-"dient u eventuele fouten te corrigeren. Van zodra alle gegevens correct "
-"verwerkt kunnen worden, kunt u de prijslijst opladen."
-
-#: ../../purchase/purchases/master/import.rst:102
-msgid ""
-"After the import, the **Vendors** section in **Inventory** tab of the "
-"product form is filled in."
-msgstr ""
-"Nadat de import voltooid is, kunt u de wijzigingen bekijken in de sectie "
-"**Leveranciers** op het tabblad **Voorraad** van het productformulier."
-
-#: ../../purchase/purchases/master/import.rst:106
-msgid "Update the vendor pricelist"
-msgstr "Update de leverancier zijn prijslijst"
-
-#: ../../purchase/purchases/master/import.rst:108
-msgid ""
-"When the pricelist of your suppliers change, it is necessary to update "
-"existing prices."
-msgstr ""
-"Wanneer de prijslijst van uw leveranciers wijzigt, is het nodig om de "
-"bestaande prijzen bij te werken."
-
-#: ../../purchase/purchases/master/import.rst:111
-msgid ""
-"Follow the procedure of the first scenario in order to export existing data "
-"from :menuselection:`Purchases --> Purchase --> Vendor Pricelist`. Select "
-"everything, and export from the **Action** menu."
-msgstr ""
-"Volg de procedure zoals in het eerste scenario om de bestaande gegevens te "
-"exporteren. Maar in plaats van slechts één lijn te exporteren, selecteert u "
-"alle lijnen. Ga naar  :menuselection:`Inkoop --> Inkoop --> "
-"Leveranciersprijslijsten`, vink alle lijnen aan, en doe de export via het "
-"menu **Meer**."
-
-#: ../../purchase/purchases/master/import.rst:115
-msgid ""
-"Change price, end date, add a line, change a supplier, ... and then reimport"
-" in Odoo. Thanks to the ID, the list will be updated. Either the id is "
-"recognized and the line is updated or the ID is not known by Odoo and it "
-"will create a new pricelist line."
-msgstr ""
-"Wijzig nu de prijzen en data in het geëxporteerde bestand. U kunt ook een "
-"lijn toevoegen of een leverancier wijzigen indien nodig. Eenmaal uw "
-"wijzigingen zijn doorgevoerd, importeert u de lijst terug in Odoo. Dankzij "
-"een unieke code (een ID genoemd in technisch jargon) kunnen de geïmporteerde"
-" lijnen terug herkend worden. Indien zo'n ID herkend wordt, dan worden de "
-"gegevens voor dat ID aangepast. Als het ID niet herkend wordt, dan maakt "
-"Odoo een nieuwe lijn aan."
-
-#: ../../purchase/purchases/master/import.rst:120
-msgid ""
-"After the import, the **Vendors** section in **Inventory** tab of the "
-"product form is updated."
-msgstr ""
-"Na de import zullen uw wijzigingen zichtbaar zijn in de sectie "
-"**Leveranciers** in het tabblad **Voorraad** van het productformulier."
 
 #: ../../purchase/purchases/master/suppliers.rst:3
-msgid "How to set several suppliers on a product?"
-msgstr "Hoe verschillende leveranciers op een product in stellen?"
+msgid "Set multiple vendors on a product"
+msgstr ""
 
 #: ../../purchase/purchases/master/suppliers.rst:5
 msgid ""
-"Keeping track of your vendors can be a real burden in day-to-day business "
-"life. Prices can change and you might have several suppliers for one "
-"product. With Odoo you have the possibility to directly link vendors with "
-"the corresponding product and specify prices automatically the first time "
-"you purchase them."
+"If you find yourself with the need to buy from multiple vendors for one "
+"product, Odoo can let you directly link them with a single product."
+msgstr ""
+
+#: ../../purchase/purchases/master/suppliers.rst:9
+msgid "Add vendors in a product"
 msgstr ""
-"De opvolging van uw leveranciers kan best een grote opgave zijn in uw "
-"dagelijkse bedrijfsvoering. Prijzen kunnen wijzigen, en het is goed mogelijk"
-" dat u ook meerdere leveranciers hebt voor eenzelfde product. In Odoo kunt "
-"de leveranciers rechtstreeks linken aan de desbetreffende producten, en kunt"
-" u de prijzen ervan automatisch opgeven wanneer u ze voor de eerste keer "
-"aankoopt."
 
 #: ../../purchase/purchases/master/suppliers.rst:11
 msgid ""
-"We will take the following example: We need to buy ``5 t-shirts``. We found "
-"a **Vendor**; called ``Bob&Jerry's`` and we want to issue a request for "
-"quotation."
+"To use this feature, go to :menuselection:`Purchases --> Products`, then "
+"select a product."
 msgstr ""
-"We nemen volgend voorbeeld; we moeten ``5 T-shirts`` aankopen. We hebben een"
-" **Leverancier** gevonden met de naam ``Bob&Jerry's``. We willen nu een "
-"offerte bij hen aanvragen."
 
-#: ../../purchase/purchases/master/suppliers.rst:19
-msgid "Install the purchase module"
-msgstr "Installeer de inkoop module"
-
-#: ../../purchase/purchases/master/suppliers.rst:21
+#: ../../purchase/purchases/master/suppliers.rst:14
 msgid ""
-"The first step to set your suppliers on your products is to install the "
-"purchase module. Go into your **App** module and install the **Purchase** "
-"module."
-msgstr ""
-"Om uw leveranciers aan uw producten te linken, moet u als eerste stap de "
-"inkoopmodule installeren. Ga naar de module **Apps**, en installeer de "
-"**Inkoopmodule**."
-
-#: ../../purchase/purchases/master/suppliers.rst:29
-msgid ""
-"By installing the purchase module, the inventory and invoicing module will "
-"be installed as well."
-msgstr ""
-"Door de Inkopen module te installeren worden de modules magazijn en "
-"facturatie ook mee geïnstalleerd."
-
-#: ../../purchase/purchases/master/suppliers.rst:33
-msgid "Create a Vendor"
-msgstr "Maak een leverancier aan"
-
-#: ../../purchase/purchases/master/suppliers.rst:35
-msgid ""
-"The second step is to create a vendor. In this case we'll create the vendor "
-"``Bob&Jerry's``. Enter the purchase module, select :menuselection:`Purchase "
-"--> Vendors` and create a new vendor."
+"From there you can add existing vendors to your product or create a new one "
+"on the fly."
 msgstr ""
 
-#: ../../purchase/purchases/master/suppliers.rst:39
-msgid ""
-"You can choose if the contact is a company or a person, fill in basic "
-"information such as address, phone, email,..."
-msgstr ""
-"U kan kiezen of een relatie een bedrijf of een persoon is, vul de "
-"basisinformatie in zoals het adres, telefoonnummer, e-mail,..."
-
-#: ../../purchase/purchases/master/suppliers.rst:42
-msgid ""
-"If you did not create the contact from the purchase module you will need to "
-"go in the **Sales and Purchases** tab as well and indicate that the contact "
-"is a **Vendor** (see picture below). If the contact is created from the "
-"purchase module this box will be ticked automatically."
-msgstr ""
-
-#: ../../purchase/purchases/master/suppliers.rst:51
-msgid "Create a product"
-msgstr "Maak een product aan"
-
-#: ../../purchase/purchases/master/suppliers.rst:53
-msgid ""
-"Next we can create the product we want to buy. We don't know the price of "
-"the t-shirt yet because we still need to issue our **Request for "
-"Quotation**."
-msgstr ""
-"Vervolgens maken we het product aan dat we willen kopen. We weten de prijs "
-"van het t-shirt nog niet omdat we onze **Offerteaanvraag** nog moeten doen."
-
-#: ../../purchase/purchases/master/suppliers.rst:57
-msgid ""
-"To create a product enter your purchase module select "
-":menuselection:`Purchase --> Products` and create a new product."
-msgstr ""
-"Om een product aan te maken gaat u in de inkopen module naar "
-":menuselection:`Inkopen --> Producten` en maakt u een nieuw product aan."
-
-#: ../../purchase/purchases/master/suppliers.rst:60
-msgid ""
-"We will call our product ``T-shirt`` and specify that the product can be "
-"sold and purchased."
-msgstr ""
-"We noemen ons product ``T-shirt`` en geven aan dat het product aangekocht en"
-" verkocht kan worden."
-
-#: ../../purchase/purchases/master/suppliers.rst:67
-msgid "Add Vendors to the product"
-msgstr "Voeg leveranciers toe aan het product"
-
-#: ../../purchase/purchases/master/suppliers.rst:69
-msgid ""
-"The next action is to add vendors to the product. There are two ways to "
-"handle this. If you issue a purchase order for the first time Odoo will "
-"automatically link the vendor and its price to the product. You can also add"
-" vendors manually"
-msgstr ""
-
-#: ../../purchase/purchases/master/suppliers.rst:75
-msgid "By issuing a first Purchase Order to new vendor"
-msgstr ""
-
-#: ../../purchase/purchases/master/suppliers.rst:77
-msgid ""
-"When issuing a purchase order for the first time to a vendor, he will "
-"automatically be linked to the product by Odoo. For our example let's say "
-"that we issue a first purchase order to ``Bob&Jerry's`` for ``5 t-shirts`` "
-"at ``12.35 euros / piece``."
-msgstr ""
-
-#: ../../purchase/purchases/master/suppliers.rst:82
-msgid ""
-"First create your purchase order with the correct product and supplier (see "
-"picture below, or the documentation page :doc:`../rfq/create` for more "
-"information)"
-msgstr ""
-"Maak eerst uw inkooporder aan met het correcte product en leverancier (zie "
-"onderstaande afbeelding, of de documentatie pagina :doc:`../rfq/create` voor"
-" meer informatie)"
-
-#: ../../purchase/purchases/master/suppliers.rst:89
-msgid ""
-"When we save and validate the purchase order the vendor will automatically "
-"be added to the product's vendors list. To check this enter the purchase "
-"module, select :menuselection:`Purchase --> Products` and select our T-shirt"
-" product. By opening the **Inventory** tab we notice that our vendor and its"
-" price has automatically been added."
-msgstr ""
-
-#: ../../purchase/purchases/master/suppliers.rst:98
+#: ../../purchase/purchases/master/suppliers.rst:17
 msgid ""
 "Note that every first time the product is purchased from a new vendor, Odoo "
 "will automatically link the contact and price with the product."
@@ -934,31 +125,26 @@ msgstr ""
 "leverancier zal Odoo automatisch het contact en de prijs linken met het "
 "product."
 
-#: ../../purchase/purchases/master/suppliers.rst:103
-msgid "By adding manually"
-msgstr "Door manueel toe te voegen"
-
-#: ../../purchase/purchases/master/suppliers.rst:105
-msgid ""
-"We can of course also add vendors and vendors information manually. On the "
-"same page than previously, simply click on **Edit** and click the **Add an "
-"item** button."
+#: ../../purchase/purchases/master/suppliers.rst:24
+msgid "Add price & quantity as well as a validity period"
 msgstr ""
-"We kunnen natuurlijk ook leveranciers en leveranciersinformatie manueel "
-"toevoegen. Op dezelfde pagina als hiervoor klikt u simpelweg op **Wijzigen**"
-" en vervolgens op de knop **Item toevoegen** knop."
 
-#: ../../purchase/purchases/master/suppliers.rst:112
+#: ../../purchase/purchases/master/suppliers.rst:26
 msgid ""
-"When adding a new **Vendor** you are also able to add extra information such"
-" as the vendor product name or code, the validity of the price and the "
-"eventual minimum quantity required. These informations can be added and "
-"modified for existing vendors by simply clicking on the vendors line."
+"When you're adding a vendor to a product, you're able to add the vendor "
+"product name & code as well as set the minimal quantity, price and validity "
+"period."
+msgstr ""
+
+#: ../../purchase/purchases/master/suppliers.rst:34
+msgid ""
+"This Odoo feature also works with variants of your products, such as one "
+"t-shirt in different sizes!"
 msgstr ""
 
 #: ../../purchase/purchases/master/uom.rst:3
-msgid "How to purchase in different unit of measures than sales?"
-msgstr "Hoe in verschillende maateenheden te kopen en verkopen?"
+msgid "Purchase in different unit of measures than sales"
+msgstr ""
 
 #: ../../purchase/purchases/master/uom.rst:5
 msgid ""
@@ -1156,75 +342,65 @@ msgstr ""
 "een *Rol* als aankoopeenheid in het productformulier."
 
 #: ../../purchase/purchases/rfq.rst:3
-msgid "Request for Quotations"
-msgstr "Offerteaanvragen"
+msgid "Request for Quotation and Purchase Orders"
+msgstr ""
 
 #: ../../purchase/purchases/rfq/3_way_matching.rst:3
-msgid "How to determine if a vendor bill should be paid (3-way matching)"
+msgid "Determine when to pay a vendor bill with 3-way matching"
 msgstr ""
 
 #: ../../purchase/purchases/rfq/3_way_matching.rst:5
 msgid ""
 "In some industries, you may receive a bill from a vendor before receiving "
-"the ordered products. However, the bill should maybe not be paid until the "
-"products have actually been received."
+"the ordered products. However, you might not want to pay it until the "
+"products have been received."
 msgstr ""
 
 #: ../../purchase/purchases/rfq/3_way_matching.rst:9
 msgid ""
-"To define whether the vendor bill should be paid or not, you can use what is"
-" called the **3-way matching**. It refers to the comparison of the "
-"information appearing on the Purchase Order, the Vendor Bill and the "
-"Receipt."
+"To define whether the vendor bill should be paid or not, you can use what we"
+" call *3-way matching*. It refers to the comparaison of the information "
+"appearing on the *Purchase Order*, the *Vendor Bill* and the *Receipt*."
 msgstr ""
 
 #: ../../purchase/purchases/rfq/3_way_matching.rst:14
 msgid ""
-"The 3-way matching helps you to avoid paying incorrect or fraudulent vendor "
+"The 3-way matching helps you avoid paying incorrect or fraudulent vendor "
 "bills."
 msgstr ""
 
 #: ../../purchase/purchases/rfq/3_way_matching.rst:20
 msgid ""
-"Go in :menuselection:`Purchase --> Configuration --> Settings` and activate "
-"the 3-way matching."
+"For this feature to work, go to :menuselection:`Purchases --> Configuration "
+"--> Settings` and activate the *3-way matching* feature"
 msgstr ""
 
-#: ../../purchase/purchases/rfq/3_way_matching.rst:30
-msgid "Should I pay this vendor bill?"
+#: ../../purchase/purchases/rfq/3_way_matching.rst:27
+msgid "Should I pay the vendor bill?"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/3_way_matching.rst:29
+msgid ""
+"With the feature activated you will have a new *Should be paid* line appear "
+"on the vendor bill under the *Other info* tab."
 msgstr ""
 
 #: ../../purchase/purchases/rfq/3_way_matching.rst:32
 msgid ""
-"Once this setting has been activated, a new information appears on the "
-"vendor bill, defining whether the bill should be paid or not. There are "
-"three possible values:"
+"That way Odoo let's you easily know if you should pay the vendor bill or "
+"not."
 msgstr ""
 
-#: ../../purchase/purchases/rfq/3_way_matching.rst:36
-msgid "*Use case 1*: I have received the ordered products."
-msgstr ""
-
-#: ../../purchase/purchases/rfq/3_way_matching.rst:43
-msgid "*Use case 2*: I have not received the ordered products."
-msgstr ""
-
-#: ../../purchase/purchases/rfq/3_way_matching.rst:50
-msgid ""
-"*Use case 3*: the quantities do not match across the Purchase Order, Vendor "
-"Bill and Receipt."
-msgstr ""
-
-#: ../../purchase/purchases/rfq/3_way_matching.rst:59
+#: ../../purchase/purchases/rfq/3_way_matching.rst:39
 msgid ""
 "The status is defined automatically by Odoo. However, if you want to define "
-"this status manually, you can tick the box *Force Status* and then you will "
-"be able to set manually whether the vendor bill should be paid or not."
+"this status manually, you can tick the box Force Status and then you will be"
+" able to set manually whether the vendor bill should be paid or not."
 msgstr ""
 
 #: ../../purchase/purchases/rfq/analyze.rst:3
-msgid "How to analyze the performance of my vendors?"
-msgstr "Hoe de prestaties van mijn leveranciers te analyseren?"
+msgid "Analyze the performance of my vendors"
+msgstr ""
 
 #: ../../purchase/purchases/rfq/analyze.rst:5
 msgid ""
@@ -1262,7 +438,6 @@ msgid ""
 msgstr ""
 
 #: ../../purchase/purchases/rfq/analyze.rst:27
-#: ../../purchase/purchases/tender/partial_purchase.rst:17
 msgid "Install the Purchase Management module"
 msgstr "Installeer de Inkoopbeheer module"
 
@@ -1281,20 +456,18 @@ msgstr ""
 #: ../../purchase/purchases/rfq/analyze.rst:38
 msgid ""
 "Of course, in order to analyze your vendors' performance, you need to issue "
-"some **Request For Quotations** (RfQ) and confirm some **Purchase Orders**. "
-"If you want to know how to generate a purchase order, please read the "
-"documentation :doc:`../../overview/process/from_po_to_invoice`."
+"some **Request For Quotations** (RfQ) and confirm some **Purchase Orders**."
 msgstr ""
 
-#: ../../purchase/purchases/rfq/analyze.rst:44
+#: ../../purchase/purchases/rfq/analyze.rst:43
 msgid "Analyzing your vendors"
 msgstr "Analyseer uw leveranciers"
 
-#: ../../purchase/purchases/rfq/analyze.rst:47
+#: ../../purchase/purchases/rfq/analyze.rst:46
 msgid "Generate flexible reports"
 msgstr "Genereer flexibele rapporten"
 
-#: ../../purchase/purchases/rfq/analyze.rst:49
+#: ../../purchase/purchases/rfq/analyze.rst:48
 msgid ""
 "You have access to your vendors' performances on the Reports menu. By "
 "default, the report groups all your purchase orders on a pivot table by "
@@ -1304,7 +477,7 @@ msgid ""
 "of extra data to your report by clicking on the **Measures** icon."
 msgstr ""
 
-#: ../../purchase/purchases/rfq/analyze.rst:60
+#: ../../purchase/purchases/rfq/analyze.rst:59
 msgid ""
 "By clicking on the **+** and **-** icons, you can drill up and down your "
 "report in order to change the way your information is displayed. For "
@@ -1313,7 +486,7 @@ msgid ""
 "\"Products\"."
 msgstr ""
 
-#: ../../purchase/purchases/rfq/analyze.rst:67
+#: ../../purchase/purchases/rfq/analyze.rst:66
 msgid ""
 "Depending on the data you want to highlight, you may need to display your "
 "reports in a more visual view. You can transform your report in just a click"
@@ -1322,17 +495,17 @@ msgid ""
 "below."
 msgstr ""
 
-#: ../../purchase/purchases/rfq/analyze.rst:77
+#: ../../purchase/purchases/rfq/analyze.rst:76
 msgid ""
 "On the contrary to the pivot table, a graph can only be computed with one "
 "dependent and one independent measure."
 msgstr ""
 
-#: ../../purchase/purchases/rfq/analyze.rst:81
+#: ../../purchase/purchases/rfq/analyze.rst:80
 msgid "Customize reports"
 msgstr "Personaliseer rapporten"
 
-#: ../../purchase/purchases/rfq/analyze.rst:83
+#: ../../purchase/purchases/rfq/analyze.rst:82
 msgid ""
 "You can easily customize your purchase reports depending on your needs. To "
 "do so, use the **Advanced search view** located in the right hand side of "
@@ -1344,7 +517,7 @@ msgid ""
 "existing field, making your customization very flexible and powerful."
 msgstr ""
 
-#: ../../purchase/purchases/rfq/analyze.rst:97
+#: ../../purchase/purchases/rfq/analyze.rst:96
 msgid ""
 "You can save and reuse any customized filter by clicking on **Favorites** "
 "from the **Advanced search view** and then on **Save current search**. The "
@@ -1355,69 +528,54 @@ msgstr ""
 "vervolgens te klikken op **Bewaar huidige zoekopdracht**. De bewaarde filter"
 " is dan toegankelijk vanuit het **Favorieten** menu."
 
-#: ../../purchase/purchases/rfq/analyze.rst:103
-#: ../../purchase/purchases/rfq/create.rst:76
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:86
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:81
-#: ../../purchase/purchases/tender/partial_purchase.rst:77
-msgid ":doc:`../../overview/process/from_po_to_invoice`"
-msgstr ":doc:`../../overview/process/from_po_to_invoice`"
-
 #: ../../purchase/purchases/rfq/approvals.rst:3
-msgid "How to setup two levels of approval for purchase orders?"
-msgstr "Hoe twee niveau's van goedkeuring in te stellen voor inkooporders?"
-
-#: ../../purchase/purchases/rfq/approvals.rst:6
-msgid "Two level approval setup"
-msgstr "Twee niveau's goedkeuring opzet"
-
-#: ../../purchase/purchases/rfq/approvals.rst:8
-msgid ""
-"Double validation on purchases forces a validation when the purchased amount"
-" exceeds a certain limit."
+msgid "Request managers approval for expensive orders"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/approvals.rst:5
+msgid ""
+"In case of expensive purchases you may want a manager approval to validate "
+"the orders, Odoo let's you easily set that up."
 msgstr ""
-"Dubbele validatie op aankopen forceert een validatie wanneer het aangekochte"
-" bedrag boven een bepaalde limiet ligt."
 
 #: ../../purchase/purchases/rfq/approvals.rst:11
 msgid ""
-"Install **Purchase Management** module and then go to **General Settings** "
-"to configure the company data."
+"For this feature to work, go to :menuselection:`Purchases --> Configuration "
+"--> Settings` and activate the *Order Approval* feature. From there you can "
+"also set the minimum amount required to activate this feature."
 msgstr ""
 
-#: ../../purchase/purchases/rfq/approvals.rst:17
+#: ../../purchase/purchases/rfq/approvals.rst:20
+msgid "Create a new Request for Quotation"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/approvals.rst:22
 msgid ""
-"Set here the amount limit for second approval and set approval from manager "
-"side."
+"While working on a new RfQ, if the order is made by a user and not a manager"
+" and the amount of the order is above the minimum amount you specified, a "
+"new *To Approve* status will be introduced in the process."
 msgstr ""
 
-#: ../../purchase/purchases/rfq/approvals.rst:21
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:47
-msgid "Process"
-msgstr "Verwerken"
+#: ../../purchase/purchases/rfq/approvals.rst:31
+msgid "Approve the order"
+msgstr ""
 
-#: ../../purchase/purchases/rfq/approvals.rst:23
+#: ../../purchase/purchases/rfq/approvals.rst:33
 msgid ""
-"Logged as a purchase user, create a purchase order for more than the amount "
-"set above, and confirm it. The purchase order is set in a state **To "
-"Approve**"
+"If you are a purchase manager, you can now go to the purchase order and "
+"approve the order if everything is alright with it. Giving you full control "
+"of what your users can or can't do."
 msgstr ""
 
-#: ../../purchase/purchases/rfq/approvals.rst:29
-msgid "The manager gets the order to approve and validates the final order."
-msgstr ""
-"De manager krijgt de order om goed te keuren en valideert het uiteindelijke "
-"order."
-
-#: ../../purchase/purchases/rfq/approvals.rst:34
+#: ../../purchase/purchases/rfq/approvals.rst:37
 msgid "Once approved, the purchase order follows the normal process."
 msgstr ""
 "Eenmaal goedgekeurd staat het inkooporder het volgen van het normale proces "
 "toe."
 
 #: ../../purchase/purchases/rfq/bills.rst:3
-msgid "How to control supplier bills?"
-msgstr "Hoe leveranciersrekeningen te beheren?"
+msgid "Control supplier bills"
+msgstr ""
 
 #: ../../purchase/purchases/rfq/bills.rst:5
 msgid ""
@@ -1759,8 +917,8 @@ msgid ""
 msgstr ""
 
 #: ../../purchase/purchases/rfq/cancel.rst:3
-msgid "How to cancel a purchase order?"
-msgstr "Hoe een inkooporder annuleren?"
+msgid "Cancel a purchase order"
+msgstr ""
 
 #: ../../purchase/purchases/rfq/cancel.rst:5
 msgid ""
@@ -1791,38 +949,30 @@ msgid ""
 msgstr ""
 
 #: ../../purchase/purchases/rfq/cancel.rst:25
-msgid ""
-"To learn more about the purchase order process, read the documentation page "
-":doc:`../../overview/process/from_po_to_invoice`"
-msgstr ""
-"Om meer te leren over het inkoopproces leest u best de documentatie pagina "
-":doc:`../../overview/process/from_po_to_invoice`"
-
-#: ../../purchase/purchases/rfq/cancel.rst:30
 msgid "Cancel your Purchase Order"
 msgstr "Annuleer uw inkooporder"
 
-#: ../../purchase/purchases/rfq/cancel.rst:33
+#: ../../purchase/purchases/rfq/cancel.rst:28
 msgid "Use case 1 : you didn't receive your goods yet"
 msgstr "Use case 1: u heeft uw goederen nog niet ontvangen"
 
-#: ../../purchase/purchases/rfq/cancel.rst:35
+#: ../../purchase/purchases/rfq/cancel.rst:30
 msgid ""
 "If you confirmed your purchase order and did not received your goods yet, "
 "you can simply cancel the PO it by clicking the cancel button."
 msgstr ""
 
-#: ../../purchase/purchases/rfq/cancel.rst:41
+#: ../../purchase/purchases/rfq/cancel.rst:36
 msgid ""
 "Odoo will automatically cancel the outstanding shipments related to this PO "
 "and the status bar will switch from **Purchase order** to **Cancelled**."
 msgstr ""
 
-#: ../../purchase/purchases/rfq/cancel.rst:48
+#: ../../purchase/purchases/rfq/cancel.rst:43
 msgid "Use case 2 : partially delivered goods"
 msgstr "Usecase 2: Deels geleverde goederen"
 
-#: ../../purchase/purchases/rfq/cancel.rst:50
+#: ../../purchase/purchases/rfq/cancel.rst:45
 msgid ""
 "In this case, **2** of the **3 iPad Mini** arrived before you needed to "
 "cancel the PO."
@@ -1830,11 +980,11 @@ msgstr ""
 "In dit geval zijn **2** van de **3 iPad Mini's** gearriveerd voordat u de PO"
 " moest annuleren."
 
-#: ../../purchase/purchases/rfq/cancel.rst:54
+#: ../../purchase/purchases/rfq/cancel.rst:49
 msgid "Register good received and cancel backorder"
 msgstr ""
 
-#: ../../purchase/purchases/rfq/cancel.rst:56
+#: ../../purchase/purchases/rfq/cancel.rst:51
 msgid ""
 "The first thing to do will be to register the goods received and to cancel "
 "the arrival of the **third iPad Mini** that is still supposed to be shipped."
@@ -1842,29 +992,29 @@ msgid ""
 "line**, manually change the received quantities under the Column **Done**."
 msgstr ""
 
-#: ../../purchase/purchases/rfq/cancel.rst:66
+#: ../../purchase/purchases/rfq/cancel.rst:61
 msgid "To learn more, see :doc:`reception`"
 msgstr "Zie :doc:`reception` om meer te leren"
 
-#: ../../purchase/purchases/rfq/cancel.rst:68
+#: ../../purchase/purchases/rfq/cancel.rst:63
 msgid ""
 "When clicking on **Validate**, Odoo will warn you that you have processed "
 "less products than the initial demand (2 instead of 3 in our case) and will "
 "ask you the permission to create a backorder."
 msgstr ""
 
-#: ../../purchase/purchases/rfq/cancel.rst:75
+#: ../../purchase/purchases/rfq/cancel.rst:70
 msgid ""
 "Click on **No backorder** to cancel the supply of the remaining product. You"
 " will notice than the quantity to receive has been changed accordingly and, "
 "therefore, the delivery status has switched to **Done**."
 msgstr ""
 
-#: ../../purchase/purchases/rfq/cancel.rst:83
+#: ../../purchase/purchases/rfq/cancel.rst:78
 msgid "Create reverse transfer"
 msgstr ""
 
-#: ../../purchase/purchases/rfq/cancel.rst:85
+#: ../../purchase/purchases/rfq/cancel.rst:80
 msgid ""
 "Now, you need to return the iPad Minis that you have received to your vendor"
 " location. To do so, click on the **Reverse** button from the same document."
@@ -1872,30 +1022,30 @@ msgid ""
 " corresponding location and click on **Return**."
 msgstr ""
 
-#: ../../purchase/purchases/rfq/cancel.rst:93
+#: ../../purchase/purchases/rfq/cancel.rst:88
 msgid ""
 "Process the return shipment and control that the stock move is from your "
 "stock to your vendor location."
 msgstr ""
 
-#: ../../purchase/purchases/rfq/cancel.rst:99
+#: ../../purchase/purchases/rfq/cancel.rst:94
 msgid ""
 "When the reverse transfer is done, the status of your purchase order will be"
 " automatically set to done, meaning that your PO has been completely "
 "cancelled."
 msgstr ""
 
-#: ../../purchase/purchases/rfq/cancel.rst:104
-#: ../../purchase/purchases/rfq/reception.rst:120
+#: ../../purchase/purchases/rfq/cancel.rst:99
+#: ../../purchase/purchases/rfq/reception.rst:116
 msgid ":doc:`bills`"
 msgstr ":doc:`bills`"
 
-#: ../../purchase/purchases/rfq/cancel.rst:105
+#: ../../purchase/purchases/rfq/cancel.rst:100
 msgid ":doc:`reception`"
 msgstr ":doc:`reception`"
 
 #: ../../purchase/purchases/rfq/create.rst:3
-msgid "How to create a Request for Quotation?"
+msgid "Create a Request for Quotation"
 msgstr ""
 
 #: ../../purchase/purchases/rfq/create.rst:5
@@ -1907,124 +1057,28 @@ msgid ""
 "to go ahead with the offer and purchase or to turn down the offer."
 msgstr ""
 
-#: ../../purchase/purchases/rfq/create.rst:12
-msgid ""
-"For more information on best uses, please read the chapter "
-":doc:`../../overview/process/difference`"
-msgstr ""
-"Voor meer informatie over de beste manieren leest u best het hoofdstuk "
-":doc:`../../overview/process/difference`"
-
-#: ../../purchase/purchases/rfq/create.rst:19
+#: ../../purchase/purchases/rfq/create.rst:16
 msgid "Creating a Request for Quotation"
 msgstr "Maak een offerteaanvraag"
 
-#: ../../purchase/purchases/rfq/create.rst:21
+#: ../../purchase/purchases/rfq/create.rst:18
 msgid ""
 "In the Purchases module, open :menuselection:`Purchase --> Requests for "
 "Quotation` and click on **Create**."
 msgstr ""
 
-#: ../../purchase/purchases/rfq/create.rst:27
+#: ../../purchase/purchases/rfq/create.rst:24
 msgid ""
 "Select your supplier in the **Vendor** menu, or create it on-the-fly by "
 "clicking on **Create and Edit**. In the **Order Date** field, select the "
 "date to which you wish to proceed to the actual order."
 msgstr ""
 
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid "Shipment"
-msgstr "Ontvangst"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid "Incoming Shipments"
-msgstr "Inkomende leveringen"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid "Vendor Reference"
-msgstr "Leveranciers referentie"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid ""
-"Reference of the sales order or bid sent by the vendor. It's used to do the "
-"matching when you receive the products as this reference is usually written "
-"on the delivery order sent by your vendor."
-msgstr ""
-"Referentie van de verkooporder of bieding van uw leverancier. Het is "
-"bedoelde om de koppeling te doen tussen ontvangen producten omdat deze "
-"referentie meestal geschreven is op de pakbon verzonden door uw leverancier."
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid "Order Date"
-msgstr "Orderdatum"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid ""
-"Depicts the date where the Quotation should be validated and converted into "
-"a purchase order."
-msgstr ""
-"Geeft de datum aan waarop de offerte bevestigd en geconverteerd moet worden "
-"in een inkooporder."
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid "Source Document"
-msgstr "Brondocument"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid ""
-"Reference of the document that generated this purchase order request (e.g. a"
-" sales order)"
-msgstr ""
-"Referentie van het document dat deze inkoopaanvraag heeft gegenereerd (bijv."
-" een verkooporder)"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid "Deliver To"
-msgstr "Leveren aan"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid "This will determine operation type of incoming shipment"
-msgstr "Dit bepaald de verwerkingswijze van de ontvangst."
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid "Drop Ship Address"
-msgstr "Dropship afleveradres"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid ""
-"Put an address if you want to deliver directly from the vendor to the "
-"customer. Otherwise, keep empty to deliver to your own company."
-msgstr ""
-"Geef een adres in, indien u direct vanaf de leverancier wilt leveren aan de "
-"klant. Laat leeg om te leveren aan uw eigen bedrijf."
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid "Destination Location Type"
-msgstr "Bestemmingslocatie soort"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid "Technical field used to display the Drop Ship Address"
-msgstr ""
-"Technisch veld welke wordt gebruikt om het dropshipment adres weer te geven."
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid "Incoterm"
-msgstr "Leveringscondities"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid ""
-"International Commercial Terms are a series of predefined commercial terms "
-"used in international transactions."
-msgstr ""
-"International Commercial Terms (INCOTERMS) zijn een set van "
-"voorgedefinieerde commerciële voorwaarden, welke worden gebruikt bij "
-"internationaal transport."
-
-#: ../../purchase/purchases/rfq/create.rst:35
+#: ../../purchase/purchases/rfq/create.rst:32
 msgid "View *Request for Quotation* in our Online Demonstration"
 msgstr ""
 
-#: ../../purchase/purchases/rfq/create.rst:37
+#: ../../purchase/purchases/rfq/create.rst:34
 msgid ""
 "In **Products**, click on Add an item. Select the product you wish to order "
 "in the **Product** menu. Specify the **Quantity** by inserting the number "
@@ -2036,7 +1090,7 @@ msgid ""
 "supplier or enter a new one)."
 msgstr ""
 
-#: ../../purchase/purchases/rfq/create.rst:51
+#: ../../purchase/purchases/rfq/create.rst:48
 msgid ""
 "After having clicked on **Send**, you will notice that the RFQ's status will"
 " switch from **Draft** to **RFQ Sent**."
@@ -2044,28 +1098,119 @@ msgstr ""
 "Na te hebben geklikt op **Verzenden** zal u zien dat de offerteaanvraag "
 "status van **Concept** naar **Offerteaanvraag verzonden**."
 
-#: ../../purchase/purchases/rfq/create.rst:57
+#: ../../purchase/purchases/rfq/create.rst:54
 msgid ""
 "Once your supplier has replied with an offer, update the RfQ by clicking on "
 "**Edit** to fit the quotation (prices, taxes, expected delivery lead time, "
 "payment terms, etc.), then click on **Save** to issue a Purchase Order."
 msgstr ""
 
-#: ../../purchase/purchases/rfq/create.rst:62
+#: ../../purchase/purchases/rfq/create.rst:59
 msgid ""
 "To proceed with the order, click on **Confirm Order** to send the order to "
 "the supplier. The RfQ's status will switch to **Purchase Order**."
 msgstr ""
 
-#: ../../purchase/purchases/rfq/create.rst:68
+#: ../../purchase/purchases/rfq/create.rst:65
 msgid ""
 "The status of the RfQ will change to PURCHASE ORDER. Tabs in the upper right"
 " corner of the order will show 1 Shipment and 0 Invoice."
 msgstr ""
 
+#: ../../purchase/purchases/rfq/dropshipping.rst:3
+msgid "Dropship products"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/dropshipping.rst:5
+msgid ""
+"Dropshipping is a method in which the vendor does not keep products in stock"
+" but instead transfers the products directly from the supplier to the "
+"customer."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/dropshipping.rst:10
+msgid ""
+"You need the *Sales*, *Inventory* and *Purchases* modules for this feature "
+"to work."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/dropshipping.rst:14
+msgid "Activate the dropshipping feature"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/dropshipping.rst:16
+msgid ""
+"Go to :menuselection:`Purchases --> Configuration --> Settings` and select "
+"*Dropshipping*."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/dropshipping.rst:22
+msgid ""
+"A new route *Dropshipping* has been created. You can go on a product and "
+"tick the dropshipping route. You also need to define to which vendor you "
+"will buy the product. Now, each time this product will be sold, it will be "
+"drop shipped."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/dropshipping.rst:30
+msgid ""
+"If you don't always dropship that product, you can go to "
+":menuselection:`Sales --> Configuration --> Settings` and tick the box in "
+"front of *Order-Specific Routes*."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/dropshipping.rst:37
+msgid ""
+"When you create a quotation or sales order, you can now decide, order line "
+"per order line, which products should be drop shipped by selecting the "
+"dropship route on the SO line."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/dropshipping.rst:45
+msgid "Drop ship a product"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/dropshipping.rst:47
+msgid ""
+"Once a sale order with products to dropship is confirmed, a request for "
+"quotation is generated by Odoo to buy the product to the vendor. If you "
+"confirm that request for quotation into a purchase order, it will create a "
+"transfer from your vendor directly to your customer. The products doesn't go"
+" through your own stock."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/lock_orders.rst:3
+msgid "Lock a purchase order"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/lock_orders.rst:5
+msgid ""
+"Once an order is confirmed, you can lock it preventing any further editing."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/lock_orders.rst:11
+msgid ""
+"For this feature to work, go to :menuselection:`Purchases --> Configuration "
+"--> Settings` and activate the *Lock Confirmed Orders* feature"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/lock_orders.rst:19
+msgid "Lock an order"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/lock_orders.rst:21
+msgid ""
+"While working on a purchase order, when you confirm it, you can then lock "
+"the order preventing any further modification on the document."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/lock_orders.rst:28
+msgid "You can unlock the document if you need to make additional changes"
+msgstr ""
+
 #: ../../purchase/purchases/rfq/reception.rst:3
-msgid "How to control product received? (entirely & partially)"
-msgstr "Hoe ontvangen producten beheren? (geheel en deels)"
+msgid "Control product received (entirely & partially)"
+msgstr ""
 
 #: ../../purchase/purchases/rfq/reception.rst:5
 msgid ""
@@ -2144,18 +1289,10 @@ msgid ""
 msgstr ""
 
 #: ../../purchase/purchases/rfq/reception.rst:67
-msgid ""
-"See the documentation page :doc:`../../overview/process/from_po_to_invoice` "
-"for a full overview of the purchase process."
-msgstr ""
-"Zie de documentatie pagina :doc:`../../overview/process/from_po_to_invoice` "
-"voor een volledig overzicht van het inkoop proces."
-
-#: ../../purchase/purchases/rfq/reception.rst:71
 msgid "Receive Products"
 msgstr "Producten ontvangen"
 
-#: ../../purchase/purchases/rfq/reception.rst:73
+#: ../../purchase/purchases/rfq/reception.rst:69
 msgid ""
 "If you purchased physical goods (stockable or consumable products), you can "
 "receive the products from the **Inventory** application. From the "
@@ -2163,7 +1300,7 @@ msgid ""
 "receipt box of the related warehouse."
 msgstr ""
 
-#: ../../purchase/purchases/rfq/reception.rst:81
+#: ../../purchase/purchases/rfq/reception.rst:77
 msgid ""
 "Click on this button and you access a list of all awaiting orders for this "
 "warehouse."
@@ -2171,7 +1308,7 @@ msgstr ""
 "Klik op deze knop en u krijgt een lijst van alle wachtende orders voor dit "
 "magazijn."
 
-#: ../../purchase/purchases/rfq/reception.rst:87
+#: ../../purchase/purchases/rfq/reception.rst:83
 msgid ""
 "If you have a lot of awaiting orders, you can use the filter bar to search "
 "on the **Vendor** (also called **Partner** in Odoo), the product or the "
@@ -2180,7 +1317,7 @@ msgid ""
 "the lines within it."
 msgstr ""
 
-#: ../../purchase/purchases/rfq/reception.rst:96
+#: ../../purchase/purchases/rfq/reception.rst:92
 msgid ""
 "You may validate the whole document at once by clicking on the **Validate** "
 "button or you can control all products, one by one, by manually change the "
@@ -2188,361 +1325,242 @@ msgid ""
 "it means the quantity received matches to what have been expected."
 msgstr ""
 
-#: ../../purchase/purchases/rfq/reception.rst:103
+#: ../../purchase/purchases/rfq/reception.rst:99
 msgid ""
 "If you work with lots or serial numbers, you can not set the processed "
 "quantity, but you have to provide all the lots or serial numbers to record "
 "the quantity received."
 msgstr ""
 
-#: ../../purchase/purchases/rfq/reception.rst:107
+#: ../../purchase/purchases/rfq/reception.rst:103
 msgid ""
 "When you validate the reception, if you have received less products than the"
 " initial demand, Odoo will ask youthe permission to create a backorder."
 msgstr ""
 
-#: ../../purchase/purchases/rfq/reception.rst:114
+#: ../../purchase/purchases/rfq/reception.rst:110
 msgid ""
 "If you plan to receive the remaining product in the future, select **Create "
 "Backorder**. Odoo will create a new documents for the awaiting products. If "
 "you choose **No Backorder**, the order is considered as fulfilled."
 msgstr ""
 
-#: ../../purchase/purchases/rfq/reception.rst:121
+#: ../../purchase/purchases/rfq/reception.rst:117
 msgid ":doc:`cancel`"
 msgstr ":doc:`cancel`"
 
+#: ../../purchase/purchases/rfq/warning.rst:3
+msgid "Raise warnings on purchase orders"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/warning.rst:5
+msgid ""
+"The *Warnings* feature allows you to raise warnings or blocking messages on "
+"purchase orders based on a vendor or a product."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/warning.rst:8
+msgid ""
+"For example, if you often have a problem with a vendor, you might want to "
+"raise a warning when purchasing from that vendor. If a product is about to "
+"be discontinued, you may want to raise a blocking message on the purchase "
+"order."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/warning.rst:16
+msgid ""
+"For this feature to work, go to :menuselection:`Purchases --> Configuration "
+"--> Settings` and activate the *Warnings* feature."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/warning.rst:24
+msgid "Add a warning on a vendor"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/warning.rst:26
+msgid ""
+"When you activate the feature, you get a new option under the *Internal "
+"Notes* tab on vendors. You can decide to write a simple warning or a "
+"blocking message."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/warning.rst:34
+msgid "Add a warning on a product"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/warning.rst:36
+msgid ""
+"When you activate the feature, you get a new option under the *Purchase* tab"
+" on the product page where you can add a warning or a blocking message."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/warning.rst:44
+msgid "Trying to buy with warnings or blocking messages"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/warning.rst:46
+msgid ""
+"If you try to validate a *Purchase Order* from a vendor or with a product "
+"with a warning, a message will be raised. You can ignore it by clicking ok."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/warning.rst:53
+msgid "However, if it is a blocking message, you can not ignore it."
+msgstr ""
+
 #: ../../purchase/purchases/tender.rst:3
-msgid "Purchase Tenders"
-msgstr "Inkoopbestedingen"
+msgid "Purchase Agreements"
+msgstr "Inkoopovereenkomsten"
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:3
-msgid "How to manage Blanket Orders"
+#: ../../purchase/purchases/tender/blanket_orders.rst:3
+msgid "Manage Blanket Orders"
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:5
+#: ../../purchase/purchases/tender/blanket_orders.rst:5
 msgid ""
-"A **Blanket Order** is a contract between you (the customer) and your "
-"supplier. It is used to negotiate a discounted price. The supplier is "
-"benefited by the economies of scale inherent in a large order. You are "
-"benefited by being allowed to take multiple smaller deliveries over a period"
-" of time, at a lower price, without paying for the large order immediately. "
-"Each small periodic delivery is called a release or call-off."
+"A Blanket Order is a purchase order which a customer places with its "
+"supplier to allow multiple delivery dates over a period of time, often "
+"negotiated to take advantage of predetermined pricing."
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:12
+#: ../../purchase/purchases/tender/blanket_orders.rst:12
 msgid ""
-"As the blanket order is a contract, it will have some prearranged "
-"conditions. These usually include:"
+"For this feature to work, go to :menuselection:`Purchases --> Configuration "
+"--> Settings` and activate the *Purchase Agreements* feature"
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:15
-msgid "Total quantity of each product to be delivered"
+#: ../../purchase/purchases/tender/blanket_orders.rst:20
+msgid "Start a Blanket Order"
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:17
+#: ../../purchase/purchases/tender/blanket_orders.rst:22
+#: ../../purchase/purchases/tender/call_for_tender.rst:21
 msgid ""
-"Completion deadline, by which you must take delivery of the total quantity"
-msgstr ""
-
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:19
-msgid "Unit price for each product"
-msgstr ""
-
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:21
-msgid "Delivery lead time in days for each release"
-msgstr ""
-
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:24
-msgid "Activate the Purchase Agreements"
-msgstr ""
-
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:26
-msgid ""
-"The Blanket Order function is provided by the Purchase Agreements feature. "
-"By default, the Purchase Agreements is not activated. To be able to use "
-"blanket orders, you must first activate the option."
-msgstr ""
-
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:30
-msgid ""
-"In the Purchases module, open the Configuration menu and click on Settings. "
-"In the **Orders** section, locate the **Purchase Agreements** and tick the "
-"box, then click on **Save**."
-msgstr ""
-
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:38
-msgid "Create a Blanket Order"
-msgstr ""
-
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:40
-msgid ""
-"To create a new blanket order, open :menuselection:`Purchase --> Purchase "
+"To use this feature go to :menuselection:`Purchases --> Purchase "
 "Agreements`."
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:45
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:39
+#: ../../purchase/purchases/tender/blanket_orders.rst:24
 msgid ""
-"In the Purchase Agreements window, click on **Create**. A new Purchase "
-"Agreement window opens."
+"Once you are creating the purchase agreement, access the *Agreement Type* "
+"drop down menu and select *Blanket Order*."
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:48
-msgid "In the **Agreement Type** field, choose Blanket Order."
-msgstr ""
-
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:50
-msgid "Choose the **Vendor** with whom you will make the agreement."
-msgstr ""
-
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:52
-msgid "Set the **Agreement Deadline** as per the conditions of the agreement."
-msgstr ""
-
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:54
-msgid "Set the **Ordering Date** to the starting date of the contract."
-msgstr ""
-
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:56
+#: ../../purchase/purchases/tender/blanket_orders.rst:30
 msgid ""
-"Leave the **Delivery Date** empty because we will have different delivery "
-"dates with each release."
+"You can then create your new blanket order, select your vendor, the "
+"product(s), agreement deadline, ordering date and delivery date."
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:59
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:52
+#: ../../purchase/purchases/tender/blanket_orders.rst:33
 msgid ""
-"In the **Products** section, click on **Add an item**. Select products in "
-"the Product list, then insert **Quantity**. You can add as many products as "
-"you wish."
+"When you are satisfied with your purchase agreement, confirm it. Its status "
+"will change from*Draft* to *Ongoing* and a new *RFQs/Orders* will appear in "
+"the top right corner of the document."
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:66
-msgid "Click on **Confirm**."
+#: ../../purchase/purchases/tender/blanket_orders.rst:41
+msgid "RFQ from the Blanket Order"
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:68
+#: ../../purchase/purchases/tender/blanket_orders.rst:43
 msgid ""
-"Now click on the button **New Quotation**. A RfQ is created for this vendor,"
-" with the products chosen on the PT. Repeat this operation for each release."
+"From your blanket order you can create a new quotation, Odoo will auto-fill "
+"the document with the product(s) from your blanket order, you only have to "
+"choose the quantity and confirm the order."
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:71
+#: ../../purchase/purchases/tender/blanket_orders.rst:47
 msgid ""
-"Be careful to change the **Quantity** field on the RFQ.  By default, the RFQ"
-" quantity will be for the entire remaining quantity. Your individual "
-"releases should be for some smaller quantity."
+"When you will go back on the blanket order, you will see how many quantities"
+" you have already ordered from your blanket order."
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:78
+#: ../../purchase/purchases/tender/blanket_orders.rst:51
+msgid "Vendors prices on your product"
+msgstr ""
+
+#: ../../purchase/purchases/tender/blanket_orders.rst:53
 msgid ""
-"When all of the releases (purchase orders) have been delivered and paid, you"
-" can click on **Validate** and **Done**."
+"When a blanket order is validated, a new vendor line is added in your "
+"product. You can see which one are linked to a blanket order and give "
+"priority to the ones you want with the arrows on the left of the vendor "
+"name."
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:81
+#: ../../purchase/purchases/tender/blanket_orders.rst:58
 msgid ""
-"View `Purchase Agreements "
-"<https://demo.odoo.com/?module=purchase_requisition.action_purchase_requisition>`__"
-" in our Online Demonstration."
+"Thanks to this, a blanket order can be used for automated replenishment "
+"(using *reordering rules* or *made to order* configuration)."
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:88
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:83
-msgid ":doc:`../../overview/process/difference`"
-msgstr ":doc:`../../overview/process/difference`"
-
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:3
-msgid "How to manage Purchase Tenders"
-msgstr ""
-
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:12
+#: ../../purchase/purchases/tender/blanket_orders.rst:65
 msgid ""
-"For more information on best uses, please read the chapter `Request for "
-"Quotation, Purchase Tender or Purchase Order? "
-"<https://www.odoo.com/documentation/user/11.0/purchase/overview/process/difference.html>`__"
+"You can also create a *Request for Quotation* from the classic RFQ Menu and "
+"link them with an existing *Blanket Order*"
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:17
-msgid "Activate the Purchase Tender function"
+#: ../../purchase/purchases/tender/call_for_tender.rst:3
+msgid "Manage Call for Tender"
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:19
+#: ../../purchase/purchases/tender/call_for_tender.rst:5
 msgid ""
-"By default, the Purchase Tender is not activated. To be able to use PTs, you"
-" must first activate the option."
+"A Call for Tender is a special procedure to request offers from multiple "
+"vendors to obtain the most interesting price."
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:22
+#: ../../purchase/purchases/tender/call_for_tender.rst:11
 msgid ""
-"In the Purchases module, open the Configuration menu and click on Settings. "
-"In the Purchase Order section, locate the **Calls for Tenders** and tick the"
-" box Allow using call for tenders... (advanced), then click on **Apply**."
+"For this feature to work, go to :menuselection:`Purchases --> Configuration "
+"--> Settings` and activate the *Purchase Agreements* feature."
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:31
-msgid "Create a Purchase Tender"
+#: ../../purchase/purchases/tender/call_for_tender.rst:19
+msgid "Create a Call for Tender"
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:33
+#: ../../purchase/purchases/tender/call_for_tender.rst:23
 msgid ""
-"To create a new Purchase Tender, open :menuselection:`Purchase --> Purchase "
-"Agreements (PA)`."
+"Create a new purchase agreement, access the *Agreement Type* drop down menu "
+"and select *Call for Tender*."
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:42
-msgid "In the **Agreement Type** field, choose Purchase Tender."
-msgstr ""
-
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:44
+#: ../../purchase/purchases/tender/call_for_tender.rst:26
 msgid ""
-"The **Agreement Deadline** field tells the vendors when to have their offers"
-" submitted."
+"When you are satisfied with your purchase agreement, confirm it will move "
+"from *Draft* to *Confirmed* and a new *RFQs/Orders* appeared in the top "
+"right corner of the document."
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:46
+#: ../../purchase/purchases/tender/call_for_tender.rst:34
+msgid "Request new quotations from the Call for Tender"
+msgstr ""
+
+#: ../../purchase/purchases/tender/call_for_tender.rst:36
 msgid ""
-"The **Ordering Date** field tells the vendors when we will submit a purchase"
-" order to the chosen vendor."
+"From the Call for Tender, Odoo will auto-fill the RFQ with the product(s) "
+"from your Call for Tender."
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:48
+#: ../../purchase/purchases/tender/call_for_tender.rst:40
+msgid "Select the best offer"
+msgstr ""
+
+#: ../../purchase/purchases/tender/call_for_tender.rst:42
 msgid ""
-"The **Delivery Date** field tells the vendors when the product will have to "
-"be delivered."
+"The various RFQs and orders linked to the Call for Tenders will be under the"
+" *RFQs/Orders* button where you can select and confirm the best offer."
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:50
-msgid "You do not have to define a **Vendor**."
+#: ../../purchase/purchases/tender/call_for_tender.rst:50
+msgid "Close the Call for Tender"
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:59
-msgid "Click on **Confirm Call**."
+#: ../../purchase/purchases/tender/call_for_tender.rst:52
+msgid "Once you're done with your *Call for Tender* don't forget to close it."
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:61
-msgid ""
-"Now click on the button **New Quotation**. A RfQ is created with the "
-"products chosen on the PT. Choose a **Vendor** and send the RfQ to the "
-"vendor. Repeat this operation for each vendor."
-msgstr ""
-
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:68
-msgid "Once all the RfQs are sent, you can click on **Validate** on the PT."
-msgstr ""
-
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:70
-msgid ""
-"The vendors will send their offers, you can update the RfQs accordingly. "
-"Then, choose the ones you want to accept by clicking on **Confirm Order** on"
-" the RfQs and **Cancel** the others."
-msgstr ""
-
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:74
-msgid "You can now click on **Done** on the PT."
-msgstr ""
-
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:76
-msgid ""
-"View `Purchase Tenders "
-"<https://demo.odoo.com/?module=purchase_requisition.action_purchase_requisition>`__"
-" in our Online Demonstration."
-msgstr ""
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:3
-msgid ""
-"How to purchase partially at two vendors for the same purchase tenders?"
-msgstr ""
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:5
-msgid ""
-"For some Purchase Tenders (PT), you might sometimes want to be able to "
-"select only a part of some of the offers you received. In Odoo, this is made"
-" possible through the advanced mode of the **Purchase** module."
-msgstr ""
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:10
-msgid ""
-"If you want to know how to handle a simple **Purchase Tender**, read the "
-"document on :doc:`manage_multiple_offers`."
-msgstr ""
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:19
-msgid "From the **Apps** menu, install the **Purchase Management** app."
-msgstr "Installeer de **Inkoopbeheer** app vanuit het **Apps** menu."
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:25
-msgid "Activating the Purchase Tender and Purchase Tender advanced mode"
-msgstr ""
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:27
-msgid ""
-"In order to be able to select elements of an offer, you must activate the "
-"advanced mode."
-msgstr ""
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:30
-msgid ""
-"To do so, go into the **Purchases** module, open the **Configuration** menu "
-"and click on **Settings**."
-msgstr ""
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:33
-msgid ""
-"In the **Calls for Tenders** section, tick the option **Allow using call for"
-" tenders to get quotes from multiple suppliers(...)**, and in the **Advanced"
-" Calls for Tenders** section, tick the option **Advanced call for tender "
-"(...)** then click on **Apply**."
-msgstr ""
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:42
-msgid "Selecting elements of a RFQ/Bid"
-msgstr "Elementen selecteren van een RFQ/Bod"
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:44
-msgid ""
-"Go to :menuselection:`Purchase --> Purchase Tenders`. Create a purchase "
-"tender containing several products, and follow the usual sequence all the "
-"way to the **Bid Selection** status."
-msgstr ""
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:49
-msgid ""
-"When you closed the call, click on **Choose Product Lines** to access the "
-"list of products and the bids received for all of them."
-msgstr ""
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:55
-msgid ""
-"Unroll the list of offers you received for each product, and click on the "
-"*v* symbol (**Confirm order**) next to the offers you wish to proceed with. "
-"The lines for which you've confirmed the order turn blue. When you're "
-"finished, click on **Generate PO** to create a purchase order for each "
-"product and supplier."
-msgstr ""
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:64
-msgid ""
-"When you come back to you purchase tender, you can see that the status has "
-"switched to **PO Created** and that the **Requests for Quotations** now have"
-" a status of **Purchase Order** or **Cancelled**."
-msgstr ""
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:72
-msgid ""
-"From there, follow the documentation "
-":doc:`../../overview/process/from_po_to_invoice` to proceed with the "
-"delivery and invoicing."
-msgstr ""
-"Van daaruit volgt u de documentatie "
-":doc:`../../overview/process/from_po_to_invoice` om verder te gaan met de "
-"levering en facturatie."
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:76
-msgid ":doc:`manage_multiple_offers`"
-msgstr ":doc:`manage_multiple_offers`"
-
 #: ../../purchase/replenishment.rst:3
 msgid "Replenishment"
 msgstr "Heraanvulling"
@@ -2552,218 +1570,153 @@ msgid "Replenishment Flows"
 msgstr "Heraanvulling flows"
 
 #: ../../purchase/replenishment/flows/compute_date.rst:3
-msgid "How are the order date and scheduled dates computed?"
-msgstr "Hoe worden de besteldatum en geplande datum berekend?"
+msgid "Schedule your receipts and deliveries"
+msgstr ""
 
 #: ../../purchase/replenishment/flows/compute_date.rst:5
 msgid ""
-"Scheduled dates are computed in order to be able to plan deliveries, "
-"receptions and so on. Depending on the habits of your company, Odoo "
-"automatically generates scheduled dates via the scheduler. The Odoo "
-"scheduler computes everything per line, whether it's a manufacturing order, "
-"a delivery order, a sale order, etc. The dates that are computed are "
-"dependent on the different leads times configured in Odoo."
+"To manage your supply chain scheduling, you will need to use Odoo *Lead "
+"Times*."
 msgstr ""
 
-#: ../../purchase/replenishment/flows/compute_date.rst:13
-msgid "Configuring lead times"
+#: ../../purchase/replenishment/flows/compute_date.rst:8
+msgid ""
+"*Lead Times* are the expected times needed to receive, deliver or "
+"manufacture products."
+msgstr ""
+
+#: ../../purchase/replenishment/flows/compute_date.rst:12
+msgid "Configure Lead Times"
 msgstr ""
 
 #: ../../purchase/replenishment/flows/compute_date.rst:15
+msgid "Vendor Lead Time"
+msgstr "Levertermijn van leverancier"
+
+#: ../../purchase/replenishment/flows/compute_date.rst:17
 msgid ""
-"Configuring **lead times** is an essential move in order to compute "
-"scheduled dates. Lead times are the delays (in term of delivery, "
-"manufacturing, ...) promised to your different partners and/or clients. "
-"Configuration of the different lead times are made as follows:"
+"The vendor lead time is the time needed by your vendor to deliver the "
+"product to you."
 msgstr ""
 
-#: ../../purchase/replenishment/flows/compute_date.rst:21
-msgid "On a product level"
-msgstr "Op een productniveau"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:24
-msgid "Supplier lead time:"
-msgstr ""
-
-#: ../../purchase/replenishment/flows/compute_date.rst:26
+#: ../../purchase/replenishment/flows/compute_date.rst:20
 msgid ""
-"The supplier lead time is the time needed for the supplier to deliver your "
-"purchased product. To configure the Supplier lead time select a product "
-"(from the Purchase module, go to :menuselection:`Purchase --> Product`), and"
-" go in the **Inventory** tab. You will have to add a **Vendor** to your "
-"product in order to select a supplier lead time."
+"To configure your vendor lead times, go to a product page, under the "
+"purchase tab, click on a *Vendor* once there you can change the delivery "
+"lead time for that Vendor & Product."
 msgstr ""
 
-#: ../../purchase/replenishment/flows/compute_date.rst:36
+#: ../../purchase/replenishment/flows/compute_date.rst:28
+msgid "Customer Lead Time"
+msgstr "Levertijd aan klant"
+
+#: ../../purchase/replenishment/flows/compute_date.rst:30
 msgid ""
-"It is possible to add more than one vendor per product and thus different "
-"delivery lead times depending on the vendor."
+"The customer lead time, on the other hand, is the time you need to deliver "
+"the product to your customer."
 msgstr ""
 
-#: ../../purchase/replenishment/flows/compute_date.rst:39
+#: ../../purchase/replenishment/flows/compute_date.rst:33
 msgid ""
-"Once a vendor is selected, click on it to open its form and indicate its "
-"delivery lead time."
+"To configure your customer lead time open a product and go under the "
+"*Inventory* tab. You can then add how many days you need."
 msgstr ""
 
-#: ../../purchase/replenishment/flows/compute_date.rst:46
+#: ../../purchase/replenishment/flows/compute_date.rst:40
+msgid "Manufacturing lead time"
+msgstr ""
+
+#: ../../purchase/replenishment/flows/compute_date.rst:42
 msgid ""
-"In this case security days have no influence, the scheduled delivery days "
-"will be equal to: Date of the purchase order + Delivery Lead Time."
+"The manufacturing lead time is the time you need to manufacture the product."
 msgstr ""
 
-#: ../../purchase/replenishment/flows/compute_date.rst:50
-msgid "Customer lead time"
+#: ../../purchase/replenishment/flows/compute_date.rst:45
+msgid ""
+"To configure your manufacturing lead time open a product and go under the "
+"*Inventory* tab. You can then add how many days you need."
 msgstr ""
 
 #: ../../purchase/replenishment/flows/compute_date.rst:52
-msgid ""
-"The customer lead time is the time needed to get your product from your "
-"store/warehouse to your customer. It can be configured for any product. "
-"Simply select a product (from the **Sales** module, go to "
-":menuselection:`Sales --> Product`), and go into the **Sales** tab to "
-"indicate your customer lead time."
+msgid "Configure Security Lead Times"
 msgstr ""
 
-#: ../../purchase/replenishment/flows/compute_date.rst:62
-msgid "On the company level"
-msgstr "Op het bedrijfsniveau"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:64
+#: ../../purchase/replenishment/flows/compute_date.rst:54
 msgid ""
-"On company level, it is possible to parameter **security days** in order to "
-"cope with eventual delays and to be sure to meet your engagements. The idea "
-"is to subtract **backup** days from the computed scheduled date in case of "
-"delays."
+"Odoo also lets you configure *Security Days* allowing you to cope with "
+"potential delays along the supply chain and make sure you meet your "
+"engagements."
 msgstr ""
 
-#: ../../purchase/replenishment/flows/compute_date.rst:70
-msgid "Sales Safety days"
+#: ../../purchase/replenishment/flows/compute_date.rst:58
+msgid ""
+"The easiest way is to go to *Settings* from any module and type **Lead "
+"Time** in the search bar. From there, tick each box and configure your "
+"various *Security Lead Time* for your needs."
 msgstr ""
 
-#: ../../purchase/replenishment/flows/compute_date.rst:72
+#: ../../purchase/replenishment/flows/compute_date.rst:65
 msgid ""
-"Sales Safety days are **back-up** days to ensure you will be able to deliver"
-" your clients engagements on time. They are margins of errors for delivery "
-"lead times. Security days are the same logic as the early wristwatch, in "
-"order to arrive on time. The idea is to subtract the numbers of security "
-"days from the calculation and thus to compute a scheduled date earlier than "
-"the one you promised to your client. That way you are sure to be able to "
-"keep your commitment."
+"Alternatively, you can go in the settings of the *Inventory* module and "
+"*Manufacturing* module to configure those settings."
 msgstr ""
 
-#: ../../purchase/replenishment/flows/compute_date.rst:80
+#: ../../purchase/replenishment/flows/compute_date.rst:69
+msgid "Lead & security times in a use case"
+msgstr ""
+
+#: ../../purchase/replenishment/flows/compute_date.rst:71
 msgid ""
-"To set up your security dates, go to the app :menuselection:`Settings --> "
-"General settings`, and click on **Configure your company data**."
+"For example you sell a car today (January 1st), that is purchased on order, "
+"and you promise to deliver your customer within 20 days (January 20). Here "
+"is your product’s configuration:"
+msgstr ""
+
+#: ../../purchase/replenishment/flows/compute_date.rst:75
+msgid "Security lead time for sales : 1 day"
+msgstr ""
+
+#: ../../purchase/replenishment/flows/compute_date.rst:77
+msgid "Security lead time for purchase : 1 day"
+msgstr ""
+
+#: ../../purchase/replenishment/flows/compute_date.rst:79
+msgid "Vendor delivery lead time : 9 days"
+msgstr ""
+
+#: ../../purchase/replenishment/flows/compute_date.rst:81
+msgid ""
+"In such a scenario, the scheduler will trigger the following events based on"
+" your configuration."
+msgstr ""
+
+#: ../../purchase/replenishment/flows/compute_date.rst:84
+msgid ""
+"January 19: scheduled delivery date (20th January - 1 day of security lead "
+"time for Sales)"
 msgstr ""
 
 #: ../../purchase/replenishment/flows/compute_date.rst:87
-msgid "Go the **Configuration** tab to indicate the number of safety days"
-msgstr ""
-"Ga naar het **Configuratie** tabblad om het aantal veiligheidsdagen aan te "
-"geven"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:93
 msgid ""
-"Note that you can in this menu configure a default **Manufacturing** lead "
-"time."
+"January 18: scheduled receipt date (19th January - 1 day of security lead "
+"time for Purchase)"
 msgstr ""
 
-#: ../../purchase/replenishment/flows/compute_date.rst:97
-msgid "Purchase days"
-msgstr "Inkoopdagen"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:99
-msgid "Purchase days response to the same logic than sales security days."
-msgstr ""
-
-#: ../../purchase/replenishment/flows/compute_date.rst:101
+#: ../../purchase/replenishment/flows/compute_date.rst:90
 msgid ""
-"They are margins of error for vendor lead times. When the system generates "
-"purchase orders for procuring products, they will be scheduled in order to "
-"cope with unexpected vendor delays. Purchase lead time can be found in the "
-"same menu as the sales safety days (see screenshot above)."
-msgstr ""
-
-#: ../../purchase/replenishment/flows/compute_date.rst:108
-msgid "On route level"
-msgstr "Op route niveau"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:110
-msgid ""
-"The internal transfers due to the movement of stocks can also influence the "
-"computed date."
-msgstr ""
-
-#: ../../purchase/replenishment/flows/compute_date.rst:113
-msgid ""
-"The delays due to internal transfers can be specified in the **Inventory** "
-"module when creating a new push rule for a new route."
-msgstr ""
-
-#: ../../purchase/replenishment/flows/compute_date.rst:117
-msgid ""
-"Read the documentation "
-":doc:`../../../../inventory/routes/concepts/push_rule` to learn more."
-msgstr ""
-"Lees de documentatie :doc:`../../../../inventory/routes/concepts/push_rule` "
-"om meer te leren."
-
-#: ../../purchase/replenishment/flows/compute_date.rst:125
-msgid "On document level:"
-msgstr "Op document niveau:"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:128
-msgid "Requested date"
-msgstr "Aanvraagdatum"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:130
-msgid ""
-"Odoo offers the possibility to indicate a requested date by the client "
-"straight on the sale order, under the tab **Other information**. If this "
-"date is earlier than the theoretically computed date, Odoo will "
-"automatically display a warning."
-msgstr ""
-
-#: ../../purchase/replenishment/flows/compute_date.rst:141
-msgid ""
-"As an example, you may sell a car today (January 1st), that is purchased on "
-"order, and you promise to deliver your customer within 20 days (January 20)."
-" In such a scenario, the scheduler may trigger the following events, based "
-"on your configuration:"
-msgstr ""
-
-#: ../../purchase/replenishment/flows/compute_date.rst:146
-msgid "January 19: actual scheduled delivery (1 day of Sales Safety days)"
-msgstr ""
-"Januari 19: werkelijk geplande leverdatum (1 dag na de verkoop veiligheid "
-"dag)"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:148
-msgid ""
-"January 18: receive the product from your supplier (1 day of Purchase days)"
-msgstr ""
-"Januari 18: ontvang het product van uw leverancier (1 dag van inkoopdagen)"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:151
-msgid ""
-"January 10: deadline to order at your supplier (9 days of supplier delivery "
-"lead time)"
-msgstr ""
-"Januari 10: deadline om te bestellen bij uw leverancier (9 dagen van "
-"leverancier zijn doorlooptijd)"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:154
-msgid ""
-"January 8: trigger a purchase request to your purchase team, since the team "
-"needs on average 2 days to find the right supplier and order."
+"January 10: order date = deadline to order from your vendor (19th January - "
+"9 days of vendor lead time)"
 msgstr ""
 
 #: ../../purchase/replenishment/flows/dropshipping.rst:3
-msgid "How to setup drop-shipping?"
+msgid "Setup drop-shipping"
 msgstr ""
 
+#: ../../purchase/replenishment/flows/dropshipping.rst:6
+#: ../../purchase/replenishment/multicompany/setup.rst:6
+msgid "Overview"
+msgstr "Overzicht"
+
 #: ../../purchase/replenishment/flows/dropshipping.rst:8
 msgid ""
 "Drop shipping allows to deliver the goods directly from the supplier to the "
@@ -2809,512 +1762,143 @@ msgid ""
 msgstr ""
 
 #: ../../purchase/replenishment/flows/purchase_triggering.rst:3
-msgid "How to trigger the purchase of products based on sales?"
+msgid "Trigger purchase of products based on sales (Make to Order)"
+msgstr ""
+
+#: ../../purchase/replenishment/flows/purchase_triggering.rst:5
+msgid ""
+"If you don't keep stock of your products, you may need to trigger purchase "
+"orders on each sale you make."
 msgstr ""
 
 #: ../../purchase/replenishment/flows/purchase_triggering.rst:8
 msgid ""
-"When you work in just-in-time, you don't manage stock so you directly order "
-"the product you need from your vendor."
+"Thanks to being a fully integrated solution, Odoo lets you do that easily in"
+" just one step."
 msgstr ""
 
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:11
-msgid "The usual flow is:"
-msgstr "De gebruikelijke flow is:"
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:13
-msgid "Create a sale order"
-msgstr "Maak een verkooporder"
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:15
-msgid "Purchase the product"
-msgstr "Koop het product"
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:17
-msgid "Receive and pay the bill"
+#: ../../purchase/replenishment/flows/purchase_triggering.rst:12
+msgid "Configure the product"
 msgstr ""
 
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:19
-msgid "Deliver your product"
-msgstr "Lever uw product"
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:21
-msgid "Invoice your customer"
-msgstr "Factureer uw klant"
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:24
-msgid "Product configuration"
-msgstr "Product configuratie"
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:26
+#: ../../purchase/replenishment/flows/purchase_triggering.rst:14
 msgid ""
-"In the purchases application, open the **Purchase** menu and click on "
-"**Products**. Open the product on which you want to do your purchases based "
-"on sales."
+"Open a product form and, under the inventory tab, tick the routes *Buy* and "
+"*Make To Order*."
 msgstr ""
 
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:30
+#: ../../purchase/replenishment/flows/purchase_triggering.rst:20
+msgid "Don't forget to also set a vendor under the *Purchase* tab."
+msgstr ""
+
+#: ../../purchase/replenishment/flows/purchase_triggering.rst:23
 msgid ""
-"Next to Routes, tick **Buy** and **Make to order** as a procurement method. "
-"When you are generating sales order, Odoo will automatically reorder the "
-"same quantity through procurement."
+"The *Inventory*, *Sales* and *Purchases* modules have to be installed in "
+"Odoo for this feature to work."
 msgstr ""
 
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:37
-msgid "Don't forget to set a vendor otherwise the rule won't be triggered."
+#: ../../purchase/replenishment/flows/purchase_triggering.rst:27
+msgid "Create a sales order using Buy & MTO"
 msgstr ""
 
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:39
+#: ../../purchase/replenishment/flows/purchase_triggering.rst:29
 msgid ""
-"You can also configure minimum stock rules that will trigger the purchase "
-"orders."
+"Create a new sales order with your product. When you confirm the order, a "
+"delivery order is created with the status *Waiting for another operation*."
 msgstr ""
-"U kan ook minimale stockregels configureren die de inkooporders doen afgaan."
 
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:43
+#: ../../purchase/replenishment/flows/purchase_triggering.rst:33
 msgid ""
-"To know how to configure a minimum stock rule, please read the document "
-":doc:`setup_stock_rule`."
+"A new RfQ will automatically be created in your *Purchases* module. Note "
+"that you can see for which SO this RfQ has been created thanks to the "
+"*Source Document* field, visible on the RfQ."
 msgstr ""
-"Lees aub de documentatie om te weten hoe u minimale stockregels configureert"
-" op  :doc:`setup_stock_rule`."
 
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:50
-msgid "Sale order"
-msgstr "Verkooporder"
+#: ../../purchase/replenishment/flows/purchase_triggering.rst:40
+msgid ""
+"When you confirm the RfQ into a purchase order, a receipt is automatically "
+"created and directly accessible from your purchase order with the use of the"
+" *Shipment* button."
+msgstr ""
+
+#: ../../purchase/replenishment/flows/purchase_triggering.rst:47
+msgid ""
+"You can validate the receipt of your products. When you will go back to the "
+"delivery order, you will see that the products are now ready to be shipped."
+msgstr ""
 
 #: ../../purchase/replenishment/flows/purchase_triggering.rst:52
 msgid ""
-"To create a sale order, go to the **Sales** application, "
-":menuselection:`Sales --> Sales order` and create a new sale order."
+"As long as your RfQ is not confirmed, Odoo will keep adding PO Lines "
+"automatically under it."
 msgstr ""
 
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:58
-msgid ""
-"After confirming it, you will see one **Delivery** associated with this sale"
-" order on the **button** on the top of it."
+#: ../../purchase/replenishment/flows/purchase_triggering.rst:57
+msgid ":doc:`../../../purchase/replenishment/flows/setup_stock_rule`"
 msgstr ""
 
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:64
-msgid ""
-"Click on the **Delivery** button to see the transfer order. The status of "
-"the outgoing shipment is **Waiting Another Operation**. It won't be done "
-"until the purchase order is confirmed and received."
-msgstr ""
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:69
-msgid "Purchase order"
-msgstr "Inkooporder"
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:71
-msgid ""
-"The purchase order is automatically created. Go to the **Purchase** "
-"application :menuselection:`Purchase --> Request for Quotation`. The source "
-"document is the sale order that triggered the procurement."
-msgstr ""
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:79
-msgid ""
-"If you make some more sales that trigger procurements to the same vendor, it"
-" will be added to the existing request for quotation. Once it is confirmed, "
-"the next procurements will create a new request for quotation."
-msgstr ""
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:85
-msgid "Receipt and delivery"
-msgstr ""
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:87
-msgid ""
-"Go the the **Inventory** application. Click on **# To Receive** on the "
-"**Receipts** tile."
-msgstr ""
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:93
-msgid "Select the receipt from your vendor and **Validate** it."
-msgstr ""
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:98
-msgid ""
-"Go back to the **Inventory** dashboard. In the delivery order, click on **# "
-"To Do**. The delivery order is now ready to ship."
-msgstr ""
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:104
-msgid ""
-"The status of the delivery changed from **Waiting Availability** to "
-"**Available**. Validate the transfer to confirm the delivery."
-msgstr ""
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:111
-msgid ":doc:`setup_stock_rule`"
-msgstr ":doc:`setup_stock_rule`"
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:112
-msgid ":doc:`warning_triggering`"
-msgstr ":doc:`warning_triggering`"
-
 #: ../../purchase/replenishment/flows/setup_stock_rule.rst:3
-msgid "How to setup a minimum stock rule?"
-msgstr "Hoe minimale stockregels opzetten?"
+msgid "Don’t run out of stock thanks to Reordering Rules"
+msgstr ""
 
 #: ../../purchase/replenishment/flows/setup_stock_rule.rst:5
 msgid ""
-"For some items you hold in stock, it might be useful to have rules making "
-"sure you never run out of stocks (for example, products with a high demand, "
-"or large items requiring a lot of storage space meaning they're harder to "
-"stock)."
+"To make sure you never run out of stock, you might want to define "
+"*Reordering Rules* on products. Thanks to reordering rules, Odoo will help "
+"you to replenish your stock when it reaches a minimum stock level."
 msgstr ""
 
 #: ../../purchase/replenishment/flows/setup_stock_rule.rst:10
+msgid "Set a reordering rule"
+msgstr ""
+
+#: ../../purchase/replenishment/flows/setup_stock_rule.rst:12
+msgid "Open a stockable product, you'll find the *Reordering Rules* tab."
+msgstr ""
+
+#: ../../purchase/replenishment/flows/setup_stock_rule.rst:15
 msgid ""
-"Odoo allows you to set up rules so that an automatic replenishment for those"
-" items is made, based on minimum stocks available."
+"You can also access all your reordering rules from :menuselection:`Inventory"
+" --> Master Data --> Reordering Rules`."
 msgstr ""
 
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:14
-msgid "When should I use Reordering Rules?"
-msgstr ""
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:16
+#: ../../purchase/replenishment/flows/setup_stock_rule.rst:21
 msgid ""
-"Reordering Rules work best for items that have a high demand and high flow. "
-"It will relieve you from a lot of work to focus on the rest of your "
-"activities knowing that stocks will always be right."
+"Once in the next menu, you can create the reordering rules linked to your "
+"product. From now on, every time this product reaches the minimum quantity "
+"it will replenish your stock to your **maximum quantity**."
 msgstr ""
 
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:20
+#: ../../purchase/replenishment/flows/setup_stock_rule.rst:29
 msgid ""
-"It can also be used when you have limited storage space and you need to keep"
-" large items in stock. In this case, you can keep as little as 1 item in "
-"stock, and have a new one ordered as a stock replenishment as soon as the "
-"item in stock is sold."
-msgstr ""
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:26
-msgid "When should I avoid Reordering Rules?"
-msgstr ""
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:28
-msgid ""
-"If you are offering a new product and don't know yet how fast it will go, "
-"you should handle stocks yourself first, and setup reordering rules only a "
-"few months into the sale to have better forecasts of the demand."
-msgstr ""
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:32
-msgid ""
-"If you sell items that have a limited lifetime, such as fashion items, "
-"technology items, or products working together with a system that is meant "
-"to evolve, you have to be very well informed on when to stop automated "
-"replenishments, in order to avoid having to sell these items at a price that"
-" will not allow you to break even."
-msgstr ""
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:41
-msgid ""
-"My company sells modern furniture. We sell a set of table and chairs that "
-"are available in 4 seatings and 6 seatings."
-msgstr ""
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:44
-msgid ""
-"To keep things simple, we stock tables and chairs separately, but sell them "
-"all together to our clients as a kit. In order to make sure we can always "
-"deliver a complete set of table and chairs, I setup a Reordering Rule for "
-"the chairs to make sure I always have at least 10 chairs in stock, but no "
-"more than 20. This way, I can sell up to 5 sets of table at once while "
-"keeping my stock low enough not to eat up all my storage space."
-msgstr ""
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:52
-msgid ""
-"The last table I sold was a 4 seatings, and there were 12 chairs left in my "
-"stock. Because the stock in chairs is now only 8 chairs, Odoo will "
-"automatically order 12 new chairs to fill up my stock to the maximum amount."
-msgstr ""
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:61
-msgid "Set up your product"
-msgstr "Zet uw product op"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:63
-msgid ""
-"In the Purchases module, open the Purchase menu and click on Products. Open "
-"the product to which you would like to add a Reordering Rule (or create a "
-"new one)."
-msgstr ""
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:67
-msgid "3 conditions for correct reordering rule :"
-msgstr ""
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:69
-msgid ""
-"In :menuselection:`General information --> Product type`, make the product "
-"stockable (as soon as this is done, the icon \"Reordering rule will appear)"
-msgstr ""
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:71
-msgid ""
-"In :menuselection:`Inventory --> route`, tick the \"Buy\" box (and untick "
-"the Make To Order box)"
-msgstr ""
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:73
-msgid ""
-"Select a vendor (don't forget to put a minimal quantity greater than 0)"
-msgstr ""
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:76
-msgid "Create a reordering rule"
-msgstr "Maak een aanvulopdracht regel"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:78
-msgid "Click on the Reordering Rules tab, click on Create. A new page opens."
-msgstr ""
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:83
-msgid ""
-"By default, Reordering Rules in Odoo are named as \"OP/XXXXX\" but you are "
-"free to use any nomenclature. You can modify it via the **Name** field."
-msgstr ""
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:86
-msgid "The **Product** field is the product you are creating the rule for."
-msgstr "Het **Product** veld is het product waar u de regel voor aanmaakt."
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:88
-msgid ""
-"Select the warehouse to which the product should be delivered in the "
-"**Warehouse** field."
-msgstr ""
-"Selecteer het magazijn waarvoor het product geleverd moet worden in het "
-"**Magazijn** veld."
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:91
-msgid ""
-"If you have configured multiple warehouses and location, specify the "
-"location in which the product will be stored in the **Location** field."
-msgstr ""
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:96
-msgid ""
-":doc:`../../../inventory/settings/warehouses/difference_warehouse_location`"
-msgstr ""
-":doc:`../../../inventory/settings/warehouses/difference_warehouse_location`"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:102
-msgid ""
-"In the **Minimum Quantity** field, insert the quantity to which the system "
-"will trigger a new order for replenishment."
-msgstr ""
-"In het **Minimale hoeveelheid** veld geeft u de hoeveelheid in waarop het "
-"systeem automatisch een nieuwe order aanmaakt voor de aanvulregels."
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:105
-msgid ""
-"In the **Maximum Quantity** field, insert the maximum of items that has to "
-"be stocked. The replenishing order will be based on that quantity to "
-"reorder."
-msgstr ""
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:109
-msgid ""
-"The **Quantity Multiple** is the lowest number of items that can be ordered "
-"at once. For instance, some items may be only available for purchase in a "
-"set of 2."
-msgstr ""
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:113
-msgid ""
-"In the Misc section, the **Active** box allows you to activate or deactivate"
-" the rule."
-msgstr ""
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:116
-msgid "In the **Lead Time** section, you can enter:"
-msgstr ""
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:118
-msgid ""
-"the number of Day(s) to purchase: correspond to the number of days for the "
-"supplier to receive the order"
-msgstr ""
-"het aantal dagen om aan te kopen: komt overeen met het aantal dagen voor de "
-"leverancier om het order te ontvangen"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:120
-msgid "the number of Day(s) to get the products"
-msgstr "het aantal dagen om de producten te ontvangen"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:122
-msgid ""
-"By default, the lead times are in calendar days. You can change that in "
-":menuselection:`Inventory --> Configuration --> Settings --> Minimum Stock "
-"Rules`"
-msgstr ""
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:125
-msgid "When you have entered all the info, click on Save."
-msgstr "Wanneer u alle informatie heeft ingegeven klikt u op opslaan."
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:127
-msgid ""
-"From now on, every time a product with a reordering rule reaches the minimum"
-" stock, the system will automatically send a RfQ to your supplier based on "
-"your maximum quantity to replenish your stock."
-msgstr ""
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:131
-msgid ""
-"The replenishments will take place when the scheduler in the Inventory "
+"The replenishments will take place when the scheduler in the *Inventory* "
 "module runs. By default in Odoo, the schedulers will run every night at "
 "12:00PM."
 msgstr ""
 
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:135
+#: ../../purchase/replenishment/flows/setup_stock_rule.rst:33
+msgid "See also: :doc:`../../../inventory/management/misc/schedulers`"
+msgstr ""
+
+#: ../../purchase/replenishment/flows/setup_stock_rule.rst:35
 msgid ""
-"To know how to configure and run the schedulers manually, read the document "
-"on :doc:`../../../inventory/management/misc/schedulers`"
+"From now on, every time a product with a reordering rule reaches the minimum"
+" stock, the system will automatically see how to fulfill that need based on "
+"the product configuration (e.g create an RfQ, create an MO, etc.)."
 msgstr ""
-"Om te weten hoe u manueel planners configureert en uitvoert lees u best de "
-"documentatie op :doc:`../../../inventory/management/misc/schedulers`"
 
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:140
-msgid ":doc:`../../../inventory/management/misc/schedulers`"
-msgstr ":doc:`../../../inventory/management/misc/schedulers`"
+#: ../../purchase/replenishment/flows/setup_stock_rule.rst:41
+msgid "Troubleshooting"
+msgstr "Problemen oplossen"
 
-#: ../../purchase/replenishment/flows/warning_triggering.rst:3
-#: ../../purchase/replenishment/flows/warning_triggering.rst:69
-msgid "How to trigger a warning when purchasing at a specific vendor?"
-msgstr ""
-"Hoe een waarschuwing doen afgaan wanneer u koopt bij een specifieke "
-"leverancier?"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:8
+#: ../../purchase/replenishment/flows/setup_stock_rule.rst:43
 msgid ""
-"The **Warning Messages and Alerts** module allow you to configure alerts on "
-"the customers and vendors or products."
-msgstr ""
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:11
-msgid ""
-"You can select the following types of warnings and create different warnings"
-" for purchases and sales:"
-msgstr ""
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:14
-msgid ""
-"Warning: This option displays the warning message during the process, but "
-"allows the user to continue."
-msgstr ""
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:17
-msgid ""
-"Blocking Message: The message displays a warning message, but the user "
-"cannot continue the process further."
-msgstr ""
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:24
-msgid "Module Installation"
-msgstr "Module installatie"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:26
-msgid ""
-"First, you need to install the **Warning Messages and Alerts** module. Go to"
-" **Apps** and look for it (don't forget to remove the **Apps** filter)."
-msgstr ""
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:33
-msgid "Vendor or Customer warnings"
-msgstr ""
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:35
-msgid ""
-"Go to :menuselection:`Purchases --> Vendors` or to :menuselection:`Sales -->"
-" Customers`."
-msgstr ""
-"Ga naar :menuselection:`Inkopen --> Leveranciers` of naar "
-":menuselection:`Verkopen --> Klanten`."
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:37
-msgid "Open the vendor or the customer and click on the **Warnings** tab."
-msgstr ""
-"Open de leverancier van de klant en klik op het **Waarschuwingen** tabblad."
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:42
-#: ../../purchase/replenishment/flows/warning_triggering.rst:62
-msgid "The available warnings are:"
-msgstr "De beschikbare waarschuwingen zijn:"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:44
-msgid "Warning on the **Sales Order**"
-msgstr "Waarschuwing op de **Verkooporder**"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:46
-msgid "Warning on the **Purchase Order**"
-msgstr "Waarschuwing op de **Inkooporder**"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:48
-msgid "Warning on the **Picking**"
-msgstr "Waarschuwing op de **verzamellijst**"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:50
-msgid "Warning on the **Invoice**"
-msgstr "Waarschuwing op de **Factuur**"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:53
-msgid "Product Warnings"
-msgstr "Product waarschuwingen"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:55
-msgid ""
-"Go to :menuselection:`Purchases --> Products` or to :menuselection:`Sales "
-"--> Products`."
-msgstr ""
-"Ga naar :menuselection:`Inkopen --> Producten` of ga naar "
-":menuselection:`Verkopen --> Producten`."
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:57
-msgid "Open the product and click on the **Notes** tab."
-msgstr "Open het product en klik op het **Notities** tabblad."
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:64
-msgid "Warning when selling this product."
-msgstr "Waarschuwing wanneer u het product verkoopt."
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:66
-msgid "Warning when Purchasing this product."
-msgstr "Waarschuwing wanneer u dit project inkoopt."
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:71
-msgid ""
-"Go to the Purchases application, click on :menuselection:`Purchase --> "
-"Vendors`. Go to the **Warnings** tab."
-msgstr ""
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:74
-msgid ""
-"Under **Warning on the Purchase Order**, choose **Warning** and write your "
-"warning."
-msgstr ""
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:80
-msgid ""
-"Create a **Request for Quotation**. Go to :menuselection:`Purchase --> "
-"Request for Quotation` and click on **Create**. Choose the vendor on which a"
-" warning was set."
-msgstr ""
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:84
-msgid "When choosing the vendor, the warning will appear."
-msgstr "Wanneer u de leverancier kiest zal de waarschuwing verschijnen."
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:90
-msgid ""
-"If you set a blocking message instead of a warning message, you won't be "
-"able to choose the vendor."
+"For your reordering rules to work, your product needs to be correctly "
+"configured. If you are using *Buy* route, you need a vendor on the product. "
+"If you are using *Manufacturing* route you will been a BoM on the product. "
+"If the product is not fully configured or there is a mistake in your routes,"
+" a next activity will be logged on the product informing you there is an "
+"issue with the configuration."
 msgstr ""
 
 #: ../../purchase/replenishment/multicompany.rst:3
@@ -3386,69 +1970,3 @@ msgid ""
 "In order to be able to manage the inter-company rules, be sure that your "
 "user has the rights to manage the companies."
 msgstr ""
-
-#: ../../purchase/replenishment/trouble_shooting.rst:3
-msgid "Trouble-Shooting"
-msgstr ""
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:3
-msgid "How to check that everything is working fine?"
-msgstr "Hoe controleren dat alles goed werkt?"
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:6
-msgid "Vendor Bills"
-msgstr "Facturen"
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:8
-msgid ""
-"Even if you don't have the rights to the accounting application, you can "
-"still control the vendor bills."
-msgstr ""
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:11
-msgid ""
-"Go to the **Purchases** application: :menuselection:`Control --> Vendor "
-"Bills`."
-msgstr ""
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:17
-msgid "Incoming Products"
-msgstr "Inkomende producten"
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:19
-msgid ""
-"Even if you don't have the rights to the inventory application, you can "
-"still control the incoming products."
-msgstr ""
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:22
-msgid ""
-"Go to the **Purchases** application: :menuselection:`Control --> Incoming "
-"Products`."
-msgstr ""
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:28
-msgid "Procurements exceptions"
-msgstr ""
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:30
-msgid "Here, you need the **Inventory Manager** access rights."
-msgstr ""
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:32
-msgid ""
-"Go to the **Inventory** application: :menuselection:`Control --> Procurement"
-" Exceptions`."
-msgstr ""
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:37
-msgid ""
-"To understand why the procurement is not running, open the exception and "
-"check the message in the chatter."
-msgstr ""
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:43
-msgid ""
-"Usually, the problem is located on the procurement rules. Either there are "
-"no stock rules, or there are no vendor associated to a product."
-msgstr ""
diff --git a/locale/nl/LC_MESSAGES/sales.po b/locale/nl/LC_MESSAGES/sales.po
index 1ebc57b95..c9d6cd9be 100644
--- a/locale/nl/LC_MESSAGES/sales.po
+++ b/locale/nl/LC_MESSAGES/sales.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-23 12:10+0200\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Pol Van Dingenen <pol.vandingenen@vanroey.be>, 2017\n"
+"Last-Translator: Erwin van der Ploeg <erwin@odooexperts.nl>, 2018\n"
 "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -274,787 +274,440 @@ msgstr ""
 msgid "Invoicing Method"
 msgstr "Factuur methode"
 
-#: ../../sales/invoicing/services.rst:3
-msgid "Services"
-msgstr "Diensten"
-
-#: ../../sales/invoicing/services/milestones.rst:3
-msgid "How to invoice milestones of a project?"
-msgstr "Hoe factureer ik mijlpalen van een project?"
-
-#: ../../sales/invoicing/services/milestones.rst:5
-msgid ""
-"There are different kind of service sales: prepaid volume of hours/days "
-"(e.g. support contract), billing based on time and material (e.g. billing "
-"consulting hours) or a fixed price contract (e.g. a project)."
+#: ../../sales/invoicing/down_payment.rst:3
+msgid "Request a down payment"
 msgstr ""
-"Er zijn verschillende soorten van dienst verkopen: een prepaid volume van "
-"uren/dagen (bijvoorbeeld een ondersteuningscontract), facturatie gebaseerd "
-"op tijd en materiaal (bijvoorbeeld consultant uren) of een vaste prijs "
-"contract (bijvoorbeeld een project)."
 
-#: ../../sales/invoicing/services/milestones.rst:9
+#: ../../sales/invoicing/down_payment.rst:5
 msgid ""
-"In this section, we will have a look at how to invoice milestones of a "
-"project."
+"A down payment is an initial, partial payment, with the agreement that the "
+"rest will be paid later. For expensive orders or projects, it is a way to "
+"protect yourself and make sure your customer is serious."
 msgstr ""
-"In deze sectie zien we hoe we een mijlpaal van een project factureren."
 
-#: ../../sales/invoicing/services/milestones.rst:12
+#: ../../sales/invoicing/down_payment.rst:10
+msgid "First time you request a down payment"
+msgstr ""
+
+#: ../../sales/invoicing/down_payment.rst:12
 msgid ""
-"Milestone invoicing can be used for expensive or large scale projects, with "
-"each milestone representing a clear sequence of work that will incrementally"
-" build up to the completion of the contract. For example, a marketing agency"
-" hired for a new product launch could break down a project into the "
-"following milestones, each of them considered as one service with a fixed "
-"price on the sale order :"
+"When you confirm a sale, you can create an invoice and select a down payment"
+" option. It can either be a fixed amount or a percentage of the total "
+"amount."
 msgstr ""
-"Mijlpaal facturatie kan gebruikt worden voor kostelijke of grote projecten, "
-"waarbij elke mijlpaal een duidelijke sequentie voorstelt van werk dat "
-"incrementeel bijdraagt aan de voltooiing van het contract. Bijvoorbeeld, een"
-" marketingsbureau dat aangenomen is voor het lanceren van een nieuw product "
-"kan een project uitsplitsen in de volgende mijlpalen, elk van hen worden "
-"bezien als een aparte dienst met een vaste prijs op het verkooporder:"
 
-#: ../../sales/invoicing/services/milestones.rst:19
-msgid "Milestone 1 : Marketing strategy audit - 5 000 euros"
-msgstr "Mijlpaal 1: Marketing strategie audit - 5 000 euro"
-
-#: ../../sales/invoicing/services/milestones.rst:21
-msgid "Milestone 2 : Brand Identity - 10 000 euros"
-msgstr "Mijlpaal 2: Merkidentiteit - 10 000€"
-
-#: ../../sales/invoicing/services/milestones.rst:23
-msgid "Milestone 3 : Campaign launch & PR - 8 500 euros"
-msgstr "Mijlpaal 3: Lancering campagne & PR - 8 500 euro"
-
-#: ../../sales/invoicing/services/milestones.rst:25
+#: ../../sales/invoicing/down_payment.rst:16
 msgid ""
-"In this case, an invoice will be sent to the customer each time a milestone "
-"will be successfully reached. That invoicing method is comfortable both for "
-"the company which is ensured to get a steady cash flow throughout the "
-"project lifetime and for the client who can monitor the project's progress "
-"and pay in several times."
+"The first time you request a down payment you can select an income account "
+"and a tax setting that will be reused for next down payments."
 msgstr ""
-"In dit geval wordt er elke keer een e-mail naar de klant gestuurd wanneer "
-"een mijlpaal succesvol voltooid is. Deze facturatie methode is comfortabel "
-"voor beide het bedrijf dat verzekerd wordt van een constante cashflow "
-"doorheen het project en voor de klant die de project voortgang kan opvolgen "
-"en betalen in verschillende fases."
 
-#: ../../sales/invoicing/services/milestones.rst:32
+#: ../../sales/invoicing/down_payment.rst:22
+msgid "You will then see the invoice for the down payment."
+msgstr ""
+
+#: ../../sales/invoicing/down_payment.rst:27
 msgid ""
-"You can also use milestones to invoice percentages of the entire project. "
-"For example, for a million euros project, your company might require a 15% "
-"upfront payment, 30% at the midpoint and the balance at the contract "
-"conclusion. In that case, each payment will be considered as one milestone."
+"On the subsequent or final invoice, any prepayment made will be "
+"automatically deducted."
 msgstr ""
-"U kan ook mijlpalen gebruiken om delen van het project te factureren. "
-"Bijvoorbeeld, voor een project van een miljoen, vereist uw bedrijf misschien"
-" een voorschot van 15%, 30% op het middelpunt en de rest bij de oplevering "
-"van het contract. In dit geval zal elke betaling bezien worden als een "
-"mijlpaal."
 
-#: ../../sales/invoicing/services/milestones.rst:39
-#: ../../sales/invoicing/services/reinvoice.rst:26
-#: ../../sales/invoicing/services/reinvoice.rst:95
-#: ../../sales/invoicing/services/support.rst:17
-#: ../../sales/send_quotations/quote_template.rst:10
-msgid "Configuration"
-msgstr "Instelling"
+#: ../../sales/invoicing/down_payment.rst:34
+msgid "Modify the income account and customer taxes"
+msgstr ""
 
-#: ../../sales/invoicing/services/milestones.rst:42
-msgid "Install the Sales application"
-msgstr "Installeer de Verkoop applicatie"
+#: ../../sales/invoicing/down_payment.rst:36
+msgid "From the products list, search for *Down Payment*."
+msgstr ""
 
-#: ../../sales/invoicing/services/milestones.rst:44
-#: ../../sales/invoicing/services/reinvoice.rst:28
+#: ../../sales/invoicing/down_payment.rst:41
 msgid ""
-"In order to sell services and to send invoices, you need to install the "
-"**Sales** application, from the **Apps** icon."
+"You can then edit it, under the invoicing tab you will be able to change the"
+" income account & customer taxes."
 msgstr ""
-"Om diensten te verkopen en facturen te verzenden moet u de applicatie "
-"**Verkopen** installeren vanuit het **Apps** icoon."
 
-#: ../../sales/invoicing/services/milestones.rst:51
-msgid "Create products"
-msgstr "Maak producten"
-
-#: ../../sales/invoicing/services/milestones.rst:53
-msgid ""
-"In Odoo, each milestone of your project is considered as a product. From the"
-" **Sales** application, use the menu :menuselection:`Sales --> Products`, "
-"create a new product with the following setup:"
+#: ../../sales/invoicing/expense.rst:3
+msgid "Re-invoice expenses to customers"
 msgstr ""
-"In Odoo wordt elke mijlpaal van uw project gezien als een product. Gebruik "
-"het menu :menuselection:`Verkopen--> Producten`,  vanuit de **Verkopen** "
-"applicatie maakt u een nieuw product met de volgende opstelling:"
 
-#: ../../sales/invoicing/services/milestones.rst:57
-msgid "**Name**: Strategy audit"
-msgstr "**Naam**: Strategie audit"
-
-#: ../../sales/invoicing/services/milestones.rst:59
-#: ../../sales/invoicing/services/support.rst:50
-msgid "**Product Type**: Service"
-msgstr "**Productsoort**: Dienst"
-
-#: ../../sales/invoicing/services/milestones.rst:61
-msgid ""
-"**Invoicing Policy**: Delivered Quantities, since you will invoice your "
-"milestone after it has been delivered"
-msgstr ""
-"**Facturatie beleid**: Geleverde hoeveelheden, aangezien u uw mijlpaal "
-"factureert nadat het geleverd is"
-
-#: ../../sales/invoicing/services/milestones.rst:64
-msgid ""
-"**Track Service**: Manually set quantities on order, as you complete each "
-"milestone, you will manually update their quantity from the **Delivered** "
-"tab on your sale order"
-msgstr ""
-"**Traceer diensten**: stel manueel hoeveelheden in op order, naarmate u elke"
-" mijlpaal voltooid, update u manueel de hoeveelheid vanuit het **Geleverd** "
-"tab op uw verkooporder"
-
-#: ../../sales/invoicing/services/milestones.rst:72
-msgid "Apply the same configuration for the others milestones."
-msgstr "Pas dezelfde configuratie toe voor andere mijlpalen."
-
-#: ../../sales/invoicing/services/milestones.rst:75
-msgid "Managing your project"
-msgstr "Uw project beheren"
-
-#: ../../sales/invoicing/services/milestones.rst:78
-msgid "Quotations and sale orders"
-msgstr "Offertes en verkooporders"
-
-#: ../../sales/invoicing/services/milestones.rst:80
-msgid ""
-"Now that your milestones (or products) are created, you can create a "
-"quotation or a sale order with each line corresponding to one milestone. For"
-" each line, set the **Ordered Quantity** to ``1`` as each milestone is "
-"completed once. Once the quotation is confirmed and transformed into a sale "
-"order, you will be able to change the delivered quantities when the "
-"corresponding milestone has been achieved."
-msgstr ""
-"Nu dat uw mijlpalen (of producten) zijn aangemaakt kan u een offerte of "
-"verkooporder aanmaken met elke lijn die overeenkomt met een mijlpaal. Voor "
-"elke lijn zet u de **Bestelde hoeveelheid** naar ``1`` aangezien elke "
-"mijlpaal één keer voltooid wordt. Eenmaal de offerte bevestigd is en "
-"omgevormd is in een verkooporder kan u de geleverde hoeveelheden wijzigen "
-"wanneer de overeenkomende mijlpaal behaald is."
-
-#: ../../sales/invoicing/services/milestones.rst:91
-msgid "Invoice milestones"
-msgstr "Factureer mijlpalen"
-
-#: ../../sales/invoicing/services/milestones.rst:93
-msgid ""
-"Let's assume that your first milestone (the strategy audit) has been "
-"successfully delivered and you want to invoice it to your customer. On the "
-"sale order, click on **Edit** and set the **Delivered Quantity** of the "
-"related product to ``1``."
-msgstr ""
-"Laten we er van uit gaan dat uw eerste mijlpaal (de strategie audit) "
-"succesvol is opgeleverd en u deze aan uw klant wilt factureren. Klik op "
-"**Wijzigen** op het verkooporder en stel de **Geleverde hoeveelheid** van "
-"het gerelateerde product in op ``1``."
-
-#: ../../sales/invoicing/services/milestones.rst:99
-msgid ""
-"As soon as the above modification has been saved, you will notice that the "
-"color of the line has changed to blue, meaning that the service can now be "
-"invoiced. In the same time, the invoice status of the SO has changed from "
-"**Nothing To Invoice** to **To Invoice**"
-msgstr ""
-"Direct nadat de bovenstaande wijzigingen zijn bewaard zal u merken dat de "
-"kleur van de lijn veranderd naar blauw, wat betekend dat de dienst nu "
-"gefactureerd kan worden. Tegelijkertijd veranderd de status van de SO van "
-"**Niets om te factureren** naar **Te factureren**"
-
-#: ../../sales/invoicing/services/milestones.rst:104
-msgid ""
-"Click on **Create invoice** and, in the new window that pops up, select "
-"**Invoiceable lines** and validate. It will create a new invoice (in draft "
-"status) with only the **strategy audit** product as invoiceable."
-msgstr ""
-"Klik op **Factuur aanmaken** en, in het nieuwe venster dat als pop-up "
-"verschijnt, selecteert u **Factureerbare lijnen** en valideert u. Het maakt "
-"een nieuw factuur (in de concept fase) met enkel het **strategie controle** "
-"product als factureerbaar."
-
-#: ../../sales/invoicing/services/milestones.rst:112
-msgid ""
-"In order to be able to invoice a product, you need to set up the "
-"**Accounting** application and to configure an accounting journal and a "
-"chart of account. Click on the following link to learn more: "
-":doc:`../../../accounting/overview/getting_started/setup`"
-msgstr ""
-"Om een product te kunnen factureren moet u de **Boekhouding** applicatie "
-"opzetten en een grootboekschema en rekening dagboek instellen. Klik op de "
-"volgende link om meer te leren: "
-":doc:`../../../accounting/overview/getting_started/setup`"
-
-#: ../../sales/invoicing/services/milestones.rst:117
-msgid ""
-"Back on your sale order, you will notice that the **Invoiced** column of "
-"your order line has been updated accordingly and that the **Invoice Status**"
-" is back to **Nothing to Invoice**."
-msgstr ""
-"Terug naar uw verkooporder, u zal opmerken dat de **gefactureerde** kolom "
-"van uw orderlijn geüpdatet is en dat de **Factuur status** terug is gezet "
-"naar **Niets te factureren**."
-
-#: ../../sales/invoicing/services/milestones.rst:121
-msgid "Follow the same workflow to invoice your remaining milestones."
-msgstr "Volg dezelfde werkflow om uw resterende mijlpalen te factureren."
-
-#: ../../sales/invoicing/services/milestones.rst:124
-msgid ":doc:`reinvoice`"
-msgstr ":doc:`reinvoice`"
-
-#: ../../sales/invoicing/services/milestones.rst:125
-#: ../../sales/invoicing/services/reinvoice.rst:185
-msgid ":doc:`support`"
-msgstr ":doc:`support`"
-
-#: ../../sales/invoicing/services/reinvoice.rst:3
-msgid "How to re-invoice expenses to your customers?"
-msgstr "Hoe her-factureer ik uitgaven naar mijn klanten?"
-
-#: ../../sales/invoicing/services/reinvoice.rst:5
+#: ../../sales/invoicing/expense.rst:5
 msgid ""
 "It often happens that your employees have to spend their personal money "
 "while working on a project for your client. Let's take the example of an "
-"employee paying a parking spot for a meeting with your client. As a company,"
+"consultant paying an hotel to work on the site of your client. As a company,"
 " you would like to be able to invoice that expense to your client."
 msgstr ""
-"Het gebeurd vaak dat uw werknemers hun persoonlijk geld moeten gebruiken "
-"terwijl ze werken aan een project bij een klant. Laten we het voorbeeld "
-"nemen van een werknemer die betaald voor een parkeerplaats voor een meeting "
-"bij de klant. Als bedrijf wilt u de kost aan uw klant factureren."
 
-#: ../../sales/invoicing/services/reinvoice.rst:11
+#: ../../sales/invoicing/expense.rst:12
+#: ../../sales/invoicing/time_materials.rst:64
+msgid "Expenses configuration"
+msgstr ""
+
+#: ../../sales/invoicing/expense.rst:14
+#: ../../sales/invoicing/time_materials.rst:66
 msgid ""
-"In this documentation we will see two use cases. The first, very basic, "
-"consists of invoicing a simple expense to your client like you would do for "
-"a product. The second, more advanced, will consist of invoicing expenses "
-"entered in your expense system by your employees directly to your customer."
+"To track & invoice expenses, you will need the expenses app. Go to "
+":menuselection:`Apps --> Expenses` to install it."
 msgstr ""
-"In deze documentatie zien we twee usecases. De eerste, heel basis, bestaat "
-"uit het factureren van een simpele kost voor uw klant zoals u zou doen voor "
-"een product. De tweede, meer geavanceerd, bestaat uit factureerbare kosten "
-"ingegeven in uw kosten systeem door werknemers die rechtstreeks van uw klant"
-" komen."
 
-#: ../../sales/invoicing/services/reinvoice.rst:18
-msgid "Use case 1: Simple expense invoicing"
-msgstr "Scenario 1: simpele declaratie facturatie"
-
-#: ../../sales/invoicing/services/reinvoice.rst:20
+#: ../../sales/invoicing/expense.rst:17
+#: ../../sales/invoicing/time_materials.rst:69
 msgid ""
-"Let's take the following example. You are working on a promotion campaign "
-"for one of your customers (``Agrolait``) and you have to print a lot of "
-"copies. Those copies are an expense for your company and you would like to "
-"invoice them."
+"You should also activate the analytic accounts feature to link expenses to "
+"the sales order, to do so, go to :menuselection:`Invoicing --> Configuration"
+" --> Settings` and activate *Analytic Accounting*."
 msgstr ""
-"Laten we het volgende voorbeeld nemen. U werkt aan een promotiecampagne voor"
-" één van uw klanten (``Agrolait``) en u moet veel kopieën printen. Deze "
-"kopieën zijn duur voor uw bedrijf en u wilt ze factureren."
 
-#: ../../sales/invoicing/services/reinvoice.rst:35
-msgid "Create product to be expensed"
-msgstr "Maak een product om te declareren"
+#: ../../sales/invoicing/expense.rst:22
+#: ../../sales/invoicing/time_materials.rst:74
+msgid "Add expenses to your sales order"
+msgstr ""
 
-#: ../../sales/invoicing/services/reinvoice.rst:37
-msgid "You will need now to create a product called ``Copies``."
-msgstr "U moet nu een product aanmaken genaamd ``Kopieën``."
-
-#: ../../sales/invoicing/services/reinvoice.rst:39
-#: ../../sales/invoicing/services/reinvoice.rst:112
+#: ../../sales/invoicing/expense.rst:24
+#: ../../sales/invoicing/time_materials.rst:76
 msgid ""
-"From your **Sales** module, go to :menuselection:`Sales --> Products` and "
-"create a product as follows:"
+"From the expense app, you or your consultant can create a new one, e.g. the "
+"hotel for the first week on the site of your customer."
 msgstr ""
-"Vanuit uw **Verkopen** module gaat u naar :menuselection:`Verkopen --> "
-"Producten` en maakt u als volgt een product aan: "
 
-#: ../../sales/invoicing/services/reinvoice.rst:42
-msgid "**Product type**: consumable"
-msgstr "**Productsoort**: Verbruik"
-
-#: ../../sales/invoicing/services/reinvoice.rst:44
+#: ../../sales/invoicing/expense.rst:27
+#: ../../sales/invoicing/time_materials.rst:79
 msgid ""
-"**Invoicing policy**: on delivered quantities (you will manually set the "
-"quantities to invoice on the sale order)"
+"You can then enter a relevant description and select an existing product or "
+"create a new one from right there."
 msgstr ""
-"**Facturatiebeleid**: op geleverde hoeveelheden (u geeft manueel de "
-"aantallen in op het verkooporder die gefactureerd moeten worden)"
 
-#: ../../sales/invoicing/services/reinvoice.rst:51
-msgid "Create a sale order"
-msgstr "Maak een verkooporder"
+#: ../../sales/invoicing/expense.rst:33
+#: ../../sales/invoicing/time_materials.rst:85
+msgid "Here, we are creating a *Hotel* product:"
+msgstr ""
 
-#: ../../sales/invoicing/services/reinvoice.rst:53
+#: ../../sales/invoicing/expense.rst:38
 msgid ""
-"Now that your product is correctly set up, you can create a sale order for "
-"that product (from the menu :menuselection:`Sales --> Sales Orders`) with "
-"the ordered quantities set to 0. Click on **Confirm the Sale** to create the"
-" sale order. You will be able then to manually change the delivered "
-"quantities on the sale order to reinvoice the copies to your customer."
+"Under the invoicing tab, select *Delivered quantities* and either *At cost* "
+"or *Sales price* as well depending if you want to invoice the cost of your "
+"expense or a previously agreed on sales price."
 msgstr ""
-"Nu dat uw product correct is opgezet kan u een verkooporder aanmaken voor "
-"dit product (vanuit het menu :menuselection:`Verkopen --> Verkooporders`) "
-"met de bestelde hoeveelheid ingesteld op 0. Klik op **Verkoop bevestigen** "
-"om het verkooporder aan te maken. U kan vervolgens manueel de geleverde "
-"hoeveelheid wijzigen op het verkooporder om de kopieën te factureren aan uw "
-"klant."
 
-#: ../../sales/invoicing/services/reinvoice.rst:64
-#: ../../sales/invoicing/services/reinvoice.rst:177
-msgid "Invoice expense to your client"
-msgstr "Factureer uitgaven naar uw cliënt"
-
-#: ../../sales/invoicing/services/reinvoice.rst:66
+#: ../../sales/invoicing/expense.rst:45
+#: ../../sales/invoicing/time_materials.rst:97
 msgid ""
-"At the end of the month, you have printed ``1000`` copies on behalf of your "
-"client and you want to re-invoice them. From the related sale order, click "
-"on **Delivered Quantities**, manually enter the correct amount of copies and"
-" click on **Save**. Your order line will turn blue, meaning that it is ready"
-" to be invoiced. Click on **Create invoice**."
+"To modify or create more products go to :menuselection:`Expenses --> "
+"Configuration --> Expense products`."
 msgstr ""
-"Aan het einde van de maand heeft u ``1000`` kopieën aangemaakt voor uw "
-"cliënt en u wilt deze nu door factureren. Vanuit het gerelateerde "
-"verkooporder klikt u op **Geleverde hoeveelheden**, geeft u manueel het "
-"aantal kopieën in en vervolgens klikt u op **Opslaan**. Uw orderlijn wordt "
-"blauw, wat betekend dat deze klaar is om te factureren. Klik op **Maak "
-"factuur**."
 
-#: ../../sales/invoicing/services/reinvoice.rst:73
+#: ../../sales/invoicing/expense.rst:48
+#: ../../sales/invoicing/time_materials.rst:100
 msgid ""
-"The total amount on your sale order will be of 0 as it is computed on the "
-"ordered quantities. It is your invoice which will compute the correct amount"
-" due by your customer."
+"Back on the expense, add the original sale order in the expense to submit."
 msgstr ""
-"Het totale bedrag van uw verkooporder zal 0 zijn aangezien het berekend is "
-"op de bestelde hoeveelheid. Het is uw factuur die het correcte bedrag "
-"berekend dat uw klant u verschuldigd is."
 
-#: ../../sales/invoicing/services/reinvoice.rst:77
+#: ../../sales/invoicing/expense.rst:54
+#: ../../sales/invoicing/time_materials.rst:106
+msgid "It can then be submitted to the manager, approved and finally posted."
+msgstr ""
+
+#: ../../sales/invoicing/expense.rst:65
+#: ../../sales/invoicing/time_materials.rst:117
+msgid "It will then be in the sales order and ready to be invoiced."
+msgstr ""
+
+#: ../../sales/invoicing/invoicing_policy.rst:3
+msgid "Invoice based on delivered or ordered quantities"
+msgstr ""
+
+#: ../../sales/invoicing/invoicing_policy.rst:5
 msgid ""
-"The invoice generated is in draft, so you can always control the quantities "
-"and change the amount if needed. You will notice that the amount to be "
-"invoiced is based here on the delivered quantities."
+"Depending on your business and what you sell, you have two options for "
+"invoicing:"
 msgstr ""
-"De gegenereerde factuur is in concept, zodat u altijd de hoeveelheden kan "
-"controleren en wijzigen indien nodig. U zal opmerken dat het gefactureerde "
-"bedrag hier gebaseerd is op de geleverde goederen."
 
-#: ../../sales/invoicing/services/reinvoice.rst:84
-msgid "Click on validate to issue the payment to your customer."
-msgstr "Klik op valideren om de betaling door te geven aan uw klant."
-
-#: ../../sales/invoicing/services/reinvoice.rst:87
-msgid "Use case 2: Invoice expenses via the expense module"
-msgstr "Scenario 2: Facturatie van declaratie via de declaratie module"
-
-#: ../../sales/invoicing/services/reinvoice.rst:89
+#: ../../sales/invoicing/invoicing_policy.rst:8
 msgid ""
-"To illustrate this case, let's imagine that your company sells some "
-"consultancy service to your customer ``Agrolait`` and both parties agreed "
-"that the distance covered by your consultant will be re-invoiced at cost."
+"Invoice on ordered quantity: invoice the full order as soon as the sales "
+"order is confirmed."
 msgstr ""
-"Om dit scenario te demonstreren beelden we ons in dat uw bedrijf consultancy"
-" diensten verkoopt aan uw klant ``Agrolait`` en dat beide partijen akkoord "
-"gaan dat de afgelegde afstand door uw consultant als kost wordt "
-"gefactureerd."
 
-#: ../../sales/invoicing/services/reinvoice.rst:97
-msgid "Here, you will need to install two more modules:"
-msgstr "Hier moet u twee extra modules installeren:"
-
-#: ../../sales/invoicing/services/reinvoice.rst:99
-msgid "Expense Tracker"
-msgstr "Beheer declaraties"
-
-#: ../../sales/invoicing/services/reinvoice.rst:101
+#: ../../sales/invoicing/invoicing_policy.rst:10
 msgid ""
-"Accounting, where you will need to activate the analytic accounting from the"
-" settings"
+"Invoice on delivered quantity: invoice on what you delivered even if it's a "
+"partial delivery."
 msgstr ""
-"Boekhouding, waar u de analytische boekhouding moet activeren vanuit de "
-"instellingen"
 
-#: ../../sales/invoicing/services/reinvoice.rst:108
-msgid "Create a product to be expensed"
-msgstr "Maak een product om te declareren"
+#: ../../sales/invoicing/invoicing_policy.rst:13
+msgid "Invoice on ordered quantity is the default mode."
+msgstr ""
 
-#: ../../sales/invoicing/services/reinvoice.rst:110
-msgid "You will now need to create a product called ``Kilometers``."
-msgstr "U moet nu een product aanmaken genaamd ``Kilometers``."
-
-#: ../../sales/invoicing/services/reinvoice.rst:115
-msgid "Product can be expensed"
-msgstr "Product kan gedeclareerd worden"
-
-#: ../../sales/invoicing/services/reinvoice.rst:117
-msgid "Product type: Service"
-msgstr "Productsoort: Dienst"
-
-#: ../../sales/invoicing/services/reinvoice.rst:119
-msgid "Invoicing policy: invoice based on time and material"
-msgstr "Facturatie beleid: factuur gebaseerd op tijd en materiaal"
-
-#: ../../sales/invoicing/services/reinvoice.rst:121
-msgid "Expense invoicing policy: At cost"
-msgstr "Declaratie facturatie beleid: Op kosten"
-
-#: ../../sales/invoicing/services/reinvoice.rst:123
-msgid "Track service: manually set quantities on order"
-msgstr "Traceer dienst: stel hoeveelheden op order manueel in"
-
-#: ../../sales/invoicing/services/reinvoice.rst:129
-msgid "Create a sales order"
-msgstr "Maak een verkooporder"
-
-#: ../../sales/invoicing/services/reinvoice.rst:131
+#: ../../sales/invoicing/invoicing_policy.rst:15
 msgid ""
-"Still from the Sales module, go to :menuselection:`Sales --> Sales Orders` "
-"and add your product **Consultancy** on the order line."
+"The benefits of using *Invoice on delivered quantity* depends on your type "
+"of business, when you sell material, liquids or food in large quantities the"
+" quantity might diverge a little bit and it is therefore better to invoice "
+"the actual delivered quantity."
 msgstr ""
-"Nog steeds vanuit de Verkopen module gaat u naar  :menuselection:`Verkopen "
-"--> Verkooporders` en voegt u uw product **Consultancy** toe aan het "
-"orderlijn."
 
-#: ../../sales/invoicing/services/reinvoice.rst:135
+#: ../../sales/invoicing/invoicing_policy.rst:21
 msgid ""
-"If your product doesn't exist yet, you can configure it on the fly from the "
-"SO. Just type the name on the **product** field and click on **Create and "
-"edit** to configure it."
+"You also have the ability to invoice manually, letting you control every "
+"options: invoice ready to invoice lines, invoice a percentage (advance), "
+"invoice a fixed advance."
 msgstr ""
-"Indien uw product nog niet bestaat kan u het direct aanmaken vanuit de SO. "
-"Type gewoon de naam in op het **product** veld en klik op **Aanmaken en "
-"wijzigen** om het te configureren."
 
-#: ../../sales/invoicing/services/reinvoice.rst:139
+#: ../../sales/invoicing/invoicing_policy.rst:26
+msgid "Decide the policy on a product page"
+msgstr ""
+
+#: ../../sales/invoicing/invoicing_policy.rst:28
 msgid ""
-"Depending on your product configuration, an **Analytic Account** may have "
-"been generated automatically. If not, you can easily create one in order to "
-"link your expenses to the sale order. Do not forget to confirm the sale "
-"order."
+"From any products page, under the invoicing tab you will find the invoicing "
+"policy and select the one you want."
 msgstr ""
-"Afhankelijk van uw product configuratie is er mogelijk automatisch een "
-"**Analytische rekening** aangemaakt. Indien dit niet zo is kan u er "
-"gemakkelijk één aanmaken om uw uitgaven te linken aan het verkooporder. "
-"Vergeet niet uw verkooporder te bevestigen."
 
-#: ../../sales/invoicing/services/reinvoice.rst:148
+#: ../../sales/invoicing/invoicing_policy.rst:35
+msgid "Send the invoice"
+msgstr ""
+
+#: ../../sales/invoicing/invoicing_policy.rst:37
 msgid ""
-"Refer to the documentation :doc:`../../../accounting/others/analytic/usage` "
-"to learn more about that concept."
+"Once you confirm the sale, you can see your delivered and invoiced "
+"quantities."
 msgstr ""
-"Lees de documentatie :doc:`../../../accounting/others/analytic/usage` om "
-"meer te leren over dit concept."
 
-#: ../../sales/invoicing/services/reinvoice.rst:152
-msgid "Create expense and link it to SO"
-msgstr "Maak uitgaven en link het aan een SO"
-
-#: ../../sales/invoicing/services/reinvoice.rst:154
+#: ../../sales/invoicing/invoicing_policy.rst:43
 msgid ""
-"Let's assume that your consultant covered ``1.000km`` in October as part of "
-"his consultancy project. We will create a expense for it and link it to the "
-"related sales order thanks to the analytic account."
+"If you set it in ordered quantities, you can invoice as soon as the sale is "
+"confirmed. If however you selected delivered quantities, you will first have"
+" to validate the delivery."
 msgstr ""
-"Laten we er vanuit gaan dat uw consultant ``1.000km`` heeft afgelegd in "
-"oktober als onderdeel van zijn consultancy project. We maken een uitgave "
-"hiervoor en linken het aan het gerelateerde verkooporder dankzij de "
-"analytische rekening."
 
-#: ../../sales/invoicing/services/reinvoice.rst:158
+#: ../../sales/invoicing/invoicing_policy.rst:47
 msgid ""
-"Go to the **Expenses** module and click on **Create**. Record your expense "
-"as follows:"
+"Once the products are delivered, you can invoice your customer. Odoo will "
+"automatically add the quantities to invoiced based on how many you delivered"
+" if you did a partial delivery."
 msgstr ""
-"Ga naar de **Verkopen** module en klik op **Aanmaken**. Maak uw declaratie "
-"als volgt aan:"
 
-#: ../../sales/invoicing/services/reinvoice.rst:161
-msgid "**Expense description**: Kilometers October 2015"
-msgstr "**Uitgave omschrijving**: Kilometers October 2015"
+#: ../../sales/invoicing/milestone.rst:3
+msgid "Invoice project milestones"
+msgstr ""
 
-#: ../../sales/invoicing/services/reinvoice.rst:163
-msgid "**Product**: Kilometers"
-msgstr "**Product**: Kilometers"
-
-#: ../../sales/invoicing/services/reinvoice.rst:165
-msgid "**Quantity**: 1.000"
-msgstr "**Hoeveelheid**: 1.000"
-
-#: ../../sales/invoicing/services/reinvoice.rst:167
-msgid "**Analytic account**: SO0019 - Agrolait"
-msgstr "**Analytische rekening**: SO0019 - Agrolait"
-
-#: ../../sales/invoicing/services/reinvoice.rst:172
+#: ../../sales/invoicing/milestone.rst:5
 msgid ""
-"Click on **Submit to manager**. As soon as the expense has been validated "
-"and posted to the journal entries, a new line corresponding to the expense "
-"will automatically be generated on the sale order."
+"Milestone invoicing can be used for expensive or large-scale projects, with "
+"each milestone representing a clear sequence of work that will incrementally"
+" build up to the completion of the contract. This invoicing method is "
+"comfortable both for the company which is ensured to get a steady cash flow "
+"throughout the project lifetime and for the client who can monitor the "
+"project's progress and pay in several installments."
 msgstr ""
-"Klik op **Indienen bij manager**. Nadat de kost gevalideerd is en geboekt is"
-" op het dagboek wordt er automatisch een nieuwe lijn aangemaakt op de "
-"verkooporder die overeenkomt met de kost."
 
-#: ../../sales/invoicing/services/reinvoice.rst:179
-msgid "You can now invoice the invoiceable lines to your customer."
-msgstr "U kan nu de factureerbare lijnen factureren naar uw klant."
+#: ../../sales/invoicing/milestone.rst:13
+msgid "Create milestone products"
+msgstr ""
 
-#: ../../sales/invoicing/services/reinvoice.rst:186
-msgid ":doc:`milestones`"
-msgstr ":doc:`milestones`"
-
-#: ../../sales/invoicing/services/support.rst:3
-msgid "How to invoice a support contract (prepaid hours)?"
-msgstr "Hoe factureer ik een ondersteuningscontract (prepaid uren)?"
-
-#: ../../sales/invoicing/services/support.rst:5
+#: ../../sales/invoicing/milestone.rst:15
 msgid ""
-"There are different kinds of service sales: prepaid volume of hours/days "
-"(e.g. support contract), billing based on time and material (e.g. billing "
-"consulting hours) and a fixed price contract (e.g. a project)."
+"In Odoo, each milestone of your project is considered as a product. To "
+"configure products to work this way, go to any product form."
 msgstr ""
-"Er zijn verschillende soorten van verkoopbare diensten: prepaid volumes of "
-"uren/dagen (bijvoorbeeld ondersteuningscontract), facturatie gebaseerd op "
-"tijd en materiaal (bijvoorbeeld consultancy uren) en een vaste prijs "
-"contract (bijvoorbeeld een project)."
 
-#: ../../sales/invoicing/services/support.rst:9
+#: ../../sales/invoicing/milestone.rst:18
 msgid ""
-"In this section, we will have a look at how to sell and keep track of a pre-"
-"paid support contract."
+"You have to set the product type as *Service* under general information and "
+"select *Milestones* in the sales tab."
 msgstr ""
-"In deze sectie kijken we naar hoe een prepaid ondersteuningscontract te "
-"verkopen en op te volgen."
 
-#: ../../sales/invoicing/services/support.rst:12
+#: ../../sales/invoicing/milestone.rst:25
+msgid "Invoice milestones"
+msgstr "Factureer mijlpalen"
+
+#: ../../sales/invoicing/milestone.rst:27
 msgid ""
-"As an example, you may sell a pack of ``50 Hours`` of support at "
-"``$25,000``. The price is fixed and charged initially. But you want to keep "
-"track of the support service you did for the customer."
+"From the sales order, you can manually edit the quantity delivered as you "
+"complete a milestone."
 msgstr ""
-"Als een voorbeeld heeft u mogelijk een pak van ``50 uren`` ondersteuning aan"
-" ``$25,000``. De prijs is vast en wordt op voorhand aangerekend. Maar u wilt"
-" de ondersteuning die u voor de klant doet opvolgen."
 
-#: ../../sales/invoicing/services/support.rst:20
-msgid "Install the Sales and Timesheet applications"
-msgstr "Installeer de Verkoop en Urenstaten applicaties"
+#: ../../sales/invoicing/milestone.rst:33
+msgid "You can then invoice that first milestone."
+msgstr ""
 
-#: ../../sales/invoicing/services/support.rst:22
+#: ../../sales/invoicing/proforma.rst:3 ../../sales/invoicing/proforma.rst:22
+msgid "Send a pro-forma invoice"
+msgstr ""
+
+#: ../../sales/invoicing/proforma.rst:5
 msgid ""
-"In order to sell services, you need to install the **Sales** application, "
-"from the **Apps** icon. Install also the **Timesheets** application if you "
-"want to track support services you worked on every contract."
+"A pro-forma invoice is an abridged or estimated invoice in advance of a "
+"delivery of goods. It notes the kind and quantity of goods, their value, and"
+" other important information such as weight and transportation charges. Pro-"
+"forma invoices are commonly used as preliminary invoices with a quotation, "
+"or for customs purposes in importation. They differ from a normal invoice in"
+" not being a demand or request for payment."
 msgstr ""
-"Om diensten te verkopen moet u de **Verkopen** applicatie installeren vanuit"
-" het **Apps** icoon. Installeer ook de **Urenstaten** applicatie als u "
-"ondersteunende diensten wilt opvolgen voor elk contract waarvoor u heeft "
-"gewerkt."
 
-#: ../../sales/invoicing/services/support.rst:33
-msgid "Create Products"
-msgstr "Maak producten"
+#: ../../sales/invoicing/proforma.rst:13
+#: ../../sales/send_quotations/different_addresses.rst:10
+msgid "Activate the feature"
+msgstr ""
 
-#: ../../sales/invoicing/services/support.rst:35
+#: ../../sales/invoicing/proforma.rst:15
 msgid ""
-"By default, products are sold by number of units. In order to sell services "
-"``per hour``, you must allow using multiple unit of measures. From the "
-"**Sales** application, go to the menu :menuselection:`Configuration --> "
-"Settings`. From this screen, activate the multiple **Unit of Measures** "
-"option."
+"Go to :menuselection:`SALES --> Configuration --> Settings` and activate the"
+" *Pro-Forma Invoice* feature."
 msgstr ""
-"Standaard worden producten verkocht op aantal eenheden. Om diensten te "
-"verkopen ``per uur``, moet u het gebruik van meerdere maateenheden toestaan."
-" Ga naar het menu :menuselection:`Configuratie --> Instellingen` in de "
-"**Verkopen** installatie. Vanuit dit scherm activeert u de optie meerdere "
-"**maateenheden**."
 
-#: ../../sales/invoicing/services/support.rst:44
+#: ../../sales/invoicing/proforma.rst:24
 msgid ""
-"In order to sell a support contract, you must create a product for every "
-"support contract you sell. From the **Sales** application, use the menu "
-":menuselection:`Sales --> Products`, create a new product with the following"
-" setup:"
+"From any quotation or sales order, you know have an option to send a pro-"
+"forma invoice."
 msgstr ""
-"Om een ondersteuningscontract te verkopen moet u een product aanmaken voor "
-"elk ondersteuningscontract dat u verkoopt. Vanuit de **Verkopen** applicatie"
-" gaat u naar het menu  :menuselection:`Verkopen --> Producten` en maakt u "
-"een nieuw product aan met de volgende opzet:"
 
-#: ../../sales/invoicing/services/support.rst:48
-msgid "**Name**: Technical Support"
-msgstr "**Naam*: Technische Ondersteuning"
-
-#: ../../sales/invoicing/services/support.rst:52
-msgid "**Unit of Measure**: Hours"
-msgstr "**Maateenheid**: Uren"
-
-#: ../../sales/invoicing/services/support.rst:54
+#: ../../sales/invoicing/proforma.rst:30
 msgid ""
-"**Invoicing Policy**: Ordered Quantities, since the service is prepaid, we "
-"will invoice the service based on what has been ordered, not based on "
-"delivered quantities."
+"When you click on send, Odoo will send an email with the pro-forma invoice "
+"in attachment."
 msgstr ""
-"**Facturatiebeleid**: Bestelde hoeveelheden, omdat de dienst prepaid is, we "
-"factureren de dienst gebaseerd op wat besteld is, niet gebaseerd op "
-"geleverde goederen."
 
-#: ../../sales/invoicing/services/support.rst:58
+#: ../../sales/invoicing/subscriptions.rst:3
+msgid "Sell subscriptions"
+msgstr ""
+
+#: ../../sales/invoicing/subscriptions.rst:5
 msgid ""
-"**Track Service**: Timesheet on contracts. An analytic account will "
-"automatically be created for every order containing this service so that you"
-" can track hours in the related account."
+"Selling subscription products will give you predictable revenue, making "
+"planning ahead much easier."
 msgstr ""
-"**Traceer dienst**: Urenstaten op contracten. Een analytische rekening wordt"
-" automatisch aangemaakt voor elke order die deze dienst bevat zodat u de "
-"uren op de gerelateerde rekening kan opvolgen."
 
-#: ../../sales/invoicing/services/support.rst:66
+#: ../../sales/invoicing/subscriptions.rst:9
+msgid "Make a subscription from a sales order"
+msgstr ""
+
+#: ../../sales/invoicing/subscriptions.rst:11
 msgid ""
-"There are different ways to track the service related to a sales order or "
-"product sold. With the above configuration, you can only sell one support "
-"contract per order. If your customer orders several service contracts on "
-"timesheet, you will have to split the quotation into several orders."
+"From the sales app, create a quotation to the desired customer, and select "
+"the subscription product your previously created."
 msgstr ""
 
-#: ../../sales/invoicing/services/support.rst:72
+#: ../../sales/invoicing/subscriptions.rst:14
 msgid ""
-"Note that you can sell in different unit of measure than hours, example: "
-"days, pack of 40h, etc. To do that, just create a new unit of measure in the"
-" **Unit of Measure** category and set a conversion ratio compared to "
-"**Hours** (example: ``1 day = 8 hours``)."
+"When you confirm the sale the subscription will be created automatically. "
+"You will see a direct link from the sales order to the Subscription in the "
+"upper right corner."
 msgstr ""
-"Merk op dat u kan verkopen in andere eenheden dan uren, bijvoorbeeld: dagen,"
-" pak van 40u, etc. Om dit te doen maakt u een nieuwe maateenheid in de "
-"**Maateenheid** categorie en stelt u een conversie ratio in vergeleken met "
-"**Uren** (bijvoorbeeld: ``1 dag = 8 uren``)."
 
-#: ../../sales/invoicing/services/support.rst:78
-msgid "Managing support contract"
-msgstr "Ondersteuningscontract beheren"
+#: ../../sales/invoicing/time_materials.rst:3
+msgid "Invoice based on time and materials"
+msgstr ""
 
-#: ../../sales/invoicing/services/support.rst:81
-msgid "Quotations and Sales Orders"
-msgstr "Offertes en verkooporders"
-
-#: ../../sales/invoicing/services/support.rst:83
+#: ../../sales/invoicing/time_materials.rst:5
 msgid ""
-"Once the product is created, you can create a quotation or a sales order "
-"with the related product. Once the quotation is confirmed and transformed "
-"into a sales order, your users will be able to record services related to "
-"this support contract using the timesheet application."
+"Time and Materials is generally used in projects in which it is not possible"
+" to accurately estimate the size of the project, or when it is expected that"
+" the project requirements would most likely change."
 msgstr ""
 
-#: ../../sales/invoicing/services/support.rst:93
-msgid "Timesheets"
-msgstr "Urenstaten"
-
-#: ../../sales/invoicing/services/support.rst:95
+#: ../../sales/invoicing/time_materials.rst:9
 msgid ""
-"To track the service you do on a specific contract, you should use the "
-"timesheet application. An analytic account related to the sale order has "
-"been automatically created (``SO009 - Agrolait`` on the screenshot here "
-"above), so you can start tracking services as soon as it has been sold."
-msgstr ""
-"Om de dienst op te volgen die u doet voor een specifiek contract moet u de "
-"urenstaten applicatie gebruiken. Een analytische rekening gerelateerd aan de"
-" verkooporder werd automatisch gegenereerd (``SO009 - Agrolait`` op de "
-"bovenstaande screenshot), zodat u kan starten met het opvolgen van diensten "
-"vanaf ze verkocht zijn."
-
-#: ../../sales/invoicing/services/support.rst:104
-msgid "Control delivered support on the sales order"
+"This is opposed to a fixed-price contract in which the owner agrees to pay "
+"the contractor a lump sum for the fulfillment of the contract no matter what"
+" the contractors pay their employees, sub-contractors, and suppliers."
 msgstr ""
 
-#: ../../sales/invoicing/services/support.rst:106
+#: ../../sales/invoicing/time_materials.rst:14
 msgid ""
-"From the **Sales** application, use the menu :menuselection:`Sales --> Sales"
-" Orders`  to control the progress of every order. On the sales order line "
-"related to the support contract, you should see the **Delivered Quantities**"
-" that are updated automatically, based on the number of hours in the "
-"timesheet."
+"For this documentation I will use the example of a consultant, you will need"
+" to invoice their time, their various expenses (transport, lodging, ...) and"
+" purchases."
 msgstr ""
-"Vanuit de **Verkopen** applicatie gebruikt u het menu "
-":menuselection:`Verkopen --> Verkooporders` om de voortgang van elke order "
-"te beheersen. Op het verkooporderlijn gerelateerd aan het "
-"ondersteuningscontract zou u de **Geleverde hoeveelheid** moeten zien die "
-"automatisch geüpdatet is, gebaseerd op het aantal uren van uw urenstaten."
 
-#: ../../sales/invoicing/services/support.rst:116
-msgid "Upselling and renewal"
-msgstr "Upselling en vernieuwing"
+#: ../../sales/invoicing/time_materials.rst:19
+msgid "Invoice time configuration"
+msgstr ""
 
-#: ../../sales/invoicing/services/support.rst:118
+#: ../../sales/invoicing/time_materials.rst:21
 msgid ""
-"If the number of hours you performed on the support contract is bigger or "
-"equal to the number of hours the customer purchased, you are suggested to "
-"sell an extra contract to the customer since they used all their quota of "
-"service. Periodically (ideally once every two weeks), you should check the "
-"sales order that are in such a case. To do so, go to :menuselection:`Sales "
-"--> Invoicing --> Orders to Upsell`."
+"To keep track of progress in the project, you will need the *Project* app. "
+"Go to :menuselection:`Apps --> Project` to install it."
 msgstr ""
 
-#: ../../sales/invoicing/services/support.rst:127
+#: ../../sales/invoicing/time_materials.rst:24
 msgid ""
-"If you use Odoo CRM, a good practice is to create an opportunity for every "
-"sale order in upselling invoice status so that you easily track your "
-"upselling effort."
+"In *Project* you will use timesheets, to do so go to :menuselection:`Project"
+" --> Configuration --> Settings` and activate the *Timesheets* feature."
 msgstr ""
-"Indien u de Odoo CRM gebruikt is het de goede gewoon om een opportuniteit "
-"aan te maken voor elke verkooporder in de factuurstatus zodat u gemakkelijk "
-"uw upselling kan traceren."
 
-#: ../../sales/invoicing/services/support.rst:131
+#: ../../sales/invoicing/time_materials.rst:32
+msgid "Invoice your time spent"
+msgstr ""
+
+#: ../../sales/invoicing/time_materials.rst:34
 msgid ""
-"If you sell an extra support contract, you can either add a new line on the "
-"existing sales order (thus, you continue to timesheet on the same order) or "
-"create a new order (thus, people will timesheet their hours on the new "
-"contract). To unmark the sales order as **Upselling**, you can set the sales"
-" order as done and it will disappear from your upselling list."
+"From a product page set as a service, you will find two options under the "
+"invoicing tab, select both *Timesheets on tasks* and *Create a task in a new"
+" project*."
 msgstr ""
 
-#: ../../sales/invoicing/services/support.rst:138
-msgid "Special Configuration"
-msgstr "Speciale configuratie"
+#: ../../sales/invoicing/time_materials.rst:41
+msgid "You could also add the task to an existing project."
+msgstr ""
 
-#: ../../sales/invoicing/services/support.rst:140
+#: ../../sales/invoicing/time_materials.rst:43
 msgid ""
-"When creating the product form, you may set a different approach to track "
-"the service:"
+"Once confirming a sales order, you will now see two new buttons, one for the"
+" project overview and one for the current task."
 msgstr ""
-"Wanneer u het productformulier aanmaakt kan u een andere aanpak instellen om"
-" de dienst op te volgen:"
 
-#: ../../sales/invoicing/services/support.rst:143
+#: ../../sales/invoicing/time_materials.rst:49
 msgid ""
-"**Create task and track hours**: in this mode, a task is created for every "
-"sales order line. Then when you do the timesheet, you don't record hours on "
-"a sales order/contract, but you record hours on a task (that represents the "
-"contract). The advantage of this solution is that it allows to sell several "
-"service contracts within the same sales order."
+"You will directly be in the task if you click on it, you can also access it "
+"from the *Project* app."
 msgstr ""
 
-#: ../../sales/invoicing/services/support.rst:150
+#: ../../sales/invoicing/time_materials.rst:52
 msgid ""
-"**Manually**: you can use this mode if you don't record timesheets in Odoo. "
-"The number of hours you worked on a specific contract can be recorded "
-"manually on the sales order line directly, in the delivered quantity field."
+"Under timesheets, you can assign who works on it. You can or they can add "
+"how many hours they worked on the project so far."
 msgstr ""
 
-#: ../../sales/invoicing/services/support.rst:156
-msgid ":doc:`../../../inventory/settings/products/uom`"
-msgstr ":doc:`../../../inventory/settings/products/uom`"
+#: ../../sales/invoicing/time_materials.rst:58
+msgid "From the sales order, you can then invoice those hours."
+msgstr ""
+
+#: ../../sales/invoicing/time_materials.rst:90
+msgid ""
+"under the invoicing tab, select *Delivered quantities* and either *At cost* "
+"or *Sales price* as well depending if you want to invoice the cost of your "
+"expense or a previously agreed on sales price."
+msgstr ""
+
+#: ../../sales/invoicing/time_materials.rst:120
+msgid "Invoice purchases"
+msgstr ""
+
+#: ../../sales/invoicing/time_materials.rst:122
+msgid ""
+"The last thing you might need to add to the sale order is purchases made for"
+" it."
+msgstr ""
+
+#: ../../sales/invoicing/time_materials.rst:125
+msgid ""
+"You will need the *Purchase Analytics* feature, to activate it, go to "
+":menuselection:`Invoicing --> Configuration --> Settings` and select "
+"*Purchase Analytics*."
+msgstr ""
+
+#: ../../sales/invoicing/time_materials.rst:129
+msgid ""
+"While making the purchase order don't forget to add the right analytic "
+"account."
+msgstr ""
+
+#: ../../sales/invoicing/time_materials.rst:135
+msgid ""
+"Once the PO is confirmed and received, you can create the vendor bill, this "
+"will automatically add it to the SO where you can invoice it."
+msgstr ""
 
 #: ../../sales/products_prices.rst:3
 msgid "Products & Prices"
@@ -1427,7 +1080,7 @@ msgstr ""
 
 #: ../../sales/products_prices/taxes.rst:3
 msgid "Set taxes"
-msgstr "Stel belastingtarieven in"
+msgstr "Stel BTW in"
 
 #: ../../sales/sale_ebay.rst:3
 msgid "eBay"
@@ -1485,10 +1138,6 @@ msgid ""
 "invoice location."
 msgstr ""
 
-#: ../../sales/send_quotations/different_addresses.rst:10
-msgid "Activate the feature"
-msgstr ""
-
 #: ../../sales/send_quotations/different_addresses.rst:12
 msgid ""
 "Go to :menuselection:`SALES --> Configuration --> Settings` and activate the"
@@ -1687,6 +1336,10 @@ msgid ""
 "complete quotation in no time."
 msgstr ""
 
+#: ../../sales/send_quotations/quote_template.rst:10
+msgid "Configuration"
+msgstr "Instellingen"
+
 #: ../../sales/send_quotations/quote_template.rst:12
 msgid ""
 "For this feature to work, go to :menuselection:`Sales --> Configuration --> "
diff --git a/locale/uk/LC_MESSAGES/accounting.po b/locale/uk/LC_MESSAGES/accounting.po
index 8b40c2085..662d1e5d7 100644
--- a/locale/uk/LC_MESSAGES/accounting.po
+++ b/locale/uk/LC_MESSAGES/accounting.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-27 11:08+0200\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Alina Semeniuk <alinasemeniuk1@gmail.com>, 2018\n"
+"Last-Translator: Sergey Doroshenko <sdoroshenko@artwebny.com>, 2018\n"
 "Language-Team: Ukrainian (https://www.transifex.com/odoo/teams/41243/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Language: uk\n"
 "Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n"
 
-#: ../../accounting.rst:5 ../../accounting/localizations/mexico.rst:281
+#: ../../accounting.rst:5 ../../accounting/localizations/mexico.rst:283
 msgid "Accounting"
 msgstr "Бухоблік"
 
@@ -28,7 +28,7 @@ msgstr "Банк та готівка"
 
 #: ../../accounting/bank/feeds.rst:3
 msgid "Bank Feeds"
-msgstr "Банківські виписки"
+msgstr "Банківська виписка"
 
 #: ../../accounting/bank/feeds/coda.rst:3
 msgid "Import Coda statement files (Belgium only)"
@@ -75,6 +75,7 @@ msgstr ""
 #: ../../accounting/bank/reconciliation/use_cases.rst:20
 #: ../../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
@@ -92,12 +93,10 @@ msgstr ""
 #: ../../accounting/payables/pay/sepa.rst:26
 #: ../../accounting/payables/supplier_bills/bills_or_receipts.rst:30
 #: ../../accounting/payables/supplier_bills/manage.rst:31
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:15
 #: ../../accounting/receivables/customer_invoices/cash_rounding.rst:19
 #: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:24
 #: ../../accounting/receivables/customer_invoices/installment_plans.rst:20
 #: ../../accounting/receivables/customer_invoices/payment_terms.rst:19
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:31
 #: ../../accounting/receivables/customer_payments/check.rst:39
 #: ../../accounting/receivables/customer_payments/check.rst:103
 #: ../../accounting/receivables/customer_payments/credit_cards.rst:40
@@ -814,7 +813,7 @@ msgstr ""
 "синхронізовані кожні 4 години."
 
 #: ../../accounting/bank/feeds/synchronize.rst:73
-#: ../../accounting/localizations/mexico.rst:531
+#: ../../accounting/localizations/mexico.rst:533
 msgid "FAQ"
 msgstr "FAQ"
 
@@ -918,7 +917,7 @@ msgstr "Yodlee дозволяє тільки отримувати транзак
 #: ../../accounting/bank/misc.rst:3 ../../accounting/payables/misc.rst:3
 #: ../../accounting/payables/misc/employee_expense.rst:187
 msgid "Miscellaneous"
-msgstr "Різне"
+msgstr "Інші"
 
 #: ../../accounting/bank/misc/batch.rst:3
 msgid "How to manage batch deposits of checks?"
@@ -1394,7 +1393,7 @@ msgstr ""
 #: ../../accounting/others/reporting/main_reports.rst:153
 #: ../../accounting/overview/main_concepts/memento.rst:177
 msgid "Bank Reconciliation"
-msgstr "Узгодження банківських виписок"
+msgstr "Узгодження виписок"
 
 #: ../../accounting/bank/reconciliation/configure.rst:3
 msgid "Configure model of entries"
@@ -1682,7 +1681,7 @@ msgstr ""
 
 #: ../../accounting/bank/setup.rst:3
 msgid "Setup"
-msgstr "Налаштування"
+msgstr "Встановіть"
 
 #: ../../accounting/bank/setup/create_bank_account.rst:3
 msgid "How to setup a new bank account?"
@@ -1753,6 +1752,19 @@ msgstr ""
 "переключитися на компанію відповідно до ваших уподобань користувачів, щоб "
 "додати, змінити або видалити банківські рахунки з іншої компанії."
 
+#: ../../accounting/bank/setup/create_bank_account.rst:0
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+#: ../../accounting/others/configuration/account_type.rst:0
+msgid "Type"
+msgstr "Тип"
+
+#: ../../accounting/bank/setup/create_bank_account.rst:0
+msgid ""
+"Bank account type: Normal or IBAN. Inferred from the bank account number."
+msgstr ""
+"Тип банківського рахунку: Нормальний або IBAN. Виведено з номера "
+"банківського рахунку."
+
 #: ../../accounting/bank/setup/create_bank_account.rst:0
 msgid "ABA/Routing"
 msgstr "ABA/Маршрутизація"
@@ -1761,6 +1773,17 @@ msgstr "ABA/Маршрутизація"
 msgid "American Bankers Association Routing Number"
 msgstr "Американська банківська асоціація. Маршрутний номер"
 
+#: ../../accounting/bank/setup/create_bank_account.rst:0
+msgid "Account Holder Name"
+msgstr "І'мя власника рахунку"
+
+#: ../../accounting/bank/setup/create_bank_account.rst:0
+msgid ""
+"Account holder name, in case it is different than the name of the Account "
+"Holder"
+msgstr ""
+"Ім'я власника рахунку, якщо воно відрізняється від імені власника рахунку"
+
 #: ../../accounting/bank/setup/create_bank_account.rst:49
 msgid "View *Bank Account* in our Online Demonstration"
 msgstr "Перегляньте *банківський рахунок* у нашій демо онлайн"
@@ -2041,19 +2064,14 @@ msgstr ""
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Active"
-msgstr "Активний"
+msgstr "Активно"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Set active to false to hide the Journal without removing it."
 msgstr ""
-"Встановіть активне значення \"помилково\", щоби приховати Журнал, не "
+"Встановити активне значення \"помилково\", щоби приховати журнал, не "
 "видаливши його."
 
-#: ../../accounting/bank/setup/manage_cash_register.rst:0
-#: ../../accounting/others/configuration/account_type.rst:0
-msgid "Type"
-msgstr "Тип"
-
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Select 'Sale' for customer invoices journals."
 msgstr "Виберіть \"Продаж\" для журналів рахунків клієнтів."
@@ -2076,15 +2094,15 @@ msgstr "Виберіть 'Загальні' для журналів різних
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Use in Point of Sale"
-msgstr "Використовувати у точці продажу"
+msgstr "Використовуйте точку продаж"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid ""
 "Check this box if this journal define a payment method that can be used in a"
 " point of sale."
 msgstr ""
-"Позначте це, якщо цей журнал визначає спосіб оплати, який можна "
-"використовувати в точці продажу."
+"Встановіть цей прапорець, якщо цей журнал визначає спосіб оплати, який може "
+"бути використаний в точці продажу."
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Company"
@@ -2092,7 +2110,7 @@ msgstr "Компанія"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Company related to this journal"
-msgstr "Компанія, пов'язана з цим журналом"
+msgstr "Компанія-власник цього журналу"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Short Code"
@@ -2100,8 +2118,7 @@ msgstr "Короткий код"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "The journal entries of this journal will be named using this prefix."
-msgstr ""
-"Записи цього журналу будуть позначатися з використанням цього префікса."
+msgstr "Записи в журналі будуть нумеруватися використовуючи цей префікс."
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Next Number"
@@ -2114,14 +2131,13 @@ msgstr ""
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Entry Sequence"
-msgstr "Послідовність входу"
+msgstr "Послідовність записів"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid ""
 "This field contains the information related to the numbering of the journal "
 "entries of this journal."
-msgstr ""
-"Це поле містить інформацію, що стосується нумерації записів цього журналу."
+msgstr "Це поле містить інформацію про нумерацію записів у журналі проведень."
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Dedicated Credit Note Sequence"
@@ -2137,7 +2153,7 @@ msgstr ""
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Credit Notes: Next Number"
-msgstr "Кредитні примітки: наступний номер"
+msgstr "Кредитна примітка: наступний номер"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "The next sequence number will be used for the next credit note."
@@ -2146,7 +2162,7 @@ msgstr ""
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Credit Note Entry Sequence"
-msgstr "Послідовність записів кредитних приміток"
+msgstr "Послідовність запису кредитної примітки"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid ""
@@ -2158,19 +2174,19 @@ msgstr ""
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Default Debit Account"
-msgstr "Дебет рахунку за умовчанням"
+msgstr "Типовий дебетовий рахунок"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "It acts as a default account for debit amount"
-msgstr "Він діє як рахунок за умовчанням для суми дебету"
+msgstr "Використовується, як типовий дебетовий рахунок"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Default Credit Account"
-msgstr "Кредитний рахунок за замовчуванням"
+msgstr "Типовий кредитовий рахунок"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "It acts as a default account for credit amount"
-msgstr "Він діє як рахунок за умовчанням для суми кредиту"
+msgstr "Використовується, як типовий кредитовий рахунок"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Currency"
@@ -2178,7 +2194,7 @@ msgstr "Валюта"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "The currency used to enter statement"
-msgstr "Валюта, яка використовується для введення виписки"
+msgstr "Валюта, використана у виписці"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Debit Methods"
@@ -2216,7 +2232,7 @@ msgstr ""
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Payment Methods"
-msgstr "Методи оплати"
+msgstr "Способи оплати"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Manual:Pay bill by cash or any other method outside of Odoo."
@@ -2238,67 +2254,68 @@ msgstr ""
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Group Invoice Lines"
-msgstr "Рядки групи рахунків-фактур"
+msgstr "Згрупувати рядки рахунків"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid ""
 "If this box is checked, the system will try to group the accounting lines "
 "when generating them from invoices."
 msgstr ""
-"Якщо це буде позначено, система намагатиметься групувати рядки обліку, "
-"створюючи їх із рахунків-фактур."
+"Якщо обрано, то система буде намагатися згрупувати рядки проведень, які "
+"створюватимуться на основі рахунків."
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Profit Account"
-msgstr "Облік прибутку"
+msgstr "Рахунок доходів"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid ""
 "Used to register a profit when the ending balance of a cash register differs"
 " from what the system computes"
 msgstr ""
-"Використовується для реєстрації прибутку, коли кінцевий залишок каси "
-"відрізняється від того, що система обчислює"
+"Використовується для відображення доходу, коли наприкінці періоду баланс по "
+"касі не співпадає з тим, що обчислено системою."
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Loss Account"
-msgstr "Облік витрат"
+msgstr "Рахунок для браку і втрат"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid ""
 "Used to register a loss when the ending balance of a cash register differs "
 "from what the system computes"
 msgstr ""
-"Використовується для реєстрації втрат, коли кінцевий баланс касирів "
-"відрізняється від того, що система обчислює"
+"Використовується для відображення витрат, коли наприкінці періоду баланс по "
+"касі не співпадає з тим, що обчислено системою."
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Show journal on dashboard"
-msgstr "Показати журнал на інформаційній панелі"
+msgstr "Показати журнал на панелі приладів"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Whether this journal should be displayed on the dashboard or not"
-msgstr "Чи повинен цей журнал відображатися на інформаційній панелі чи ні"
+msgstr ""
+"Визначає чи потрібно показувати цей журнал, як елемент на панелі приладів."
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Check Printing Payment Method Selected"
-msgstr "Перевірте вибраний друк методу оплати"
+msgstr "Метод оплати друкованим чеком вибрано"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid ""
 "Technical feature used to know whether check printing was enabled as payment"
 " method."
 msgstr ""
-"Технічна функція використовується для того, щоби дізнатися, чи ввімкнено "
-"перевірку друку як спосіб оплати"
+"Технічна функція використовується для того, щоб дізнатись, чи ввімкнено друк"
+" чеку як спосіб оплати."
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Check Sequence"
-msgstr "Перевірте пслідовність"
+msgstr "Порядковий номер чеку"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Checks numbering sequence."
-msgstr "Перевірка послідовності нумерації."
+msgstr "Порядковий номер чеків"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 #: ../../accounting/payables/pay/check.rst:0
@@ -2308,17 +2325,15 @@ msgstr "Ручна нумерація"
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 #: ../../accounting/payables/pay/check.rst:0
 msgid "Check this option if your pre-printed checks are not numbered."
-msgstr ""
-"Позначте цей параметр, якщо ваші попередньо надруковані чеки не "
-"пронумеровані."
+msgstr "Виберіть цю опцію, якщо ваші пере-друковані чеки не пронумеровані"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Next Check Number"
-msgstr "Наступний перевірений номер"
+msgstr "Наступний номер чеку"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Sequence number of the next printed check."
-msgstr "Послідовність номера наступної друкованої перевірки."
+msgstr "Послідовність номера наступного друкованого чеку"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Creation of bank statement"
@@ -2338,7 +2353,7 @@ msgstr "буде поміщено всередину попередньої ви
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Amount Authorized Difference"
-msgstr "Кількість дозволених відмінностей"
+msgstr "Сумма Авторизованої Різниці"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid ""
@@ -2349,13 +2364,13 @@ msgid ""
 msgstr ""
 "Це поле відображає максимальну різницю, дозволену між кінцевим балансом і "
 "теоретичною готівкою при закритті сеансу, для менеджерів, що не належать до "
-"точки продажу. Якщо цей максимум досягнуто, користувачеві з'явиться "
-"повідомлення про помилку під час закриття його сеансу, вказуючи, що йому "
-"потрібно звернутися до менеджера."
+"ТП. Якщо цей максимум досягнуто, користувачеві з'явиться повідомлення про "
+"помилку під час закриття його сеансу, вказуючи, що йому потрібно звернутися "
+"до менеджера."
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:25
 msgid "Usage"
-msgstr "Використання"
+msgstr "Застосування"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:28
 msgid "How to register cash payments?"
@@ -2424,6 +2439,310 @@ msgstr "Операції будуть додані до поточної реє
 msgid "Localizations"
 msgstr "Локалізації"
 
+#: ../../accounting/localizations/colombia.rst:3
+msgid "Colombia"
+msgstr "Колумбія"
+
+#: ../../accounting/localizations/colombia.rst:6
+#: ../../accounting/localizations/mexico.rst:14
+#: ../../accounting/others/taxes/B2B_B2C.rst:63
+msgid "Introduction"
+msgstr "Загальний огляд"
+
+#: ../../accounting/localizations/colombia.rst:8
+msgid ""
+"Electronic invoicing for Colombia is available from Odoo 12 and requires the"
+" next modules:"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:11
+msgid ""
+"**l11n_co**: All the basic data to manage the accounting module, contains "
+"the default setup for: chart of accounts, taxes, retentions, identification "
+"document types"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:14
+msgid ""
+"**l10n_co_edi**: This module includes all the extra fields that are required"
+" for the Integration with Carvajal T&S and generate the electronic invoice, "
+"based on the DIAN legal requirements."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:19
+msgid "Workflow"
+msgstr "Робочий процес"
+
+#: ../../accounting/localizations/colombia.rst:28
+msgid "1. Install the Colombian localization modules"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:30
+msgid ""
+"For this, go in Apps and search for Colombia. Then click Install for the "
+"first two modules."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:37
+msgid "2. Configure credentials for Carvajal T&S web service"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:39
+msgid ""
+"Once that the modules are installed, in order to be able to connect with "
+"Carvajal T&S Web Service, it's necessary to configure the user and "
+"credentials, this information will be provided by Carvajal T&S."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:43
+#: ../../accounting/localizations/colombia.rst:64
+msgid ""
+"Go to :menuselection:`Accounting --> Configuration --> Settings` and look "
+"for the *Colombian Electronic Invoice* section."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:49
+msgid ""
+"Using the Testing mode it is possible to connect with a Carvajal T&S testing"
+" environment. This allows users to test the complete workflow and "
+"integration with the CEN Financiero portal, which is accessible here: "
+"https://cenfinancierolab.cen.biz"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:54
+msgid ""
+"Once that Odoo and Carvajal T&S is fully configured and ready for production"
+" the testing environment can be disabled."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:58
+msgid "3. Configure your report data"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:60
+msgid ""
+"As part of the configurable information that is sent in the XML, you can "
+"define the data for the fiscal section and the bank information in the PDF."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:71
+msgid "4. Configure data required in the XML"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:74
+msgid "4.1 Partner"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:77
+msgid "4.1.1 Identification"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:79
+msgid ""
+"As part of the Colombian Localization, the document types defined by the "
+"DIAN are now available on the Partner form. Colombian partners have to have "
+"their identification number and document type set:"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:86
+msgid ""
+"When the document type is RUT the identification number needs to be "
+"configured in Odoo including the verification digit, Odoo will split this "
+"number when the data to the third party vendor is sent."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:92
+msgid "4.1.2 Fiscal structure (RUT)"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:94
+msgid ""
+"The partner's responsibility codes (section 53 in the RUT document) are "
+"included as part of the electronic invoice module given that is part of the "
+"information required by the DIAN ."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:98
+msgid ""
+"These fields can be found in :menuselection:`Partner --> Sales & Purchase "
+"Tab --> Fiscal Information`"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:104
+msgid ""
+"Additionally two booleans fields were added in order to specify the fiscal "
+"regimen of the partner."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:108
+msgid "4.2 Taxes"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:110
+msgid ""
+"If your sales transactions include products with taxes, it's important to "
+"consider that an extra field *Value Type* needs to be configured per tax. "
+"This option is located in the Advanced Options tab."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:117
+msgid ""
+"Retention tax types (ICA, IVA, Fuente) are also included in the options to "
+"configure your taxes. This configuration is used in order to correctly "
+"display taxes in the invoice PDF."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:125
+msgid "4.3 Journals"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:127
+msgid ""
+"Once the DIAN has assigned the official sequence and prefix for the "
+"electronic invoice resolution, the Sales journals related to your invoice "
+"documents need to be updated in Odoo.  The sequence can be accessed using "
+"developer mode: :menuselection:`Accounting --> Settings --> Configuration "
+"Setting --> Journals`."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:136
+msgid ""
+"Once that the sequence is opened, the Prefix and Next Number fields should "
+"be configured and synchronized with the CEN Financiero."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:143
+msgid "4.4 Users"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:145
+msgid ""
+"The default template that is used by Odoo on the invoice PDF includes the "
+"job position of the salesperson, so these fields should be configured:"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:153
+#: ../../accounting/localizations/mexico.rst:196
+msgid "Usage and testing"
+msgstr "Використання та тестування"
+
+#: ../../accounting/localizations/colombia.rst:156
+msgid "1. Invoice"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:158
+msgid ""
+"When all your master data and credentials has been configured, it's possible"
+" to start testing the electronic invoice workflow."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:162
+msgid "1.1 Invoice creation"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:164
+msgid ""
+"The functional workflow that takes place before an invoice validation "
+"doesn't change. The main changes that are introduced with the electronic "
+"invoice are the next fields:"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:171
+msgid "There are three types of documents:"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:173
+msgid ""
+"**Factura Electronica**: This is the regular type of document and its "
+"applicable for Invoices, Credit Notes and Debit Notes."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:175
+msgid ""
+"**Factura de Importación**: This should be selected for importation "
+"transactions."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:177
+msgid ""
+"**Factura de contingencia**: This is an exceptional type that is used as a "
+"manual backup in case that the company is not able to use the ERP and it's "
+"necessary to generate the invoice manually, when this invoice is added to "
+"the ERP, this invoice type should be selected."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:184
+msgid "1.2 Invoice validation"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:186
+msgid ""
+"After the invoice is validated an XML file is created and sent automatically"
+" to Carvajal, this file is displayed in the chatter."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:192
+msgid ""
+"An extra field is now displayed in \"Other Info\" tab with the name of the "
+"XML file. Additionally there is a second extra field that is displayed with "
+"the Electronic Invoice status, with the initial value \"In progress\":"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:201
+msgid "1.3 Reception of legal XML and PDF"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:203
+msgid ""
+"The electronic invoice vendor receives the XML file and proceeds to validate"
+" the structure and the information in it, if everything is correct the "
+"invoice status changes to \"Validated\" after using the \"Check Carvajal "
+"Status\" button in the Action dropdown. They then proceed to generate a "
+"Legal XML which includes a digital signature and a unique code (CUFE), a PDF"
+" invoice that includes a QR code and the CUFE is also generated."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:211
+msgid "After this:"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:213
+msgid ""
+"A ZIP containing the legal XML and the PDF is downloaded and displayed in "
+"the invoice chatter:"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:222
+msgid "The Electronic Invoice status changes to \"Accepted\""
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:225
+msgid "1.4 Common errors"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:227
+msgid ""
+"During the XML validation the most common errors are usually related to "
+"missing master data. In such cases, error messages are shown in the chatter "
+"after updating the electronic invoice status."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:234
+msgid ""
+"After the master data is corrected, it's possible to reprocess the XML with "
+"the new data and send the updated version, using the following button:"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:245
+msgid "2. Additional use cases"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:247
+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/france.rst:3
 msgid "France"
 msgstr "Франція"
@@ -2976,11 +3295,6 @@ msgstr ""
 "інформацію щоб дозволити вам використовувати Odoo в компанії з країною "
 "\"Мексика\"."
 
-#: ../../accounting/localizations/mexico.rst:14
-#: ../../accounting/others/taxes/B2B_B2C.rst:63
-msgid "Introduction"
-msgstr "Загальний огляд"
-
 #: ../../accounting/localizations/mexico.rst:16
 msgid "The mexican localization is a group of 3 modules:"
 msgstr "Мексиканська локалізація - це група з 3 модулів:"
@@ -3072,11 +3386,11 @@ msgstr ""
 " та 3.3) і створити підписаний платіж (також 3.3) повністю інтегрується зі "
 "звичайним потоком рахунків-фактур в Odoo."
 
-#: ../../accounting/localizations/mexico.rst:66
+#: ../../accounting/localizations/mexico.rst:68
 msgid "3. Set you legal information in the company"
 msgstr "3. Встановіть юридичну інформацію в компанії"
 
-#: ../../accounting/localizations/mexico.rst:68
+#: ../../accounting/localizations/mexico.rst:70
 msgid ""
 "First, make sure that your company is configured with the correct data. Go "
 "in :menuselection:`Settings --> Users --> Companies` and enter a valid "
@@ -3088,7 +3402,7 @@ msgstr ""
 "введіть дійсну адресу та ПДВ для вашої компанії. Не забудьте визначити "
 "мексиканську схему оподаткування у контакті з вашою компанією."
 
-#: ../../accounting/localizations/mexico.rst:75
+#: ../../accounting/localizations/mexico.rst:77
 msgid ""
 "If you want use the Mexican localization on test mode, you can put any known"
 " address inside Mexico with all fields for the company address and set the "
@@ -3098,7 +3412,7 @@ msgstr ""
 "ви можете помістити будь-яку відому адресу в Мексиці з усіма полями для "
 "адреси компанії та встановити пдв на **ACO560518KW7**."
 
-#: ../../accounting/localizations/mexico.rst:83
+#: ../../accounting/localizations/mexico.rst:85
 msgid ""
 "4. Set the proper \"Fiscal Position\" on the partner that represent the "
 "company"
@@ -3106,7 +3420,7 @@ msgstr ""
 "4. Встановіть правильну \"Схему оподаткування\" для партнера, який "
 "представляє компанію"
 
-#: ../../accounting/localizations/mexico.rst:85
+#: ../../accounting/localizations/mexico.rst:87
 msgid ""
 "Go In the same form where you are editing the company save the record in "
 "order to set this form as a readonly and on readonly view click on the "
@@ -3122,11 +3436,11 @@ msgstr ""
 "тестування** це повинно бути *601 - General de Ley Personas Morales*, просто"
 " знайдіть його як звичайне поле Odoo, якщо ви не бачите варіант)."
 
-#: ../../accounting/localizations/mexico.rst:92
+#: ../../accounting/localizations/mexico.rst:94
 msgid "5. Enabling CFDI Version 3.3"
 msgstr "5. Включення CFDI версії 3.3"
 
-#: ../../accounting/localizations/mexico.rst:95
+#: ../../accounting/localizations/mexico.rst:97
 msgid ""
 "This steps are only necessary when you will enable the CFDI 3.3 (only "
 "available for V11.0 and above) if you do not have Version 11.0 or above on "
@@ -3138,11 +3452,11 @@ msgstr ""
 "версії, будь ласка, попросіть оновлення, відправляючи запит на підтримку в "
 "https: // www.odoo.com/help"
 
-#: ../../accounting/localizations/mexico.rst:100
+#: ../../accounting/localizations/mexico.rst:102
 msgid "Enable debug mode:"
 msgstr "Увімкніть режим налагодження:"
 
-#: ../../accounting/localizations/mexico.rst:105
+#: ../../accounting/localizations/mexico.rst:107
 msgid ""
 "Go and look the following technical parameter, on :menuselection:`Settings "
 "--> Technical --> Parameters --> System Parameters` and set the parameter "
@@ -3154,7 +3468,7 @@ msgstr ""
 "системи` і встановіть параметр з назвою *l10n_mx_edi_cfdi_version* до 3.3 "
 "(Створіть його, якщо запис із цією назвою не існує)."
 
-#: ../../accounting/localizations/mexico.rst:111
+#: ../../accounting/localizations/mexico.rst:113
 msgid ""
 "The CFDI 3.2 will be legally possible until November 30th 2017 enable the "
 "3.3 version will be a mandatory step to comply with the new `SAT "
@@ -3166,12 +3480,12 @@ msgstr ""
 "якій новій базі даних, створеній після виходу випуску v11.0 CFDI 3.3 є "
 "поведінкою за умовчанням."
 
-#: ../../accounting/localizations/mexico.rst:120
+#: ../../accounting/localizations/mexico.rst:122
 msgid "Important considerations when yo enable the CFDI 3.3"
 msgstr "Важливі міркування, коли ви увімкнете CFDI 3.3"
 
-#: ../../accounting/localizations/mexico.rst:122
-#: ../../accounting/localizations/mexico.rst:611
+#: ../../accounting/localizations/mexico.rst:124
+#: ../../accounting/localizations/mexico.rst:613
 msgid ""
 "Your tax which represent the VAT 16% and 0% must have the \"Factor Type\" "
 "field set to \"Tasa\"."
@@ -3179,7 +3493,7 @@ msgstr ""
 "Ваш податок, який представляє ПДВ 16% та 0%, повинен мати поле \"Тип "
 "фактора\", встановлене для \"Таsа\"."
 
-#: ../../accounting/localizations/mexico.rst:130
+#: ../../accounting/localizations/mexico.rst:132
 msgid ""
 "You 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"
@@ -3189,7 +3503,7 @@ msgstr ""
 "правильний код (це перші 3 номери в назві), наприклад, для тесту, який слід "
 "встановити на 601, він буде виглядати як зображення."
 
-#: ../../accounting/localizations/mexico.rst:137
+#: ../../accounting/localizations/mexico.rst:139
 msgid ""
 "All products must have for CFDI 3.3 the \"SAT code\" and the field "
 "\"Reference\" properly set, you can export them and re import them to do it "
@@ -3199,11 +3513,11 @@ msgstr ""
 "правильно встановити, ви можете їх експортувати та імпортувати, щоб зробити "
 "це швидше."
 
-#: ../../accounting/localizations/mexico.rst:144
+#: ../../accounting/localizations/mexico.rst:146
 msgid "6. Configure the PAC in order to sign properly the invoices"
 msgstr "6. Налаштуйте PAC, щоб правильно підписати рахунки-фактури"
 
-#: ../../accounting/localizations/mexico.rst:146
+#: ../../accounting/localizations/mexico.rst:148
 msgid ""
 "To configure the EDI with the **PACs**, you can go in "
 ":menuselection:`Accounting --> Settings --> Electronic Invoicing (MX)`. You "
@@ -3215,7 +3529,7 @@ msgstr ""
 "рахунків (MX)`. Ви можете вибрати PAC у списку **підтримуваних PAC** у полі "
 "*PAC*, а потім введіть ім'я користувача PAC та пароль PAC."
 
-#: ../../accounting/localizations/mexico.rst:152
+#: ../../accounting/localizations/mexico.rst:154
 msgid ""
 "Remember you must sign up in the refereed PAC before hand, that process can "
 "be done with the PAC itself on this case we will have two (2) availables "
@@ -3225,7 +3539,7 @@ msgstr ""
 "цей процес можна зробити з самого PAC, у цьому випадку у нас буде два (2) "
 "наявності `Finkok`_ і` Solución Factible`_."
 
-#: ../../accounting/localizations/mexico.rst:156
+#: ../../accounting/localizations/mexico.rst:158
 msgid ""
 "You must process your **Private Key (CSD)** with the SAT institution before "
 "follow this steps, if you do not have such information please try all the "
@@ -3239,7 +3553,7 @@ msgstr ""
 "ви завершите запропонований процес для SAT, щоб встановити цю інформацію для"
 " вашого виробничого середовища за допомогою реальних транзакцій."
 
-#: ../../accounting/localizations/mexico.rst:166
+#: ../../accounting/localizations/mexico.rst:168
 msgid ""
 "If you ticked the box *MX PAC test environment* there is no need to enter a "
 "PAC username or password."
@@ -3247,7 +3561,7 @@ msgstr ""
 "Якщо ви позначили поле *MX PAC тест середовища*, вам не потрібно вводити "
 "ім'я користувача або пароль PAC."
 
-#: ../../accounting/localizations/mexico.rst:173
+#: ../../accounting/localizations/mexico.rst:175
 msgid ""
 "Here is a SAT certificate you can use if you want to use the *Test "
 "Environment* for the Mexican Accounting Localization."
@@ -3256,23 +3570,23 @@ msgstr ""
 "використовувати *Тестування середовища* для мексиканської локалізації "
 "бухобліку."
 
-#: ../../accounting/localizations/mexico.rst:176
+#: ../../accounting/localizations/mexico.rst:178
 msgid "`Certificate`_"
 msgstr "`Сертифікат`_"
 
-#: ../../accounting/localizations/mexico.rst:177
+#: ../../accounting/localizations/mexico.rst:179
 msgid "`Certificate Key`_"
 msgstr "`Ключ сертифікату`_"
 
-#: ../../accounting/localizations/mexico.rst:178
+#: ../../accounting/localizations/mexico.rst:180
 msgid "**Password :** 12345678a"
 msgstr "**Пароль :** 12345678a"
 
-#: ../../accounting/localizations/mexico.rst:181
+#: ../../accounting/localizations/mexico.rst:183
 msgid "7. Configure the tag in sales taxes"
 msgstr "7. Налаштуйте тег у податках на продаж"
 
-#: ../../accounting/localizations/mexico.rst:183
+#: ../../accounting/localizations/mexico.rst:185
 msgid ""
 "This tag is used to set the tax type code, transferred or withhold, "
 "applicable to the concept in the CFDI. So, if the tax is a sale tax the "
@@ -3282,7 +3596,7 @@ msgstr ""
 "призупинення, що застосовується до концепції CFDI. Отже, якщо податок є "
 "податком на продаж, поле \"Тег\" повинно бути \"IVA\", \"ISR\" або \"IEPS\"."
 
-#: ../../accounting/localizations/mexico.rst:190
+#: ../../accounting/localizations/mexico.rst:192
 msgid ""
 "Note that the default taxes already has a tag assigned, but when you create "
 "a new tax you should choose a tag."
@@ -3290,15 +3604,11 @@ msgstr ""
 "Зверніть увагу, що для податків за замовчуванням тег уже призначений, але "
 "при створенні нового податку слід вибрати тег."
 
-#: ../../accounting/localizations/mexico.rst:194
-msgid "Usage and testing"
-msgstr "Використання та тестування"
-
-#: ../../accounting/localizations/mexico.rst:197
+#: ../../accounting/localizations/mexico.rst:199
 msgid "Invoicing"
 msgstr "Виставлення рахунків"
 
-#: ../../accounting/localizations/mexico.rst:199
+#: ../../accounting/localizations/mexico.rst:201
 msgid ""
 "To use the mexican invoicing you just need to do a normal invoice following "
 "the normal Odoo's behaviour."
@@ -3306,7 +3616,7 @@ msgstr ""
 "Щоб скористатися мексиканським рахунком-фактурою, вам просто потрібно "
 "зробити звичайний рахунок-фактуру, слідуючи звичайній поведінці Odoo."
 
-#: ../../accounting/localizations/mexico.rst:202
+#: ../../accounting/localizations/mexico.rst:204
 msgid ""
 "Once you validate your first invoice a correctly signed invoice should look "
 "like this:"
@@ -3314,7 +3624,7 @@ msgstr ""
 "Після перевірки першого рахунку правильно підписаний рахунок-фактура повинен"
 " виглядати так:"
 
-#: ../../accounting/localizations/mexico.rst:209
+#: ../../accounting/localizations/mexico.rst:211
 msgid ""
 "You can generate the PDF just clicking on the Print button on the invoice or"
 " sending it by email following the normal process on odoo to send your "
@@ -3324,7 +3634,7 @@ msgstr ""
 "фактурі або відправивши його по електронній пошті після звичайного процесу, "
 "щоб надсилати рахунок-фактуру електронною поштою."
 
-#: ../../accounting/localizations/mexico.rst:216
+#: ../../accounting/localizations/mexico.rst:218
 msgid ""
 "Once you send the electronic invoice by email this is the way it should "
 "looks like."
@@ -3332,38 +3642,38 @@ msgstr ""
 "Як тільки ви надішлете електронний рахунок-фактуру електронною поштою, це "
 "так, як виглядає."
 
-#: ../../accounting/localizations/mexico.rst:223
+#: ../../accounting/localizations/mexico.rst:225
 msgid "Cancelling invoices"
 msgstr "Скасування рахунків-фактур"
 
-#: ../../accounting/localizations/mexico.rst:225
+#: ../../accounting/localizations/mexico.rst:227
 msgid ""
 "The cancellation process is completely linked to the normal cancellation in "
 "Odoo."
 msgstr ""
 "Процес скасування повністю пов'язаний з нормальним скасуванням в Odoo."
 
-#: ../../accounting/localizations/mexico.rst:227
+#: ../../accounting/localizations/mexico.rst:229
 msgid "If the invoice is not paid."
 msgstr "Якщо рахунок-фактура не сплачується."
 
-#: ../../accounting/localizations/mexico.rst:229
+#: ../../accounting/localizations/mexico.rst:231
 msgid "Go to to the customer invoice journal where the invoice belong to"
 msgstr ""
 "Перейдіть до журналу рахунків-фактур клієнта, до якого належить рахунок-"
 "фактура"
 
-#: ../../accounting/localizations/mexico.rst:237
+#: ../../accounting/localizations/mexico.rst:239
 msgid "Check the \"Allow cancelling entries\" field"
 msgstr "Перевірте поле \"Дозволити скасування записів\""
 
-#: ../../accounting/localizations/mexico.rst:242
+#: ../../accounting/localizations/mexico.rst:244
 msgid "Go back to your invoice and click on the button \"Cancel Invoice\""
 msgstr ""
 "Поверніться до рахунку-фактури та натисніть кнопку \"Скасувати рахунок-"
 "фактуру\""
 
-#: ../../accounting/localizations/mexico.rst:247
+#: ../../accounting/localizations/mexico.rst:249
 msgid ""
 "For security reasons it is recommendable return the check on the to allow "
 "cancelling to false again, then go to the journal and un check such field."
@@ -3371,15 +3681,15 @@ msgstr ""
 "З міркувань безпеки рекомендується повернути перевірку на те, щоб ще раз "
 "скасувати помилку, а потім перейти до журналу та перевірити це поле."
 
-#: ../../accounting/localizations/mexico.rst:250
+#: ../../accounting/localizations/mexico.rst:252
 msgid "**Legal considerations**"
 msgstr "**Юридичні міркування**"
 
-#: ../../accounting/localizations/mexico.rst:252
+#: ../../accounting/localizations/mexico.rst:254
 msgid "A cancelled invoice will automatically cancelled on the SAT."
 msgstr "Скасований рахунок-фактура буде автоматично скасований на SAT."
 
-#: ../../accounting/localizations/mexico.rst:253
+#: ../../accounting/localizations/mexico.rst:255
 msgid ""
 "If you retry to use the same invoice after cancelled, you will have as much "
 "cancelled CFDI as you tried, then all those xml are important to maintain a "
@@ -3389,7 +3699,7 @@ msgstr ""
 "вас буде стільки ж скасованих CFDI, скільки ви спробували, тоді всі ці xml є"
 " важливими, щоб забезпечити хороший контроль за причинами скасування."
 
-#: ../../accounting/localizations/mexico.rst:256
+#: ../../accounting/localizations/mexico.rst:258
 msgid ""
 "You must unlink all related payment done to an invoice on odoo before cancel"
 " such document, this payments must be cancelled to following the same "
@@ -3400,11 +3710,11 @@ msgstr ""
 "дотримуючись того самого підходу, але встановлюючи параметр «Дозволити "
 "записи відмов» у самому платежі."
 
-#: ../../accounting/localizations/mexico.rst:261
+#: ../../accounting/localizations/mexico.rst:263
 msgid "Payments (Just available for CFDI 3.3)"
 msgstr "Платежі (доступно лише для CFDI 3.3)"
 
-#: ../../accounting/localizations/mexico.rst:263
+#: ../../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 "
@@ -3413,7 +3723,7 @@ msgstr ""
 "Щоб створити комплект для оплати, ви повинні просто дотримуватися звичайного"
 " процесу оплати в Odoo, ці міркування для розуміння поведінки є важливими."
 
-#: ../../accounting/localizations/mexico.rst:266
+#: ../../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"
@@ -3423,7 +3733,7 @@ msgstr ""
 " буде підписана, тому що це очікувана поведінка, юридично необхідна для "
 "\"Платежу готівкою\"."
 
-#: ../../accounting/localizations/mexico.rst:269
+#: ../../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."
@@ -3431,11 +3741,11 @@ msgstr ""
 "Щоб протестувати регулярний підписний платіж, просто створіть рахунок-"
 "фактуру за день до сьогодні, а потім сплатіть його сьогодні."
 
-#: ../../accounting/localizations/mexico.rst:271
+#: ../../accounting/localizations/mexico.rst:273
 msgid "You must print the payment in order to retrieve the PDF properly."
 msgstr "Ви повинні надрукувати платіж, щоб правильно завантажити PDF-файл."
 
-#: ../../accounting/localizations/mexico.rst:272
+#: ../../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 "
@@ -3449,7 +3759,7 @@ msgstr ""
 "SAT`_ у розділі **Apéndice 2 Procedimiento para la emisión de los CFDI en el"
 " caso de anticipos recibidos**."
 
-#: ../../accounting/localizations/mexico.rst:277
+#: ../../accounting/localizations/mexico.rst:279
 msgid ""
 "Related to topic 4 it is blocked the possibility to create a Customer "
 "Payment without a proper invoice."
@@ -3457,23 +3767,23 @@ msgstr ""
 "Що стосується теми 4, то заблокована можливість створення платежів клієнта "
 "без належного рахунку-фактури."
 
-#: ../../accounting/localizations/mexico.rst:282
+#: ../../accounting/localizations/mexico.rst:284
 msgid "The accounting for Mexico in odoo is composed by 3 reports:"
 msgstr "Бухоблік Мексики в odoo складається з трьох повідомлень:"
 
-#: ../../accounting/localizations/mexico.rst:284
+#: ../../accounting/localizations/mexico.rst:286
 msgid "Chart of Account (Called and shown as COA)."
 msgstr "План рахунку (Викликається та відображається як COA)."
 
-#: ../../accounting/localizations/mexico.rst:285
+#: ../../accounting/localizations/mexico.rst:287
 msgid "Electronic Trial Balance."
 msgstr "Електронний пробний баланс."
 
-#: ../../accounting/localizations/mexico.rst:286
+#: ../../accounting/localizations/mexico.rst:288
 msgid "DIOT report."
 msgstr "Звіт DIOT."
 
-#: ../../accounting/localizations/mexico.rst:288
+#: ../../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."
@@ -3481,7 +3791,7 @@ msgstr ""
 "1 і 2 розглядаються як електронний облік, а DIOT - це лише доступ до звіту в"
 " контексті бухгалтерського обліку."
 
-#: ../../accounting/localizations/mexico.rst:291
+#: ../../accounting/localizations/mexico.rst:293
 msgid ""
 "You can find all those reports in the original report menu on Accounting "
 "app."
@@ -3489,15 +3799,15 @@ msgstr ""
 "Ви можете знайти всі ці звіти в оригінальному меню звіту в додатку "
 "Бухгалтерський облік."
 
-#: ../../accounting/localizations/mexico.rst:297
+#: ../../accounting/localizations/mexico.rst:299
 msgid "Electronic Accounting (Requires Accounting App)"
 msgstr "Електронний облік (вимагає застосування бухгалтерського обліку)"
 
-#: ../../accounting/localizations/mexico.rst:300
+#: ../../accounting/localizations/mexico.rst:302
 msgid "Electronic Chart of account CoA"
 msgstr "Електронний графік обліку CoA"
 
-#: ../../accounting/localizations/mexico.rst:302
+#: ../../accounting/localizations/mexico.rst:304
 msgid ""
 "The electronic accounting never has been easier, just go to "
 ":menuselection:`Accounting --> Reporting --> Mexico --> COA` and click on "
@@ -3507,11 +3817,11 @@ msgstr ""
 ":menuselection:`Бухоблік --> Звітність --> Мексика --> COA` і натисніть "
 "кнопку **Експорт для SAT (XML)**"
 
-#: ../../accounting/localizations/mexico.rst:309
+#: ../../accounting/localizations/mexico.rst:311
 msgid "**How to add new accounts?**"
 msgstr "**Як додати нові рахунки?**"
 
-#: ../../accounting/localizations/mexico.rst:311
+#: ../../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."
@@ -3519,7 +3829,7 @@ msgstr ""
 "Якщо ви додаєте облік із конвенцією кодування NNN.YY.ZZ, де NNN.YY є групою "
 "кодування SAT, то ваш облік буде автоматично налаштований."
 
-#: ../../accounting/localizations/mexico.rst:314
+#: ../../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 "
@@ -3535,11 +3845,11 @@ msgstr ""
 "побачите, тег, який буде автоматично встановлено, встановлені теги будуть "
 "вибрані для використання в COA на XML."
 
-#: ../../accounting/localizations/mexico.rst:324
+#: ../../accounting/localizations/mexico.rst:326
 msgid "**What is the meaning of the tag?**"
 msgstr "**Що означає тег?**"
 
-#: ../../accounting/localizations/mexico.rst:326
+#: ../../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**."
@@ -3547,7 +3857,7 @@ msgstr ""
 "Щоб дізнатись усі можливі теги, ви можете ознайомитись з `Anexo 24`_  на "
 "веб-сайті SAT у розділі під назвою **Código agrupador de cuentas del SAT**."
 
-#: ../../accounting/localizations/mexico.rst:330
+#: ../../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 "
@@ -3559,11 +3869,11 @@ msgstr ""
 "вашій базі даних), тоді у вас буде більше загальних тегів, якщо потрібний "
 "тег не створений, ви можете створити його на льоту."
 
-#: ../../accounting/localizations/mexico.rst:336
+#: ../../accounting/localizations/mexico.rst:338
 msgid "Electronic Trial Balance"
 msgstr "Електронний пробний баланс"
 
-#: ../../accounting/localizations/mexico.rst:338
+#: ../../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 "
@@ -3578,7 +3888,7 @@ msgstr ""
 " допомогою кнопки у верхній частині **Експорт для SAT (XML)** з попереднім "
 "вибором періоду, який ви хочете експортувати."
 
-#: ../../accounting/localizations/mexico.rst:347
+#: ../../accounting/localizations/mexico.rst:349
 msgid ""
 "All the normal auditory and analysis features are available here also as any"
 " regular Odoo Report."
@@ -3586,15 +3896,15 @@ msgstr ""
 "Всі звичайні функції слуху та аналізу доступні тут також як і будь-який "
 "звичайний звіт Odoo."
 
-#: ../../accounting/localizations/mexico.rst:351
+#: ../../accounting/localizations/mexico.rst:353
 msgid "DIOT Report (Requires Accounting App)"
 msgstr "Звіт DIOT (вимагає застосування бухгалтерського обліку)"
 
-#: ../../accounting/localizations/mexico.rst:353
+#: ../../accounting/localizations/mexico.rst:355
 msgid "**What is the DIOT and the importance of presenting it SAT**"
 msgstr "**Що таке DIOT і важливість презентації SAT**"
 
-#: ../../accounting/localizations/mexico.rst:355
+#: ../../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 "
@@ -3604,7 +3914,7 @@ msgstr ""
 " не повинні нехтувати тим, що ми представляємо. Отже, що не повинно бути в "
 "Оdoo."
 
-#: ../../accounting/localizations/mexico.rst:358
+#: ../../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 "
@@ -3616,7 +3926,7 @@ msgstr ""
 "операцій третім сторонам або те, що вважається таким же, з нашими "
 "постачальниками."
 
-#: ../../accounting/localizations/mexico.rst:363
+#: ../../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 "
@@ -3626,11 +3936,11 @@ msgstr ""
 "подання до SAT, а також стосується постачальників, це необхідно. надішліть "
 "DIOT:"
 
-#: ../../accounting/localizations/mexico.rst:367
+#: ../../accounting/localizations/mexico.rst:369
 msgid "**When to file the DIOT and in what format?**"
 msgstr "**Коли вводити файл DIOT і в якому форматі?**"
 
-#: ../../accounting/localizations/mexico.rst:369
+#: ../../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 "
@@ -3640,7 +3950,7 @@ msgstr ""
 "його на сторінці SAT, це електронний формат A-29, який ви можете знайти на "
 "веб-сайті SAT."
 
-#: ../../accounting/localizations/mexico.rst:373
+#: ../../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 "
@@ -3652,11 +3962,11 @@ msgstr ""
 "постачальниками, то до лютого ми повинні представити інформацію, що "
 "стосується вказаних даних."
 
-#: ../../accounting/localizations/mexico.rst:378
+#: ../../accounting/localizations/mexico.rst:380
 msgid "**Where the DIOT is presented?**"
 msgstr "**Де представлений DIOT?**"
 
-#: ../../accounting/localizations/mexico.rst:380
+#: ../../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 "
@@ -3666,7 +3976,7 @@ msgstr ""
 " який буде вам більш зручним, ніж ви будете представляти щомісяця або "
 "кожного разу, коли ви маєте справу з постачальниками."
 
-#: ../../accounting/localizations/mexico.rst:384
+#: ../../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."
@@ -3674,7 +3984,7 @@ msgstr ""
 "Формат A-29 є електронним, так що ви можете його представити на сторінці "
 "SAT, але це після того, як складете до 500 записів."
 
-#: ../../accounting/localizations/mexico.rst:387
+#: ../../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 "
@@ -3689,11 +3999,11 @@ msgstr ""
 "перевірки ви будете повернуті, так що не сумнівайтеся в тому, що у вас "
 "залишиться ці записи і, звичайно, ваш компакт-диск або USB."
 
-#: ../../accounting/localizations/mexico.rst:393
+#: ../../accounting/localizations/mexico.rst:395
 msgid "**One more fact to know: the Batch load?**"
 msgstr "**Ще один факт, щоб знати: партійне навантаження?**"
 
-#: ../../accounting/localizations/mexico.rst:395
+#: ../../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 "
@@ -3703,7 +4013,7 @@ msgstr ""
 "завантаження, і, звичайно, перше, що ми думаємо, що це таке?, І відповідно "
 "до сайту SAT:"
 
-#: ../../accounting/localizations/mexico.rst:399
+#: ../../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 "
@@ -3719,7 +4029,7 @@ msgstr ""
 "захоплення, а отже, оптимізації часу, вкладеного в його інтеграцію, для "
 "презентації у часі та формі для SAT."
 
-#: ../../accounting/localizations/mexico.rst:406
+#: ../../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 "
@@ -3730,15 +4040,15 @@ msgstr ""
 "допускається, що полегшить вам цю операцію, щоб її не було, щоб не "
 "відповідати SAT у зв'язку з інформацією про операції з третіми сторонами."
 
-#: ../../accounting/localizations/mexico.rst:411
+#: ../../accounting/localizations/mexico.rst:413
 msgid "You can find the `official information here`_."
 msgstr "Ви можете знайти `офіційну інформацію тут`_."
 
-#: ../../accounting/localizations/mexico.rst:413
+#: ../../accounting/localizations/mexico.rst:415
 msgid "**How Generate this report in odoo?**"
 msgstr "**Як створити цей звіт в odoo?**"
 
-#: ../../accounting/localizations/mexico.rst:415
+#: ../../accounting/localizations/mexico.rst:417
 msgid ""
 "Go to  :menuselection:`Accounting --> Reports --> Mexico --> Transactions "
 "with third partied (DIOT)`."
@@ -3746,7 +4056,7 @@ msgstr ""
 "Перейдіть до  :menuselection:`Бухоблік --> Звітність --> Мексика --> "
 "Операції з третіми сторонами (DIOT)`."
 
-#: ../../accounting/localizations/mexico.rst:420
+#: ../../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."
@@ -3755,11 +4065,11 @@ msgstr ""
 "безпосередньо до місяця, який ви перебуваєте, або залиште поточний місяць, "
 "якщо це вам підходить."
 
-#: ../../accounting/localizations/mexico.rst:426
+#: ../../accounting/localizations/mexico.rst:428
 msgid "Click on \"Export (TXT)."
 msgstr "Натисніть \"Експорт (TXT)."
 
-#: ../../accounting/localizations/mexico.rst:431
+#: ../../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."
@@ -3767,12 +4077,12 @@ msgstr ""
 "Зберігайте в безпечному місці завантажений файл і перейдіть на веб-сайт SAT "
 "і дотримуйтесь необхідних інструкцій, щоб оголосити його."
 
-#: ../../accounting/localizations/mexico.rst:435
+#: ../../accounting/localizations/mexico.rst:437
 msgid "Important considerations on your Supplier and Invice data for the DIOT"
 msgstr ""
 "Важливі міркування щодо даних постачальника та рахунків-фактур для IDIOT"
 
-#: ../../accounting/localizations/mexico.rst:437
+#: ../../accounting/localizations/mexico.rst:439
 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 "
@@ -3786,7 +4096,7 @@ msgstr ""
 "але *L10N Mx Тип операції* повинен бути заповнений вами у всіх ваших "
 "постачальників."
 
-#: ../../accounting/localizations/mexico.rst:445
+#: ../../accounting/localizations/mexico.rst:447
 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 "
@@ -3797,7 +4107,7 @@ msgstr ""
 " якщо податок не нараховується, а інші 2 податки вже належним чином "
 "налаштовані."
 
-#: ../../accounting/localizations/mexico.rst:448
+#: ../../accounting/localizations/mexico.rst:450
 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 "
@@ -3807,7 +4117,7 @@ msgstr ""
 "потрібно спочатку попросити рахунок-фактуру, а потім сплатити його та "
 "правильно узгодити платіж за стандартною процедурою odoo."
 
-#: ../../accounting/localizations/mexico.rst:451
+#: ../../accounting/localizations/mexico.rst:453
 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 "
@@ -3817,7 +4127,7 @@ msgstr ""
 "рахунок-фактуру постачальника, ви можете виправити цю інформацію під час "
 "створення звіту."
 
-#: ../../accounting/localizations/mexico.rst:454
+#: ../../accounting/localizations/mexico.rst:456
 msgid ""
 "Remember this report only shows the Supplier Invoices that were actually "
 "paid."
@@ -3825,7 +4135,7 @@ msgstr ""
 "Пам'ятайте, що у цьому звіті відображаються лише фактичні рахунки "
 "постачальників."
 
-#: ../../accounting/localizations/mexico.rst:456
+#: ../../accounting/localizations/mexico.rst:458
 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 "
@@ -3841,15 +4151,15 @@ msgstr ""
 "створити його до кінця місяця та використовувати його як свій аудиторський "
 "процес, щоб правильно встановити всіх ваших партнерів."
 
-#: ../../accounting/localizations/mexico.rst:467
+#: ../../accounting/localizations/mexico.rst:469
 msgid "Extra Recommended features"
 msgstr "Додаткові рекомендовані функції"
 
-#: ../../accounting/localizations/mexico.rst:470
+#: ../../accounting/localizations/mexico.rst:472
 msgid "Contact Module (Free)"
 msgstr "Контактний модуль (безкоштовно)"
 
-#: ../../accounting/localizations/mexico.rst:472
+#: ../../accounting/localizations/mexico.rst:474
 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 "
@@ -3859,11 +4169,11 @@ msgstr ""
 "адресами цього модуля, навіть якщо це не є технічною потребою, рекомендуємо "
 "його встановити."
 
-#: ../../accounting/localizations/mexico.rst:477
+#: ../../accounting/localizations/mexico.rst:479
 msgid "Multi currency (Requires Accounting App)"
 msgstr "Мультивалюта (вимагає застосування бухгалтерського обліку)"
 
-#: ../../accounting/localizations/mexico.rst:479
+#: ../../accounting/localizations/mexico.rst:481
 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"
@@ -3879,11 +4189,11 @@ msgstr ""
 "завантажений від SAT і не турбуючись про те, щоб цю інформацію вручну "
 "вводити щодня в систему."
 
-#: ../../accounting/localizations/mexico.rst:486
+#: ../../accounting/localizations/mexico.rst:488
 msgid "Go to settings and enable the multi currency feature."
 msgstr "Перейдіть до налаштувань і ввімкніть функцію мультивалют."
 
-#: ../../accounting/localizations/mexico.rst:492
+#: ../../accounting/localizations/mexico.rst:494
 msgid ""
 "Enabling Explicit errors on the CFDI using the XSD local validator (CFDI "
 "3.3)"
@@ -3891,7 +4201,7 @@ msgstr ""
 "Увімкнення явних помилок на CFDI за допомогою локального валідатора XSD "
 "(CFDI 3.3)."
 
-#: ../../accounting/localizations/mexico.rst:494
+#: ../../accounting/localizations/mexico.rst:496
 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 "
@@ -3903,22 +4213,22 @@ msgstr ""
 "щоб увімкнути функцію «Перевірити за допомогою xsd», виконайте наступні "
 "кроки (при увімкненому режимі налагодження)."
 
-#: ../../accounting/localizations/mexico.rst:499
+#: ../../accounting/localizations/mexico.rst:501
 msgid ""
 "Go to :menuselection:`Settings --> Technical --> Actions --> Server Actions`"
 msgstr ""
 "Перейдіть до :menuselection:`Налаштування --> Технічний --> Дії --> Дії "
 "сервера`"
 
-#: ../../accounting/localizations/mexico.rst:500
+#: ../../accounting/localizations/mexico.rst:502
 msgid "Look for the Action called \"Download XSD files to CFDI\""
 msgstr "Шукайте дію під назвою \"Завантажити файли XSD до CFDI\""
 
-#: ../../accounting/localizations/mexico.rst:501
+#: ../../accounting/localizations/mexico.rst:503
 msgid "Click on button \"Create Contextual Action\""
 msgstr "Натисніть кнопку \"Створити контекстну дію\""
 
-#: ../../accounting/localizations/mexico.rst:502
+#: ../../accounting/localizations/mexico.rst:504
 msgid ""
 "Go to the company form :menuselection:`Settings --> Users&Companies --> "
 "Companies`"
@@ -3926,16 +4236,16 @@ msgstr ""
 "Перейдіть до форми компанії :menuselection:`Налаштування --> Користувачі та "
 "компанії --> Компанії`"
 
-#: ../../accounting/localizations/mexico.rst:503
+#: ../../accounting/localizations/mexico.rst:505
 msgid "Open any company you have."
 msgstr "Відкрийте будь-яку вашу компанію."
 
-#: ../../accounting/localizations/mexico.rst:504
-#: ../../accounting/localizations/mexico.rst:527
+#: ../../accounting/localizations/mexico.rst:506
+#: ../../accounting/localizations/mexico.rst:529
 msgid "Click on \"Action\" and then on \"Download XSD file to CFDI\"."
 msgstr "Натисніть \"Дія\", а потім \"Завантажити файл XSD в CFDI\"."
 
-#: ../../accounting/localizations/mexico.rst:509
+#: ../../accounting/localizations/mexico.rst:511
 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 "
@@ -3945,15 +4255,15 @@ msgstr ""
 "товар без коду, який є досить поширеним явищем), а замість загальної не "
 "вказано явну помилку."
 
-#: ../../accounting/localizations/mexico.rst:514
+#: ../../accounting/localizations/mexico.rst:516
 msgid "If you see an error like this:"
 msgstr "Якщо ви бачите помилку, подібну до цієї:"
 
-#: ../../accounting/localizations/mexico.rst:516
+#: ../../accounting/localizations/mexico.rst:518
 msgid "The cfdi generated is not valid"
 msgstr "Сгенерований cfd недійсний"
 
-#: ../../accounting/localizations/mexico.rst:518
+#: ../../accounting/localizations/mexico.rst:520
 msgid ""
 "attribute decl. 'TipoRelacion', attribute 'type': The QName value "
 "'{http://www.sat.gob.mx/sitio_internet/cfd/catalogos}c_TipoRelacion' does "
@@ -3963,7 +4273,7 @@ msgstr ""
 "'{http://www.sat.gob.mx/sitio_internet/cfd/catalogos}c_TipoRelacion' не "
 "вирішується до визначення (n) простого типу., рядок 36"
 
-#: ../../accounting/localizations/mexico.rst:522
+#: ../../accounting/localizations/mexico.rst:524
 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"
@@ -3973,15 +4283,15 @@ msgstr ""
 "сервері або коли файли XSD не завантажені належним чином. Виконайте ті самі "
 "дії, що описані вище, але:"
 
-#: ../../accounting/localizations/mexico.rst:526
+#: ../../accounting/localizations/mexico.rst:528
 msgid "Go to the company in which the error occurs."
 msgstr "Перейдіть до компанії, в якій виникає помилка."
 
-#: ../../accounting/localizations/mexico.rst:533
+#: ../../accounting/localizations/mexico.rst:535
 msgid "**Error message** (Only applicable on CFDI 3.3):"
 msgstr "**Повідомлення про помилку** (застосовується лише до CFDI 3.3):"
 
-#: ../../accounting/localizations/mexico.rst:535
+#: ../../accounting/localizations/mexico.rst:537
 msgid ""
 ":9:0:ERROR:SCHEMASV:SCHEMAV_CVC_MINLENGTH_VALID: Element "
 "'{http://www.sat.gob.mx/cfd/3}Concepto', attribute 'NoIdentificacion': "
@@ -3993,7 +4303,7 @@ msgstr ""
 " 'minLength'] Значення '' має довжину \"0\"; це перевищує дозволену "
 "мінімальну довжину \"1\"."
 
-#: ../../accounting/localizations/mexico.rst:537
+#: ../../accounting/localizations/mexico.rst:539
 msgid ""
 ":9:0:ERROR:SCHEMASV:SCHEMAV_CVC_PATTERN_VALID: Element "
 "'{http://www.sat.gob.mx/cfd/3}Concepto', attribute 'NoIdentificacion': "
@@ -4003,7 +4313,7 @@ msgstr ""
 "'{http://www.sat.gob.mx/cfd/3}Concepto', attribute 'NoIdentificacion': "
 "[facet 'pattern'] The value '' не прийнято за схемою '[^|]{1,100}'."
 
-#: ../../accounting/localizations/mexico.rst:540
+#: ../../accounting/localizations/mexico.rst:542
 msgid ""
 "**Solution:** You forget to set the proper \"Reference\" field in the "
 "product, please go to the product form and set your internal reference "
@@ -4013,15 +4323,15 @@ msgstr ""
 "будь ласка, перейдіть до форми товару і правильно встановіть внутрішню "
 "довідку."
 
-#: ../../accounting/localizations/mexico.rst:543
-#: ../../accounting/localizations/mexico.rst:568
-#: ../../accounting/localizations/mexico.rst:578
-#: ../../accounting/localizations/mexico.rst:591
-#: ../../accounting/localizations/mexico.rst:602
+#: ../../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
 msgid "**Error message**:"
 msgstr "**Повідомлення про помилку**:"
 
-#: ../../accounting/localizations/mexico.rst:545
+#: ../../accounting/localizations/mexico.rst:547
 msgid ""
 ":6:0:ERROR:SCHEMASV:SCHEMAV_CVC_COMPLEX_TYPE_4: Element "
 "'{http://www.sat.gob.mx/cfd/3}RegimenFiscal': The attribute 'Regimen' is "
@@ -4031,7 +4341,7 @@ msgstr ""
 "'{http://www.sat.gob.mx/cfd/3}RegimenFiscal': атрибут 'Режим' обов'язковий, "
 "але відсутній."
 
-#: ../../accounting/localizations/mexico.rst:547
+#: ../../accounting/localizations/mexico.rst:549
 msgid ""
 ":5:0:ERROR:SCHEMASV:SCHEMAV_CVC_COMPLEX_TYPE_4: Element "
 "'{http://www.sat.gob.mx/cfd/3}Emisor': The attribute 'RegimenFiscal' is "
@@ -4041,7 +4351,7 @@ msgstr ""
 "'(http://www.sat.gob.mx/cfd/3}Emisor: атрибут 'RegimenFiscal'обов'язковий, "
 "але відсутній."
 
-#: ../../accounting/localizations/mexico.rst:550
+#: ../../accounting/localizations/mexico.rst:552
 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"
@@ -4057,7 +4367,7 @@ msgstr ""
 "можливих цін SAT, можливо, що ви забули слідкувати за міркуваннями про схему"
 " оподаткування."
 
-#: ../../accounting/localizations/mexico.rst:557
+#: ../../accounting/localizations/mexico.rst:559
 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 "
@@ -4067,7 +4377,7 @@ msgstr ""
 "правильний код (це перші 3 номери в назві), наприклад, для тесту, який слід "
 "встановити на 601, він буде виглядати як зображення."
 
-#: ../../accounting/localizations/mexico.rst:565
+#: ../../accounting/localizations/mexico.rst:567
 msgid ""
 "For testing purposes this value must be *601 - General de Ley Personas "
 "Morales* which is the one required for the demo VAT."
@@ -4075,7 +4385,7 @@ msgstr ""
 "Для цілей тестування це значення має бути *601 - General de Ley Personas "
 "Morales*, який є необхідним для демонстраційного ПДВ."
 
-#: ../../accounting/localizations/mexico.rst:570
+#: ../../accounting/localizations/mexico.rst:572
 msgid ""
 ":2:0:ERROR:SCHEMASV:SCHEMAV_CVC_ENUMERATION_VALID: Element "
 "'{http://www.sat.gob.mx/cfd/3}Comprobante', attribute 'FormaPago': [facet "
@@ -4089,11 +4399,11 @@ msgstr ""
 "'04', '05', '06', '08', '12', '13', '14', '15', '17', '23', '24', '25', "
 "'26', '27', '28', '29', '30', '99'}"
 
-#: ../../accounting/localizations/mexico.rst:573
+#: ../../accounting/localizations/mexico.rst:575
 msgid "**Solution:** The payment method is required on your invoice."
 msgstr "**Рішення:** У вашому рахунку-фактурі потрібен спосіб оплати."
 
-#: ../../accounting/localizations/mexico.rst:580
+#: ../../accounting/localizations/mexico.rst:582
 msgid ""
 ":2:0:ERROR:SCHEMASV:SCHEMAV_CVC_ENUMERATION_VALID: Element "
 "'{http://www.sat.gob.mx/cfd/3}Comprobante', attribute 'LugarExpedicion': "
@@ -4117,21 +4427,21 @@ msgstr ""
 "'{http://www.sat.gob.mx/cfd/3}Emisor': The attribute 'Rfc' is required but "
 "missing."
 
-#: ../../accounting/localizations/mexico.rst:585
+#: ../../accounting/localizations/mexico.rst:587
 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 `3. Set you legal "
-"information in the company`."
+"the required fields for your address following the step :ref:`mx-legal-"
+"info`."
 msgstr ""
-"**Рішення:** Ви повинні правильно вказати адресу в своїй компанії, це "
-"обов'язкова група полів, ви можете перейти до конфігурації вашої компанії "
-":menuselection:`Налаштування --> Користувачі та компанії --> Компанії` і "
-"заповніть всі необхідні поля для вашої адреси, виконавши крок `3. Встановіть"
-" юридичну інформацію в компанії`."
+"**Рішення:** Ви повинні правильно встановити адресу у вашій компанії, це "
+"обов'язкова група полів, ви можете перейти до налаштування вашої компанії "
+"на: menuselection: `Налаштування --> Користувачі та компанії --> Компанії` "
+"та заповнити всі необхідні поля для вашої адреси після кроку :ref:`mx-legal-"
+"info`."
 
-#: ../../accounting/localizations/mexico.rst:593
+#: ../../accounting/localizations/mexico.rst:595
 msgid ""
 ":2:0:ERROR:SCHEMASV:SCHEMAV_CVC_DATATYPE_VALID_1_2_1: Element "
 "'{http://www.sat.gob.mx/cfd/3}Comprobante', attribute 'LugarExpedicion': '' "
@@ -4143,7 +4453,7 @@ msgstr ""
 "is not a valid value of the atomic type "
 "'{http://www.sat.gob.mx/sitio_internet/cfd/catalogos}c_CodigoPostal'."
 
-#: ../../accounting/localizations/mexico.rst:596
+#: ../../accounting/localizations/mexico.rst:598
 msgid ""
 "**Solution:** The postal code on your company address is not a valid one for"
 " Mexico, fix it."
@@ -4151,7 +4461,7 @@ msgstr ""
 "**Рішення:** Поштовий індекс на адресу вашої компанії не є дійсним для "
 "Мексики, виправте це."
 
-#: ../../accounting/localizations/mexico.rst:604
+#: ../../accounting/localizations/mexico.rst:606
 msgid ""
 ":18:0:ERROR:SCHEMASV:SCHEMAV_CVC_COMPLEX_TYPE_4: Element "
 "'{http://www.sat.gob.mx/cfd/3}Traslado': The attribute 'TipoFactor' is "
@@ -4165,7 +4475,7 @@ msgstr ""
 "Element '{http://www.sat.gob.mx/cfd/3}Traslado': The attribute 'TipoFactor' "
 "is required but missing.\", '')"
 
-#: ../../accounting/localizations/mexico.rst:608
+#: ../../accounting/localizations/mexico.rst:610
 msgid ""
 "**Solution:** Set the mexican name for the tax 0% and 16% in your system and"
 " used on the invoice."
@@ -4513,7 +4823,7 @@ msgstr "TVA 7.7%"
 #: ../../accounting/localizations/switzerland.rst:111
 #: ../../accounting/localizations/switzerland.rst:113
 msgid "Purchases"
-msgstr "Закупівлі"
+msgstr "Купівлі"
 
 #: ../../accounting/localizations/switzerland.rst:99
 #: ../../accounting/localizations/switzerland.rst:101
@@ -4834,137 +5144,6 @@ msgstr ""
 msgid "Explanation of the fields:"
 msgstr "Пояснення полів: "
 
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Status"
-msgstr "Статус"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "When an asset is created, the status is 'Draft'."
-msgstr "Коли актив створено, статус є \"Чернеткою\"."
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid ""
-"If the asset is confirmed, the status goes in 'Running' and the depreciation"
-" lines can be posted in the accounting."
-msgstr ""
-"Якщо актив підтверджено, статус переходить у \"Запуск\", а рядки амортизації"
-" можуть бути опубліковані в бухгалтерському обліку."
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid ""
-"You can manually close an asset when the depreciation is over. If the last "
-"line of depreciation is posted, the asset automatically goes in that status."
-msgstr ""
-"Ви можете вручну закрити актив, коли амортизація закінчиться. Якщо "
-"опубліковано останній рядок амортизації, актив автоматично переходить у цей "
-"статус."
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Category"
-msgstr "Категорія"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Category of asset"
-msgstr "Категорія основних засобів"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Date"
-msgstr "Дата"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Date of asset"
-msgstr "Дата активу"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Gross Value"
-msgstr "Валова вартість основних засобів"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Gross value of asset"
-msgstr "Валова вартість активу"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Salvage Value"
-msgstr "Ліквідаційна вартість"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "It is the amount you plan to have that you cannot depreciate."
-msgstr "Це сума, яку ви плануєте мати, але не можете знецінити. "
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Computation Method"
-msgstr "Метод обчислення"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Choose the method to use to compute the amount of depreciation lines."
-msgstr "Виберіть метод для обчислення суми рядків амортизації."
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid ""
-"* Linear: Calculated on basis of: Gross Value / Number of Depreciations"
-msgstr ""
-"* Лінійний: Розраховується на основі: валової вартості/кількості амортизацій"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid ""
-"* Degressive: Calculated on basis of: Residual Value * Degressive Factor"
-msgstr ""
-"* Регресивний: Розраховується на основі: залишкової вартості * Регресивного "
-"фактора"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Time Method Based On"
-msgstr "Часовий метод на основі"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Choose the method to use to compute the dates and number of entries."
-msgstr "Виберіть метод для обчислення дати та кількості записів."
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid ""
-"* Number of Entries: Fix the number of entries and the time between 2 "
-"depreciations."
-msgstr ""
-"* Кількість записів: Виправлення кількості записів та часу між двома "
-"амортизаціями."
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid ""
-"* Ending Date: Choose the time between 2 depreciations and the date the "
-"depreciations won't go beyond."
-msgstr ""
-"* Дата закінчення: Виберіть час між двома амортизацією та датою, коли "
-"амортизація не перевищить."
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Prorata Temporis"
-msgstr "З дати експлуатації"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid ""
-"Indicates that the first depreciation entry for this asset have to be done "
-"from the purchase date instead of the first January / Start date of fiscal "
-"year"
-msgstr ""
-"Вказує, що перший амортизаційна запис для цього активу має бути здійснений з"
-" дати придбання замість першого січня/дати початку фінансового року"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Number of Depreciations"
-msgstr "Кількість амортизацій"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "The number of depreciations needed to depreciate your asset"
-msgstr "Кількість амортизацій, необхідних для знецінення вашого активу"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Number of Months in a Period"
-msgstr "Кількість місяців у періоді"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "The amount of time between two depreciations, in months"
-msgstr "Сума часу між двома амортизаціями, у місяцях"
-
 #: ../../accounting/others/adviser/assets.rst:88
 msgid "Try creating an *Asset* in our online demonstration"
 msgstr "Спробуйте створити *Актив* в нашій демо-версії онлайн"
@@ -5124,7 +5303,7 @@ msgstr ""
 
 #: ../../accounting/others/adviser/budget.rst:35
 msgid "Budgetary Positions"
-msgstr "Позиції бюджету"
+msgstr "Бюджетні позиці"
 
 #: ../../accounting/others/adviser/budget.rst:37
 msgid ""
@@ -5287,15 +5466,11 @@ msgstr ""
 msgid ":doc:`../../receivables/customer_invoices/overview`"
 msgstr ":doc:`../../receivables/customer_invoices/overview`"
 
-#: ../../accounting/others/adviser/budget.rst:128
-msgid ":doc:`../../../purchase/overview/process/from_po_to_invoice`"
-msgstr ":doc:`../../../purchase/overview/process/from_po_to_invoice`"
-
-#: ../../accounting/others/adviser/budget.rst:130
+#: ../../accounting/others/adviser/budget.rst:129
 msgid "Go back in the budget list and find the Smith Project."
 msgstr "Поверніться до списку бюджетів та знайдіть проект Сміта."
 
-#: ../../accounting/others/adviser/budget.rst:132
+#: ../../accounting/others/adviser/budget.rst:131
 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 "
@@ -5305,7 +5480,7 @@ msgstr ""
 "рядки покупки, заброньовані в рахунках, і відображатиме їх у стовпчику "
 "**Фактична сума**."
 
-#: ../../accounting/others/adviser/budget.rst:141
+#: ../../accounting/others/adviser/budget.rst:140
 msgid ""
 "The theoretical amount represents the amount of money you theoretically "
 "could have spend / should have received in function of the date. When your "
@@ -5510,6 +5685,37 @@ msgstr ""
 "підтвердите, чи доходи поточного періоду у **звіті балансу** правильно "
 "відповідають балансу 0."
 
+#: ../../accounting/others/adviser/fiscalyear.rst:93
+msgid ":doc:`../configuration/fiscal_year`"
+msgstr ""
+
+#: ../../accounting/others/adviser/reverse_entry.rst:3
+msgid "Reverse an accounting entry automatically"
+msgstr ""
+
+#: ../../accounting/others/adviser/reverse_entry.rst:5
+msgid ""
+"You may want to automatically reverse an accounting entry at a specific "
+"date."
+msgstr ""
+
+#: ../../accounting/others/adviser/reverse_entry.rst:8
+msgid ""
+"This is, for example, used when you make a provision (e.g. provision for bad"
+" debt). When making the accounting entry for the provision, the amount you "
+"entered is only an estimated amount. You will only be sure of the amount at "
+"the end of the fiscal year. That's why, at that point, you want the "
+"accounting entry to be reversed to be able to enter the real loss that "
+"occurred."
+msgstr ""
+
+#: ../../accounting/others/adviser/reverse_entry.rst:15
+msgid ""
+"For this, you just have to tick the box \"Reverse Automatically\" on the "
+"journal entry and to define a reversal date. The accounting entry will be "
+"reversed at that date."
+msgstr ""
+
 #: ../../accounting/others/analytic.rst:3
 msgid "Analytic"
 msgstr "Аналітика"
@@ -5669,20 +5875,12 @@ msgstr "Закупівля товару"
 #: ../../accounting/others/analytic/purchases_expenses.rst:104
 msgid ""
 "We also need to buy a software for our customers. In the purchase app create"
-" a purchase order for the software product. (please refer to the following "
-"document: :doc:`../../../purchase/overview/process/from_po_to_invoice`). "
-"Within the line we can link the product's cost with the analytical account. "
-"Specify the order line and select the correct analytical account. Confirm "
-"the sale."
+" a purchase order for the software product. Within the line we can link the "
+"product's cost with the analytical account. Specify the order line and "
+"select the correct analytical account. Confirm the sale."
 msgstr ""
-"Нам також потрібно придбати програмне забезпечення для наших клієнтів. У "
-"додатку покупки створіть замовлення на придбання програмного забезпечення. "
-"(будь ласка, зверніться до наступної документації: "
-":doc:`../../../purchase/overview/process/from_po_to_invoice`). У межах рядка"
-" ми можемо поєднати вартість товару з аналітичним обліком. Вкажіть рядок "
-"замовлення та виберіть правильний аналітичний облік. Підтвердіть продаж."
 
-#: ../../accounting/others/analytic/purchases_expenses.rst:114
+#: ../../accounting/others/analytic/purchases_expenses.rst:113
 msgid ""
 "Accept the delivery and enter the invoice. Once the invoice is entered the "
 "cost price (**Vendor Price** field) will be booked in the analytical "
@@ -5692,11 +5890,11 @@ msgstr ""
 " собівартість (поле **Ціна постачальника**) буде зарахована на аналітичний "
 "облік."
 
-#: ../../accounting/others/analytic/purchases_expenses.rst:118
+#: ../../accounting/others/analytic/purchases_expenses.rst:117
 msgid "Subcontracting"
 msgstr "Субпідряд"
 
-#: ../../accounting/others/analytic/purchases_expenses.rst:120
+#: ../../accounting/others/analytic/purchases_expenses.rst:119
 msgid ""
 "The purchase module can be used in the same way as seen previously to handle"
 " subcontracting. if we purchase a service from another company we can re "
@@ -5709,16 +5907,16 @@ msgstr ""
 "правильний аналітичний облік. Нам просто потрібно створити правильний товар "
 "продавця."
 
-#: ../../accounting/others/analytic/purchases_expenses.rst:128
+#: ../../accounting/others/analytic/purchases_expenses.rst:127
 msgid "You can also track cost with timesheets, see: :doc:`timesheets`"
 msgstr ""
 "Ви також можете відстежувати вартість з табелем, дивіться: :doc:`timesheets`"
 
-#: ../../accounting/others/analytic/purchases_expenses.rst:131
+#: ../../accounting/others/analytic/purchases_expenses.rst:130
 msgid "Track costs in accounting"
 msgstr "Відстежуйте витрати в обліку"
 
-#: ../../accounting/others/analytic/purchases_expenses.rst:133
+#: ../../accounting/others/analytic/purchases_expenses.rst:132
 msgid ""
 "Now that everything is booked and points to the analytical account. Simply "
 "open it to check the costs related to that account."
@@ -5726,7 +5924,7 @@ msgstr ""
 "Тепер все, що реєструється, вказує на аналітичний облік. Просто відкрийте "
 "його, щоби перевірити витрати, пов'язані з цим обліком."
 
-#: ../../accounting/others/analytic/purchases_expenses.rst:136
+#: ../../accounting/others/analytic/purchases_expenses.rst:135
 msgid ""
 "Enter the accounting module, click on :menuselection:`Advisers --> Analytic "
 "Accounts --> Open Charts`."
@@ -5734,7 +5932,7 @@ msgstr ""
 "Введіть модуль бухгалтерського обліку, натисніть кнопку "
 ":menuselection:`Консультант --> Аналітичний облік --> Відкрити таблиці`."
 
-#: ../../accounting/others/analytic/purchases_expenses.rst:139
+#: ../../accounting/others/analytic/purchases_expenses.rst:138
 msgid ""
 "Select \"consulting pack - Smith\" and click on the cost and revenue button "
 "to have an overview of all cost linked to the account."
@@ -5742,7 +5940,7 @@ msgstr ""
 "Виберіть \"пакет консультацій - Smith\" і натисніть кнопку Вартість і дохід,"
 " щоби переглянути всі витрати, пов'язані з обліком."
 
-#: ../../accounting/others/analytic/purchases_expenses.rst:147
+#: ../../accounting/others/analytic/purchases_expenses.rst:146
 msgid ""
 "If you would like to have the revenue as well you should invoice the "
 "Consulting Pack in the Invoice menu and link the invoice line to this same "
@@ -6722,11 +6920,11 @@ msgstr "**Список типів рахунку**"
 
 #: ../../accounting/others/configuration/account_type.rst:27
 msgid "Receivable"
-msgstr "Розрахунки з дебіторами"
+msgstr "Дебітор"
 
 #: ../../accounting/others/configuration/account_type.rst:29
 msgid "Payable"
-msgstr "Розрахунки з кредиторами"
+msgstr "Кредитор"
 
 #: ../../accounting/others/configuration/account_type.rst:31
 msgid "Bank and Cash"
@@ -6742,7 +6940,7 @@ msgstr "Необоротні активи"
 
 #: ../../accounting/others/configuration/account_type.rst:37
 msgid "Prepayments"
-msgstr "Аванс"
+msgstr "Аванси"
 
 #: ../../accounting/others/configuration/account_type.rst:39
 msgid "Fixed Assets"
@@ -6750,7 +6948,7 @@ msgstr "Основні засоби"
 
 #: ../../accounting/others/configuration/account_type.rst:41
 msgid "Current Liabilities"
-msgstr "Короткострокові зобов'язання "
+msgstr "Короткострокові зобов’язання"
 
 #: ../../accounting/others/configuration/account_type.rst:43
 msgid "Non-current Liabilities"
@@ -6758,11 +6956,11 @@ msgstr "Довгострокові зобов'язання"
 
 #: ../../accounting/others/configuration/account_type.rst:45
 msgid "Equity"
-msgstr "Власний капітал"
+msgstr "Капітал"
 
 #: ../../accounting/others/configuration/account_type.rst:47
 msgid "Current Year Earnings"
-msgstr "Нерозподілений прибуток"
+msgstr "доходи поточного року"
 
 #: ../../accounting/others/configuration/account_type.rst:49
 msgid "Other Income"
@@ -6834,13 +7032,13 @@ msgid ""
 "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 "Теги"
+msgstr "Мітки"
 
 #: ../../accounting/others/configuration/account_type.rst:0
 msgid "Optional tags you may want to assign for custom reporting"
@@ -6848,11 +7046,12 @@ msgstr "Необов'язкові теги, які ви можете призн
 
 #: ../../accounting/others/configuration/account_type.rst:0
 msgid "Account Currency"
-msgstr "Валюта обліку"
+msgstr "Валюта рахунку"
 
 #: ../../accounting/others/configuration/account_type.rst:0
 msgid "Forces all moves for this account to have this account currency."
-msgstr "Усі переміщення для цього рахунку, щоби мати цю валюту обліку. "
+msgstr ""
+"Змушені переміщувати за цим рахунком, щоб мати валюту на цьому рахунку."
 
 #: ../../accounting/others/configuration/account_type.rst:0
 msgid "Internal Type"
@@ -6864,14 +7063,14 @@ msgid ""
 "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 "Дозвіл узгодження"
+msgstr "Дозволити узгодження"
 
 #: ../../accounting/others/configuration/account_type.rst:0
 msgid ""
@@ -6885,6 +7084,46 @@ msgstr ""
 msgid "View *Create Account* in our Online Demonstration"
 msgstr "Переглянути *Створити рахунок* у нашій демо-версії онлайн"
 
+#: ../../accounting/others/configuration/fiscal_year.rst:3
+msgid "Manage Fiscal Years"
+msgstr ""
+
+#: ../../accounting/others/configuration/fiscal_year.rst:5
+msgid ""
+"In most cases, the fiscal years last 12 months. If it is your case, you just"
+" have to define what is the last day of your fiscal year in the accounting "
+"settings. By default, it is set on the 31st December."
+msgstr ""
+
+#: ../../accounting/others/configuration/fiscal_year.rst:12
+msgid ""
+"However, there might be some exceptions. For example, if it is the first "
+"fiscal year of your business, it could last more or less than 12 months. In "
+"this case, some additional configuration is required."
+msgstr ""
+
+#: ../../accounting/others/configuration/fiscal_year.rst:16
+msgid ""
+"Go in :menuselection:`accounting --> configuration --> settings` and "
+"activate the fiscal years."
+msgstr ""
+
+#: ../../accounting/others/configuration/fiscal_year.rst:22
+msgid ""
+"You can then configure your fiscal years in :menuselection:`accounting --> "
+"configuration --> fiscal years`."
+msgstr ""
+
+#: ../../accounting/others/configuration/fiscal_year.rst:29
+msgid ""
+"You only have to create fiscal years if they last more or less than 12 "
+"months."
+msgstr ""
+
+#: ../../accounting/others/configuration/fiscal_year.rst:34
+msgid ":doc:`../adviser/fiscalyear`"
+msgstr ""
+
 #: ../../accounting/others/inventory.rst:3
 msgid "Inventory"
 msgstr "Склад"
@@ -7507,6 +7746,7 @@ msgstr ""
 
 #: ../../accounting/others/multicurrencies/exchange.rst:109
 #: ../../accounting/payables/pay/multiple.rst:153
+#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:68
 msgid ":doc:`../../bank/reconciliation/configure`"
 msgstr ":doc:`../../bank/reconciliation/configure`"
 
@@ -7830,7 +8070,7 @@ msgstr "Мультивалютні рахунки-фактури та рахун
 
 #: ../../accounting/others/multicurrencies/invoices_payments.rst:54
 msgid "Invoices"
-msgstr "Рахунки-фактури"
+msgstr "Рахунки"
 
 #: ../../accounting/others/multicurrencies/invoices_payments.rst:64
 #: ../../accounting/payables/supplier_bills.rst:3
@@ -8171,7 +8411,7 @@ msgstr "Список всіх ваших рахунків, згруповани
 
 #: ../../accounting/others/reporting/main_reports.rst:57
 msgid "Executive Summary"
-msgstr "Управлінський звіт"
+msgstr "Управлінський підсумок"
 
 #: ../../accounting/others/reporting/main_reports.rst:59
 msgid ""
@@ -8314,7 +8554,7 @@ msgstr ""
 
 #: ../../accounting/others/reporting/main_reports.rst:115
 msgid "Aged Payable"
-msgstr "Розрахунки з кредиторами"
+msgstr "Протермінована оплата"
 
 #: ../../accounting/others/reporting/main_reports.rst:117
 msgid ""
@@ -8328,7 +8568,7 @@ msgstr ""
 
 #: ../../accounting/others/reporting/main_reports.rst:125
 msgid "Aged Receivable"
-msgstr "Розрахунки з дебіторами"
+msgstr "Протермінована дебіторська заборгованість"
 
 #: ../../accounting/others/reporting/main_reports.rst:127
 msgid ""
@@ -8341,7 +8581,7 @@ msgstr ""
 
 #: ../../accounting/others/reporting/main_reports.rst:134
 msgid "Cash Flow Statement"
-msgstr "Звіт про рух грошових коштів"
+msgstr "Рух грошових коштів"
 
 #: ../../accounting/others/reporting/main_reports.rst:136
 msgid ""
@@ -9001,7 +9241,7 @@ msgstr ""
 
 #: ../../accounting/others/taxes/cash_basis_taxes.rst:72
 msgid "Tax Cash Basis Journal"
-msgstr "Журнал податку, нарахованого касовим методом"
+msgstr "Журнал касового методу податків"
 
 #: ../../accounting/others/taxes/cash_basis_taxes.rst:78
 msgid "Tax Received Account $15"
@@ -9937,7 +10177,7 @@ msgstr "Вступ до Бухобліку Odoo"
 
 #: ../../accounting/overview/main_concepts/intro.rst:11
 msgid "Transcript"
-msgstr "Транскрипція"
+msgstr "Опис"
 
 #: ../../accounting/overview/main_concepts/intro.rst:13
 msgid ""
@@ -10778,7 +11018,6 @@ msgid "15"
 msgstr "15"
 
 #: ../../accounting/overview/process_overview/customer_invoice.rst:117
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:89
 msgid "Payment"
 msgstr "Оплата"
 
@@ -11892,7 +12131,7 @@ msgstr "Технічне поле використовується для зру
 
 #: ../../accounting/payables/pay/check.rst:0
 msgid "Hide Payment Method"
-msgstr "Сховати метод платежу"
+msgstr "Сховати метод оплати"
 
 #: ../../accounting/payables/pay/check.rst:0
 msgid ""
@@ -11949,7 +12188,7 @@ msgid ""
 "printed check paper already has numbers or if the current numbering is "
 "wrong, you can change it in the journal configuration page."
 msgstr ""
-"Вибраний журнал налаштовано на друк номерів чеку. Якщо у вашому попередньо "
+"Вибраний журнал налаштовано на друк номерів чеків. Якщо у вашому попередньо "
 "надрукованому чеку вже є цифри або якщо поточна нумерація неправильна, її "
 "можна змінити на сторінці налаштування журналу."
 
@@ -12530,7 +12769,6 @@ msgstr ""
 
 #: ../../accounting/payables/pay/sepa.rst:132
 #: ../../accounting/receivables/customer_payments/credit_cards.rst:168
-#: ../../accounting/receivables/customer_payments/followup.rst:168
 #: ../../accounting/receivables/customer_payments/recording.rst:129
 msgid ":doc:`check`"
 msgstr ":doc:`check`"
@@ -13084,7 +13322,7 @@ msgstr ""
 
 #: ../../accounting/payables/supplier_bills/manage.rst:218
 msgid "Ordered quantities"
-msgstr "замовлені кількості"
+msgstr "По замовленій кількості"
 
 #: ../../accounting/payables/supplier_bills/manage.rst:220
 msgid "or Received quantities"
@@ -13118,222 +13356,80 @@ msgid "Customer Invoices"
 msgstr "Рахунки клієнтів"
 
 #: ../../accounting/receivables/customer_invoices/cash_discounts.rst:3
-msgid "How to setup cash discounts?"
-msgstr "Як налаштувати готівкові знижки?"
+msgid "Offer cash discounts"
+msgstr ""
 
 #: ../../accounting/receivables/customer_invoices/cash_discounts.rst:5
 msgid ""
-"Cash discounts are an incentive (usually a small percentage) that you offer "
-"to customers in return for paying a bill owed before the scheduled due date."
-" If used properly, cash discounts improve the Days Sales Outstanding aspect "
-"of a business's cash conversion cycle."
+"Cash discounts are incentives you can offer to customers to motivate them to"
+" pay within a specific time frame. For instance, you offer a 2% discount if "
+"the customer pays you within the first 5 days of the invoice, when it is due"
+" in 30 days. This approach can greatly improve your average collection "
+"period."
 msgstr ""
-"Готівкові знижки - це стимул (зазвичай невеликий відсоток), який ви "
-"пропонуєте клієнтам за плату за заборгованість перед запланованою датою. "
-"Якщо вони використовуються належним чином, готівкові знижки покращують "
-"недостачу оплати за день."
 
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:10
+#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:12
+msgid "Set up a cash discount"
+msgstr ""
+
+#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:14
 msgid ""
-"For example, a typical cash discount would be: you offer a 2% discount on an"
-" invoice due in 30 days if the customer were to pay within the first 5 days "
-"of receiving the invoice."
+"To set up a cash discount, go to :menuselection:`Accounting --> "
+"Configuration --> Management --> Payment Terms` and click on *Create*. Add a"
+" *Percent* type of term with a corresponding value (e.g. 98% of the total "
+"price for a 2% discount) and the number of days during which the offer is "
+"valid. You can also change the default balance term if needed."
 msgstr ""
-"Наприклад, типові гарантійні знижки: ви пропонуєте 2% знижки на рахунок-"
-"фактуру через 30 днів, якщо клієнт оплатить протягом перших 5 днів з моменту"
-" отримання рахунку-фактури."
 
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:18
-msgid "Payment terms"
-msgstr "Терміни оплати"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:20
-msgid ""
-"In order to manage cash discounts, we will use the payment terms concept of "
-"Odoo (From the Accounting module, go to :menuselection:`Configuration --> "
-"Management --> Payment terms --> Create`)."
+#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:25
+msgid "Start offering the cash discount"
 msgstr ""
-"Для управління грошовими знижками ми будемо використовувати концепцію умови "
-"оплати Odoo (з модуля бухгалтерського обліку перейдіть на "
-":menuselection:`Налаштування --> Управління -->  Умови оплати --> "
-"Створити`)."
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:24
-msgid ""
-"Let's start with the above example: a 2% discount on an invoice due in 30 "
-"days if the customer were to pay within the first 5 days."
-msgstr ""
-"Почнемо з наведеного вище прикладу: знижка 2% на рахунок-фактуру впродовж 30"
-" днів, якщо клієнт повинен оплатити протягом перших 5 днів."
 
 #: ../../accounting/receivables/customer_invoices/cash_discounts.rst:27
 msgid ""
-"A typical payment term of 30 days would have only one installment: balance "
-"in 30 days. But, in order to configure the cash discount, you can configure "
-"the payment term with two installments:"
+"Now, you can create a customer invoice and select the cash discount payment "
+"term you added. Once the invoice is validated, Odoo will automatically split"
+" the account receivables part of the journal entry into two installments "
+"having different due dates. Since the discounted price is already "
+"calculated, your payment controls will be simplified."
 msgstr ""
-"Типовий термін платежу 30 днів буде мати лише один внесок: залишок за 30 "
-"днів. Але, щоб налаштувати готівкову знижку, ви можете налаштувати термін "
-"платежу двома розстрочками:"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:31
-msgid "98% within 5 days"
-msgstr "98% протягом 5 днів"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:32
-msgid "balance within 30 days"
-msgstr "баланс протягом 30 днів"
 
 #: ../../accounting/receivables/customer_invoices/cash_discounts.rst:37
-msgid ""
-"To make it clear that it's not a payment term but a cash discount, don't "
-"forget to set a clear description that will appear on the invoice: Invoice "
-"is due within 30 days, but you can benefit from a 2% cash discount if you "
-"pay within 5 days."
+msgid "Grant the cash discount"
 msgstr ""
-"Щоб зрозуміти, що це не термін сплати, а знижка на готівку, не забудьте "
-"встановити чіткий опис, який відображатиметься в рахунку-фактурі: Рахунок-"
-"фактура повинен мати термін протягом 30 днів, але ви можете скористатись "
-"знижкою на 2%, якщо ви платити протягом 5 днів."
 
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:43
-msgid "Bank reconciliation model"
-msgstr "Модель узгодження банківської виписки"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:45
+#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:39
 msgid ""
-"In order to speed up the bank reconciliation process, we can create a model "
-"of entry for all cash discounts. To do that, from the Accounting application"
-" dashboard, click on the \"More\" link on the bank and choose the option "
-"\"Reconciliation Models\"."
+"The customer fulfilled the payment terms and therefore benefits from the "
+"cash discount. When you process the bank statement, match the payment with "
+"the related journal entry. Then, select the remaining cash discount and "
+"click on *Create Write-off* to reconcile it."
 msgstr ""
-"Для прискорення процесу банківського узгодження ми можемо створити модель "
-"вступу для всіх готівкових знижок. Для цього на інформаційній панелі "
-"програми бухобліку натисніть посилання \"Додатково\" на своєму банку та "
-"виберіть параметр \"Моделі узгодження\"."
 
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:53
-msgid "Create a new model for cash discounts as follow:"
-msgstr "Створіть нову модель для знижок готівки, як зазначено нижче:"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:55
-msgid "**Button Label**: Cash Discount"
-msgstr "**Напис на кнопці**: Грошова знижка"
+#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:48
+msgid ""
+"You can also create a dedicated reconciliation model to make the process "
+"easier. In this case, you should add a tax to the model based on the taxes "
+"applied to your invoices. This means that if you handle multiple tax rates, "
+"you need to create several reconciliation models. Note that depending on "
+"your localisation, you might already have a Cash Discount model available by"
+" default."
+msgstr ""
 
 #: ../../accounting/receivables/customer_invoices/cash_discounts.rst:56
-msgid "**Account**: Cash Discount (according to your country)"
-msgstr "**Рахунок**: Грошова знижка (за вашою країною)"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:57
-msgid "**Amount Type**: Percentage"
-msgstr "**Тип суми**: відсоток"
+msgid "Register the full payment"
+msgstr ""
 
 #: ../../accounting/receivables/customer_invoices/cash_discounts.rst:58
-msgid "**Amount**: 100%"
-msgstr "**Сума**: 100%"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:60
-msgid "**Taxes**: depending on your country, you may put a tax on the cash"
+msgid ""
+"In this case, the customer has not fulfilled the payment term and cannot "
+"benefit from the cash discount. When you process the bank statement, match "
+"the payment with the two related journal entries."
 msgstr ""
-"**Податки**: в залежності від вашої країни, ви можете стягнути податок з "
-"готівкової знижки,"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:60
-msgid "discount if taxes have to be deduced"
-msgstr "якщо податки повинні бути виведені"
 
 #: ../../accounting/receivables/customer_invoices/cash_discounts.rst:67
-msgid ""
-"Even if it's a 2% cash discount, set a 100% amount on the reconciliation "
-"model as it means 100% of the remaining balance (the 2%). You can use the "
-"same reconciliation model for all your cash discount. No need to create a "
-"model per payment term."
+msgid ":doc:`../../receivables/customer_invoices/payment_terms`"
 msgstr ""
-"Навіть якщо це 2% знижки на готівку, встановіть 100% суми на моделі "
-"узгодження, оскільки це означає, що 100% від залишку (2%). Ви можете "
-"використовувати таку ж модель узгодження для всієї вашої готівкової знижки. "
-"Не потрібно створювати моделі на термін платежу."
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:73
-msgid "Creating an invoice with a cash discount"
-msgstr "Створення рахунку-фактури з готівковою знижкою"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:75
-msgid ""
-"When you create a customer invoice, set the right payment term \"30 days, 2%"
-" cash discount\" right after having selected the customer."
-msgstr ""
-"Створюючи рахунок-фактуру клієнта, встановіть правильний термін оплати \"30 "
-"днів, 2% готівкою\" відразу після вибору клієнта"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:81
-msgid ""
-"Once the invoice is validated, Odoo will automatically split the account "
-"receivable part of the journal entry with two installments having a "
-"different due date: 98% within 5 days, 2% within 30 days."
-msgstr ""
-"Після того, як рахунок-фактуру буде підтверджено, Odoo автоматично "
-"розподілить частину журналу, що підлягає отриманню, з двома частками, що "
-"мають інший строк: 98% протягом 5 днів, 2% протягом 30 днів."
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:92
-msgid "Paying the invoice with a cash discount"
-msgstr "Оплата рахунка-фактури за допомогою готівкової знижки"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:94
-msgid ""
-"If the customer pays with a cash discount, when processing the bank "
-"statement, you will match the payment (98%) with the related line in the "
-"journal entry."
-msgstr ""
-"Якщо клієнт сплачує готівкову знижку, під час обробки виписки з банку ви "
-"підраховуєте платіж (98%) з відповідним рядком у журналі."
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:101
-msgid ""
-"As you can see in the above screenshot, when selecting the customer, you "
-"also see the 2% remaining of 3$. If you want to accept the cash discount (if"
-" the customer paid within the 5 days), you can click on this line with 2%, "
-"click on \"Open Balance\", and select your \"Cash Discount\" reconciliation "
-"model. That way, the invoice is marked as fully paid."
-msgstr ""
-"Як ви можете бачити на знімку екрана вище, при виборі клієнта ви також "
-"бачите 2%, що залишилися від 3 доларів. Якщо ви хочете прийняти готівкову "
-"знижку (якщо клієнт платив протягом 5 днів), ви можете натиснути на цей "
-"рядок з 2%, натиснути на \"Відкрити баланс\" та вибрати модель узгодження "
-"\"Грошові знижки\". Таким чином, рахунок-фактура позначається як повністю "
-"оплачена."
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:109
-msgid ""
-"from now on, matching the remaining 2% has to be done manually. In the "
-"future, we plan to automate the reconciliation of the 2% if the 98% are paid"
-" on time."
-msgstr ""
-"відтепер відповідний залишок 2% повинен бути виконаний вручну. У майбутньому"
-" ми плануємо автоматизувати узгодження 2%, якщо 98% платять своєчасно."
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:113
-msgid "Paying the invoice in full"
-msgstr "Оплата рахунку-фактури в повному обсязі"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:115
-msgid ""
-"If the customer pays the invoice fully, without benefiting from the cash "
-"discount, you will reconcile the payment (in full) with the two lines from "
-"the invoice (98% and 2%). Just click on the two lines to match them with the"
-" payment."
-msgstr ""
-"Якщо клієнт повністю сплачує рахунок-фактуру, не користуючись вашою знижкою,"
-" ви зможете узгодити оплату (в повному обсязі) з двома рядками з рахунку-"
-"фактури (98% та 2%). Просто натисніть два рядки, щоби відповідати їх "
-"платежу."
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:125
-#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:116
-#: ../../accounting/receivables/customer_invoices/installment_plans.rst:86
-msgid ":doc:`overview`"
-msgstr ":doc:`overview`"
 
 #: ../../accounting/receivables/customer_invoices/cash_rounding.rst:2
 msgid "Set up cash roundings"
@@ -13638,6 +13734,11 @@ msgstr ""
 "Щоб проаналізувати всі ваші поточні контракти з доходом майбутніх періодів, "
 "можна скористатися меню Звітування > Аналіз доходів майбутніх періодів."
 
+#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:116
+#: ../../accounting/receivables/customer_invoices/installment_plans.rst:86
+msgid ":doc:`overview`"
+msgstr ":doc:`overview`"
+
 #: ../../accounting/receivables/customer_invoices/installment_plans.rst:3
 msgid "How to define an installment plan on customer invoices?"
 msgstr "Як визначити платіж за рахунками клієнта?"
@@ -14316,375 +14417,7 @@ msgstr ""
 
 #: ../../accounting/receivables/customer_payments.rst:3
 msgid "Customer Payments"
-msgstr "Платежі клієнтів"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:3
-msgid "How to automate customer follow-ups with plans?"
-msgstr "Як автоматизувати нагадування клієнтам з планами в Odoo?"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:5
-msgid ""
-"With the Odoo Accounting application, you get a dynamic aged receivable "
-"report, customer statements and you can easily send them to customers."
-msgstr ""
-"Завдяки додатку Бухоблік Odoo ви отримаєте динамічний звіт протермінованої "
-"заборгованості, нагадування клієнтам, і ви зможете легко відправити їх "
-"клієнтам."
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:8
-msgid ""
-"If you want to go further in the automation of the credit collection "
-"process, you can use follow-up plans. They will help you automate all the "
-"steps to get paid, by triggering them at the right time: send customer "
-"statements by emails, send regular letter (through the Docsaway "
-"integration), create a task to manually call the customer, etc..."
-msgstr ""
-"Якщо ви хочете піти далі в процесі автоматизації процесу збору кредитів, ви "
-"можете використовувати подальші плани. Вони допоможуть вам автоматизувати "
-"всі кроки, щоб запустити їх у потрібний час: надсилати нагадування клієнтам "
-"електронною поштою, надсилати звичайну листівку (через інтеграцію з "
-"Docsaway), створити завдання, щоб вручну зателефонувати клієнту тощо..."
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:14
-msgid "Here is an example of a plan:"
-msgstr "Ось приклад плану:"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:17
-msgid "When?"
-msgstr "Коли?"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:17
-msgid "What?"
-msgstr "Що?"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:17
-msgid "Who?"
-msgstr "Хто?"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:19
-msgid "3 days before due date"
-msgstr "За 3 дні до закінчення терміну оплати"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:19
-msgid "Email"
-msgstr "Електронна пошта"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:19
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:21
-msgid "automated"
-msgstr "Автоматично"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:21
-msgid "1 day after due date"
-msgstr "1 день після закінчення терміну оплати"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:21
-msgid "Email + Regular Letter"
-msgstr "Електронна пошта + звичайний лист"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:23
-msgid "15 days after due date"
-msgstr "Через 15 днів після закінчення терміну дії"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:23
-msgid "Call the customer"
-msgstr "Дзвінок клієнту"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:23
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:25
-msgid "John Mac Gregor"
-msgstr "Джон Мак Грегор"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:25
-msgid "35 days after due date"
-msgstr "Через 35 днів після закінчення терміну дії"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:25
-msgid "Email + Letter + Call"
-msgstr "Електронна пошта + Лист + Дзвінок "
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:27
-msgid "60 days after due date"
-msgstr "Через 60 днів після закінчення терміну дії"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:27
-msgid "Formal notice"
-msgstr "Офіційне повідомлення"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:27
-msgid "Bailiff"
-msgstr "Виконавчий суд"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:34
-msgid "Install Reminder Module"
-msgstr "Встановіть модуль нагадування"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:36
-msgid ""
-"You must start by activating the feature, using the menu "
-":menuselection:`Configuration --> Settings` of the Accounting application. "
-"From the settings screen, activate the feature **Enable payment follow-up "
-"management**."
-msgstr ""
-"Ви повинні почати, активуючи цю функцію, за допомогою меню  "
-":menuselection:`Налаштування --> Налаштування` в додатку Бухоблік. З екрана "
-"налаштувань активуйте функцію **Увімкнення керування нагадуванням платежу**."
-" "
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:44
-msgid "Define Payment Follow-ups Levels"
-msgstr "Визначте наступні рівні нагадування платежів"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:46
-msgid ""
-"To automate customer follow ups, you must configure your follow–up levels "
-"using the menu :menuselection:`Accounting --> Configuration --> Payment "
-"Follow-ups`. You should define one and only one follow-up plan per company."
-msgstr ""
-"Щоб автоматизувати подальші операції з клієнтом, потрібно налаштувати "
-"наступні рівні за допомогою меню :menuselection:`Бухоблік --> Налаштування "
-"--> Нагадування платежів`. Ви повинні визначити єдиний план подальшої "
-"діяльності для кожної компанії."
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:50
-msgid ""
-"The levels of follow-up are relative to the due date; when no payment term "
-"is specified, the invoice date will be considered as the due date."
-msgstr ""
-"Рівень нагадування є відносно строку виконання; коли термін оплати не "
-"вказано, дата рахунку буде розглядатися як термін оплати."
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:53
-msgid ""
-"For each level, you should define the number of days and create a note which"
-" will automatically be added into the reminder letter."
-msgstr ""
-"Для кожного рівня вам слід визначити кількість днів і створити примітку, яка"
-" буде автоматично додана до листа нагадування."
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:59
-msgid "Odoo defines several actions for every reminder:"
-msgstr "Odoo визначає декілька дій для кожного нагадування:"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:61
-msgid ""
-"**Manual Action:** assign a responsible that will have to call the customer"
-msgstr ""
-"**Ручні дії**: призначити відповідальному, який повинен буде зателефонувати "
-"клієнту"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:62
-msgid "**Send an Email:** send an email to customer using the provided text"
-msgstr ""
-"**Надіслати електронний лист**: надішліть електронний лист клієнту, "
-"використовуючи наданий текст"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:63
-msgid ""
-"**Send a Letter:** send a letter by regular mail, using the provided note"
-msgstr ""
-"**Надіслати лист**: надсилайте лист звичайною поштою, використовуючи надану "
-"примітку"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:69
-msgid ""
-"As you need to provide a number of days relative to the due date, you can "
-"use a negative number. As an example, if an invoice is issued the January "
-"1st but the due date is January 20, if you set a reminder 3 days before the "
-"due date, the customer may receive an email in January 17."
-msgstr ""
-"Оскільки вам потрібно вказати декілька днів у порівнянні з терміном "
-"виконання, ви можете використовувати негативний номер. Наприклад, якщо "
-"рахунок-фактура видається 1 січня, але термін сплати - 20 січня, якщо ви "
-"встановите нагадування за 3 дні до встановленої дати, клієнт може отримати "
-"електронний лист 17 січня."
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:76
-msgid "Doing your weekly follow-ups"
-msgstr "Робіть щотижневі нагадування"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:78
-msgid ""
-"Once everything is setup, Odoo will prepare follow-up letters and emails "
-"automatically for you. All you have to do is to the menu "
-":menuselection:`Sales --> Customers Statement` in the accounting "
-"application."
-msgstr ""
-"Після того, як все налаштовано, Odoo автоматично підготує для вас листи та "
-"електронні листи. Все, що вам потрібно зробити, це перейти до меню "
-":menuselection:`Продажі --> Нагадування клієнтам у бухгалтерському додатку."
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:85
-msgid ""
-"Odoo will automatically propose you actions based on the follow-up plan you "
-"defined, invoices to pay and payment received."
-msgstr ""
-"Odoo автоматично запропонує вам дії на основі визначеного вами подальшого "
-"плану, рахунків-фактур та отриманих платежів."
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:88
-msgid ""
-"You can use this menu every day, once a week or once a month. You do not "
-"risk to send two times the same reminder to your customer. Odoo only "
-"proposes you the action you have to do. If you do it every day, you will "
-"have a few calls to do per day. If you do it once a month, you will have "
-"much more work once you do it."
-msgstr ""
-"Ви можете використовувати це меню щодня, раз на тиждень або один раз на "
-"місяць. Ви не ризикуєте надіслати два рази одне і те ж нагадування своєму "
-"клієнту. Odoo пропонує вам лише ту дію, яку потрібно зробити. Якщо ви робите"
-" це кожного дня, у вас буде кілька дзвінків, щоб зробити їх за день. Якщо ви"
-" робите це один раз на місяць, ви будете мати набагато більше роботи, як "
-"тільки ви це зробите."
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:94
-msgid ""
-"It's up to you to organize the way you want to work. But it's a good "
-"practice to reconcile your bank statements before launching the follow-ups. "
-"That way, all paid invoices will be reconciled and you will not send a "
-"follow-up letter to a customer that already paid his invoice."
-msgstr ""
-"Вам потрібно організувати спосіб роботи. Але хорошою практикою є узгодження "
-"банківських виписок перед початком подальших дій. Таким чином, всі сплачені "
-"рахунки-фактури будуть узгоджені, і ви не надсилатимете подальшого листа "
-"клієнту, який вже сплатив рахунок-фактуру."
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:99
-msgid "From a customer follow-up proposition, you can:"
-msgstr "З додаткової пропозиції клієнту ви можете:"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:101
-msgid "Get the customer information to contact him"
-msgstr "Отримайте інформацію про клієнтів, щоб зв'язатися з ним"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:103
-msgid "Drill down to the customer information form by clicking on its name"
-msgstr "Розгорніть інформацію про форму клієнта, натиснувши її назву"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:105
-msgid "Change the text (or the email or letter) and adapt to the customer"
-msgstr ""
-"Змініть текст (або адресу електронної пошти або листа) та застосуйте його до"
-" клієнта"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:107
-msgid ""
-"Change the colored dot to mark the customer as being a good, normal or bad "
-"debtor"
-msgstr ""
-"Змініть кольорову крапку, щоб позначити клієнта як хорошого, нормального або"
-" поганого дебітора"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:110
-msgid "Log a note is you called the customer"
-msgstr "Введіть нотатку, яку ви називаєте клієнтом"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:112
-msgid "Exclude some invoices from the statement table (litigation)"
-msgstr "Виключити деякі рахунки-фактури з таблиці виписок (судова практика)"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:114
-msgid "Send an email with the statement"
-msgstr "Надішліть електронний лист із заявою"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:116
-msgid ""
-"Print a letter, or send a regular mail (if you installed the Docsaway "
-"integration)"
-msgstr ""
-"Надрукуйте лист або надсилайте звичайну пошту (якщо ви встановили інтеграцію"
-" Docsaway)"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:119
-msgid ""
-"Plan the next reminder (but it's better to keep in automatic mode so that "
-"Odoo will stick to the follow-up plan of the company)"
-msgstr ""
-"Заплануйте наступне нагадування (але краще тримати це в автоматичному "
-"режимі, щоб Odoo дотримувалося плану подальшої роботи компанії)"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:122
-msgid "Drill down to an invoice"
-msgstr "Заглибтеся у рахунок-фактуру"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:124
-msgid ""
-"Change the expected payment date of an invoice (thus, impacting the next "
-"time Odoo will propose you to send a reminder)"
-msgstr ""
-"Змініть очікувану дату оплати рахунку-фактури (таким чином, ви впливаєте на "
-"наступний раз, коли Odoo запропонує вам надіслати нагадування)"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:128
-msgid ""
-"You can force a customer statement, even if Odoo do not proposes you to do "
-"it, because it's not the right date yet. To do this, you should go to the "
-"Aged Receivable report (in the report menu of the Accounting application). "
-"From this report, you can click on a customer to get to his customer "
-"statement."
-msgstr ""
-"Ви можете примусити нагадування клієнту, навіть якщо Odoo не запропонує вам "
-"це зробити, тому що це ще не правильна дата. Для цього ви повинні перейти до"
-" звіту протермінованих дебіторів (в меню звіту Бухобліку). З цього звіту ви "
-"можете натиснути клієнта, щоб дістатись до свого нагадування клієнту."
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:135
-msgid "How to exclude an invoice from auto follow up?"
-msgstr "Як виключити рахунок-фактуру з автоматичного відстеження?"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:137
-msgid "To see all **overdue invoices** or **on need of action**,"
-msgstr ""
-"Щоби побачити всі **протерміновані рахунки-фактури** або **необхідність "
-"вжити заходів**,"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:139
-msgid "Go to :menuselection:`Accounting --> Sales --> Customers Statement`"
-msgstr ""
-"Перейдіть до :menuselection:`Бухобліку --> Продажі --> Звірка з клієнтами`"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:145
-msgid "Exclude a specific invoice for a specific date"
-msgstr "Виключіть конкретний рахунок-фактуру за певну дату"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:147
-msgid ""
-"Odoo can exclude an invoice from follow-ups actions for specific date by "
-"clicking on **Log a Note**, then choose one of the ready options (*one "
-"week*, *two weeks*, *one month*, *two months*), So Odoo will calculate the "
-"required date according to the current date."
-msgstr ""
-"Odoo може виключити рахунок-фактуру з подальших дій за певну дату, "
-"натиснувши кнопку **Ввести нотатку**, а потім виберіть один із готових "
-"варіантів (*один тиждень*, *два тижні*, *один місяць*, *два місяці*), так "
-"Odoo обчислить потрібну дату відповідно до поточної дати."
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:155
-msgid ""
-"Another way to achieve it is the following: click on the required invoice, "
-"then choose **Change expected payment date/note**, then enter a new payment "
-"date and note."
-msgstr ""
-"Іншим способом досягти цього є: натисніть потрібний рахунок-фактуру, потім "
-"виберіть **Змінити прогнозовану дату платежу/нотатку**, а потім введіть нову"
-" дату платежу та примітку."
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:162
-msgid "Exclude a specific invoice forever"
-msgstr "Виключте певний рахунок-фактуру назавжди"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:164
-msgid ""
-"Odoo can exclude an invoice for a specific customer by clicking on the "
-"checkbox **Excluded**"
-msgstr ""
-"Odoo може виключити рахунок-фактуру для конкретного клієнта, натиснувши "
-"прапорець **Виключено**"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:168
-msgid "If you click on **History**, you can see all follow ups actions."
-msgstr ""
-"Якщо ви натискаєте **Історія**, ви зможете бачити усі дії нагадувань. "
+msgstr "Платежі клієнта"
 
 #: ../../accounting/receivables/customer_payments/check.rst:3
 msgid "How to register customer payments by checks?"
@@ -15193,7 +14926,6 @@ msgstr ""
 "бухобліку на відповідний банківський рахунок)."
 
 #: ../../accounting/receivables/customer_payments/credit_cards.rst:166
-#: ../../accounting/receivables/customer_payments/followup.rst:167
 msgid ":doc:`recording`"
 msgstr ":doc:`recording`"
 
@@ -15208,305 +14940,95 @@ msgid ":doc:`followup`"
 msgstr ":doc:`followup`"
 
 #: ../../accounting/receivables/customer_payments/followup.rst:3
-msgid "How to get paid and organize customer follow-ups?"
-msgstr "Як отримати плату та організовувати подальші нагадування клієнту?"
+msgid "Follow-up on invoices and get paid faster"
+msgstr ""
 
 #: ../../accounting/receivables/customer_payments/followup.rst:5
 msgid ""
-"Getting paid and organizing customer reminders is always a difficult task, "
-"however it is critical for the health of the company to stay diligent about "
-"outstanding receivables. Fortunately, Odoo provides the right tools to track"
-" receivables, automate customer statements, and measure your performance."
+"It is essential for your business to collect payments when they are overdue."
+" Odoo will help you identify payments that are late and will allow you to "
+"send the appropriate reminders."
 msgstr ""
-"Отримання платні та організація нагадувань клієнтів завжди є важким "
-"завданням, однак для \"профілактики\" компанії важливо залишатися ретельним "
-"стосовно неузгоджених вхідних платежів. На щастя, Odoo надає потрібні "
-"інструменти для відстеження неузгоджених платжеів, автоматизації заяв "
-"клієнтів і вимірювання ефективності."
 
-#: ../../accounting/receivables/customer_payments/followup.rst:12
-msgid "Customer follow-ups: A step by step guide"
-msgstr "Нагадування клієнтів: покроковий посібник"
+#: ../../accounting/receivables/customer_payments/followup.rst:10
+msgid "Manage your follow-ups"
+msgstr ""
 
-#: ../../accounting/receivables/customer_payments/followup.rst:15
-msgid "Cleaning up outstanding payments"
-msgstr "Очищення неузгоджених платежів"
+#: ../../accounting/receivables/customer_payments/followup.rst:13
+msgid ""
+"We recommend that you reconcile your bank statements before launching your "
+"follow-up process. It will avoid you the trouble of sending a statement to a"
+" customer that has already paid you."
+msgstr ""
 
 #: ../../accounting/receivables/customer_payments/followup.rst:17
 msgid ""
-"If you have any unreconciled transactions in your bank account, you will "
-"need to process them first before you begin analyzing your customers "
-"statements. This ensures that you have recorded all of the latest customer "
-"payments before sending out reminders to any customers with outstanding "
-"balances."
+"The overdue invoices you need to follow-up on are available by default in "
+":menuselection:`Accounting --> Sales --> Follow-up Reports`. There, you can "
+"easily send a reminder by email or print it as a letter. Then, you can click"
+" on the *Done* button to view the next follow-up that needs your attention."
 msgstr ""
-"Якщо у вас є будь-які незгоджені транзакції на вашому банківському рахунку, "
-"вам доведеться їх обробити перш ніж розпочати аналіз заяв ваших клієнтів. Це"
-" гарантує, що ви записали всі останні платежі клієнтів, перш ніж надсилати "
-"нагадування будь-яким клієнтам із неузгодженими залишками."
 
-#: ../../accounting/receivables/customer_payments/followup.rst:27
-msgid "Checking the Aged Receivables report"
-msgstr "Перевірка звіту протермінованої дебіторська заборгованості"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:29
+#: ../../accounting/receivables/customer_payments/followup.rst:23
 msgid ""
-"After you have reconciled all of your bank accounts, you can then generate "
-"an accurate Aged Receivables Report from the Reports menu. This report will "
-"display all of the customers and their outstanding balances on open "
-"invoices."
+"Otherwise, if now is not the time for a reminder, click on *Remind me "
+"later*. You will get the next report according to the *Next Reminder Date* "
+"set on the statement."
 msgstr ""
-"Після того, як ви узгодили всі свої банківські рахунки, ви зможете створити "
-"точний звіт протермінованої дебіторської заборгованості в меню Звіти. Цей "
-"звіт відображатиме всіх клієнтів та залишок коштів за відкритими рахунками-"
-"фактурами."
 
-#: ../../accounting/receivables/customer_payments/followup.rst:37
+#: ../../accounting/receivables/customer_payments/followup.rst:28
 msgid ""
-"The report displays this information in time increments to better paint a "
-"picture of the outstanding balances your customers hold and for how long "
-"they have held these outstanding balances. You can then appropriately focus "
-"your efforts on the appropriate customers."
+"To avoid sending too many reminders in a short period of time, change the "
+"number of days calculated between each report by going to "
+":menuselection:`Accounting --> Configuration --> Settings --> Payment "
+"Follow-up`."
+msgstr ""
+
+#: ../../accounting/receivables/customer_payments/followup.rst:33
+msgid ""
+"You can also set a trust level for your customers by marking them as bad, "
+"normal or good debtors on the follow-up reports."
+msgstr ""
+
+#: ../../accounting/receivables/customer_payments/followup.rst:40
+msgid "Send reminders in batch"
 msgstr ""
-"У звіті ця інформація відображається зі збільшенням часу, аби краще "
-"намалювати зображення неузгоджених залишків, що зберігаються вашими "
-"клієнтами, та з часом, протягом якого вони мають власні неузгоджені залишки."
-" Тоді ви можете належним чином зосередити свої зусилля на відповідних "
-"клієнтів."
 
 #: ../../accounting/receivables/customer_payments/followup.rst:42
 msgid ""
-"You can then select any of the customers on this list and Odoo will open up "
-"their invoice details in the form of the Customer Follow-Up letter, also "
-"known as the **Customer Statement**."
+"To get your follow-up process easier, you can send reminder emails in batch "
+"from your follow-up reports page. Select all the reports you would like to "
+"process, click on *Action* and then on *Process Follow-ups*. A pdf document "
+"containing all of the follow-up letters for you to print will also be "
+"automatically generated."
 msgstr ""
-"Потім ви можете вибрати будь-якого з клієнтів у цьому списку, і Odoo відкриє"
-" свої дані про рахунки-фактури у вигляді листа з подальшим зверненням "
-"клієнта, також відомий як **Звірка з клієнтом**."
 
-#: ../../accounting/receivables/customer_payments/followup.rst:49
-msgid "From the customer statement, you can:"
-msgstr "Зі звірки з клієнтом ви можете:"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:51
-msgid "Change and customize the message that is sent to the customer"
-msgstr "Змінювати та налаштовувати повідомлення, яке надсилається замовнику"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:53
-msgid "Send a reminder email to the customer"
-msgstr "Надсилати електронне нагадування клієнту"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:55
-msgid "Send a printed reminder letter to the customer"
-msgstr "Надсилати друкований лист-нагадування клієнту"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:57
-msgid "Send automated printed reminders by utilizing our Docsaway integration"
+#: ../../accounting/receivables/customer_payments/followup.rst:52
+msgid "Plan a follow-up process"
 msgstr ""
-"Надсилати автоматизовані друковані нагадування за допомогою інтеграції "
-"нашого Docsaway"
 
-#: ../../accounting/receivables/customer_payments/followup.rst:60
-msgid "Zoom in on the different open invoices or payments"
-msgstr "Збільшити масштаб різних відкритих рахунків-фактур або платежів"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:62
-msgid "Remove an invoice or payment from the report (in case of conflict)"
-msgstr "Видалити рахунок-фактуру або платіж зі звіту (у випадку конфлікту)"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:64
-msgid "Log any call notes made to the customer"
-msgstr "Вводити будь-які нотатки, зроблені клієнту"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:66
+#: ../../accounting/receivables/customer_payments/followup.rst:54
 msgid ""
-"Schedule your next follow up task to stay on top of customer payments (e.g. "
-"call back in 15 days if not payments are made)"
+"To plan a follow-up process, go to :menuselection:`Accounting --> "
+"Configuration --> Settings` and activate the *Follow-up Levels* feature "
+"under the *Customer Payments* section. Then, click on the new *Follow-up "
+"Levels* button that has appeared on your settings page."
+msgstr ""
+
+#: ../../accounting/receivables/customer_payments/followup.rst:59
+msgid ""
+"A follow-up plan with several actions is available by default in Odoo, but "
+"you can customize it any way you want. Depending on a specific number of "
+"overdue days, plan to send an email, a letter or to undertake a manual "
+"action. You can also edit the template used for the statement according to "
+"the stage of the process."
 msgstr ""
-"Планувати своє наступне завдання, щоб залишатися на вершині платежів "
-"клієнтів (наприклад, зателефонувати через 15 днів, якщо не здійснено "
-"платежі)"
 
 #: ../../accounting/receivables/customer_payments/followup.rst:69
 msgid ""
-"You can set reminders for when you would like to next contact the particular"
-" customer. Selecting **Manual** will open up the follow up scheduling tool, "
-"while selecting **Auto** will automatically recommend that you contact the "
-"customer 15 days from then if the customer has not yet paid for the invoice."
-" Installing the **Follow-Up Plans** module will allow you to define "
-"automated actions and intervals to send reminders."
+"If you would like to get a reminder before the actual due date, set a "
+"negative number of due days."
 msgstr ""
-"Ви можете встановити нагадування для того, коли ви хотіли б наступного разу "
-"звернутися до конкретного клієнта. Вибравши **Вручну**, відкриється "
-"інструмент нагадування клієнту, під час вибору параметра **Автоматично** "
-"буде автоматично рекомендуватися зв'язатися з клієнтом через 15 днів, якщо "
-"клієнт ще не заплатив за рахунок-фактуру. Встановлення модуля **Плани "
-"нагадувань** дозволить визначити автоматичні дії та інтервали для надсилання"
-" нагадувань."
-
-#: ../../accounting/receivables/customer_payments/followup.rst:79
-msgid ""
-"If you have already sent out a reminder to a customer a few days ago, a "
-"warning message will appear at the top of the screen, reminding you that you"
-" should not send another reminder so soon since one was already sent "
-"recently. Every time you log a note, Odoo will automatically set the next "
-"reminder date, unless you choose to manually set it by selecting the next "
-"reminder button at the top right of the screen."
-msgstr ""
-"Якщо ви вже надіслали декілька днів тому нагадування клієнту, у верхній "
-"частині екрану з'явиться попередження, яке нагадуватиме вам, що ви не "
-"повинні надсилати інше нагадування так швидко, оскільки його вже було "
-"надіслано нещодавно. Щоразу, коли ви вводите запис, Odoo автоматично "
-"встановлює наступну дату нагадування, якщо ви не вирішите вручну встановити "
-"її, вибравши наступну кнопку нагадування у верхньому правому куті екрану."
-
-#: ../../accounting/receivables/customer_payments/followup.rst:88
-msgid ""
-"You can also specify the expected payment date on an invoice line directly, "
-"therefore defining the next reminder in case the invoice has not been paid."
-msgstr ""
-"Ви також можете вказати очікувану дату платежу безпосередньо в рядку "
-"рахунка-фактури, тому визначте наступне нагадування в тому випадку, якщо "
-"рахунок не був виплачений."
-
-#: ../../accounting/receivables/customer_payments/followup.rst:92
-msgid "Sending customer statements"
-msgstr "Відправлення звірок з клієнтам"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:94
-msgid ""
-"Send your customers reminders in batches in the menu :menuselection:`Sales "
-"--> Customer Statements`."
-msgstr ""
-"Надішліть ваші групові нагадування клієнтами в меню :menuselection:`Продажі "
-"--> Звірка з клієнтами`."
-
-#: ../../accounting/receivables/customer_payments/followup.rst:97
-msgid ""
-"Here Odoo will open all the statements awaiting to be processed, which is "
-"determined by the last reminder they received. You can choose to process "
-"them one by one, send multiple letters or emails in batches, or set a next "
-"action date for the next time they'll be contacted."
-msgstr ""
-"Тут Odoo відкриє всі звірки, які очікують на обробку, що визначається "
-"останнім нагадуванням, яке вони отримали. Ви можете вибрати, щоб обробляти "
-"їх один за одним, надсилати кілька листів або електронних листів групами або"
-" встановити наступну дату дії, коли вони зв'язуваатимуться."
-
-#: ../../accounting/receivables/customer_payments/followup.rst:104
-msgid ""
-"If an invoice has not yet been paid, Odoo will remind you to contact at "
-"particular customer based after their next action date."
-msgstr ""
-"Якщо рахунок-фактура ще не сплачений, Odoo нагадує вам про зв'язок із "
-"конкретним клієнтом на основі наступної дати дії."
-
-#: ../../accounting/receivables/customer_payments/followup.rst:107
-msgid ""
-"You can access the customer statement report daily and Odoo will only "
-"display the customers you need to contact on any given day. This is based "
-"on:"
-msgstr ""
-"Щоденно ви можете отримувати доступ до звіту про звірку з клієнтами, і Odoo "
-"відображатиме лише тих клієнтів, з якими потрібно зв'язатися в будь-який "
-"день. Це базується на:"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:111
-msgid "Customers you have not yet received a payment from"
-msgstr "Клієнтах, до яких ви ще не отримали платіж"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:113
-msgid ""
-"Customers that have not been reminded over the last X days (\"X\" being "
-"defined as the overdue date of the invoice after the first reminder, then "
-"the next action date set at every reminder)"
-msgstr ""
-"Клієнтах, про які не нагадували протягом останніх X днів (\"X\" визначається"
-" як прострочена дата рахунку-фактури після першого нагадування, тоді "
-"наступна дата дії встановлена на кожному нагадуванні)."
-
-#: ../../accounting/receivables/customer_payments/followup.rst:118
-msgid "Setting up your dunning process"
-msgstr "Налаштування процесу нагадувань"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:120
-msgid ""
-"The **Payment Follow-up Management** module allows you to define reminder "
-"plans. After installing it from the **Apps** menu, go to the **Follow-up "
-"Levels** menu in the accounting configuration to set up your dunning "
-"process."
-msgstr ""
-"Модуль **Контроль нагадування платежу** дозволяє визначати плани нагадувань."
-" Після встановлення його в меню **Додатки**, перейдіть до меню **Рівні "
-"нагадувань** в налаштуваннях обліку, щоб налаштувати процес оновлення."
-
-#: ../../accounting/receivables/customer_payments/followup.rst:125
-msgid "Some Examples are:"
-msgstr "Деякі приклади:"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:127
-msgid "**Email**: 3 days before overdue date"
-msgstr "**Електронна пошта**: 3 дні до дати протермінування"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:129
-msgid "**Email+Letter**: at the overdue date"
-msgstr "**Електронна пошта + лист**: з протермінованою датою"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:131
-msgid "**Email+Call**: 15 days after the overdue date"
-msgstr ""
-"**Електронна пошта + дзвінок**: через 15 днів після протермінованої дати"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:133
-msgid "**Email+Letter**: 60 days after the overdue date"
-msgstr "**Електронна пошта + лист**: через 60 днів після протермінованої дати"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:138
-msgid ""
-"Thanks to this module, you can send every email and letters in batches for "
-"all your customers at once. The next reminder will automatically be computed"
-" based on your configured follow-up plan."
-msgstr ""
-"Завдяки цьому модулю ви можете надсилати кожну електронну пошту та листи "
-"групою для всіх ваших клієнтів одночасно. Наступне нагадування буде "
-"автоматично обчислено на основі вашого налаштованого плану подальшого "
-"нагадування."
-
-#: ../../accounting/receivables/customer_payments/followup.rst:142
-msgid ""
-"The module will also add a red/green dot on each customer, this will allow "
-"you to easily mark customer status's with the following options: \"Good "
-"Debtor, Normal Debtor, or bad debtors."
-msgstr ""
-"Модуль також додасть червону/зелену точку для кожного клієнта, це дозволить "
-"вам легко помітити статус клієнта з такими параметрами: \"Хороший дебітор\","
-" \"Нормальний дебітор\" або \"Поганий дебітор\"."
-
-#: ../../accounting/receivables/customer_payments/followup.rst:150
-msgid "DSO: Measuring your performance"
-msgstr "DSO: вимірювання узгодження продажів"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:152
-msgid ""
-"The DSO (Days of Outstanding Sales) is a measure of the average number of "
-"days that a company takes to collect revenue after a sale has been made. DSO"
-" is calculated by dividing the amount of accounts receivable during a given "
-"period by the total value of credit sales during the same period, and "
-"multiplying the result by the number of days in the period measured."
-msgstr ""
-"DSO (Days of Outstanding Sales) - це показник середньої кількості днів, що "
-"компанія бере, щоб стягувати прибуток після здійснення продажу. DSO "
-"розраховується шляхом ділення розрахунку з дебіторами протягом даного "
-"періоду на загальну суму продажів кредитів за той же період і множення "
-"результату на кількість днів у вимірюваному періоді."
-
-#: ../../accounting/receivables/customer_payments/followup.rst:159
-msgid ""
-"You can get the DSO of your company from the Executive Summary report under "
-"Reporting (check the KPI average debtors days)."
-msgstr ""
-"Ви можете отримати DSO вашої компанії у Резюме Звіту під назвою Звіти "
-"(перевірте середні дні боржника КПІ)."
 
 #: ../../accounting/receivables/customer_payments/payment_sepa.rst:3
 #: ../../accounting/receivables/customer_payments/payment_sepa.rst:29
@@ -15549,7 +15071,7 @@ msgstr ""
 
 #: ../../accounting/receivables/customer_payments/payment_sepa.rst:32
 msgid "Direct Debit Mandates"
-msgstr "Прямі дебетові мандати"
+msgstr "Особисті дебіторські мандати "
 
 #: ../../accounting/receivables/customer_payments/payment_sepa.rst:34
 msgid ""
diff --git a/locale/uk/LC_MESSAGES/applications.po b/locale/uk/LC_MESSAGES/applications.po
index 6a905203d..2679faaf6 100644
--- a/locale/uk/LC_MESSAGES/applications.po
+++ b/locale/uk/LC_MESSAGES/applications.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2015-TODAY, Odoo S.A.
-# This file is distributed under the same license as the Odoo Business package.
+# This file is distributed under the same license as the Odoo package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 10.0\n"
+"Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-07 09:30+0200\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Alina Semeniuk <alinasemeniuk1@gmail.com>, 2018\n"
+"Last-Translator: Martin Trigaux, 2018\n"
 "Language-Team: Ukrainian (https://www.transifex.com/odoo/teams/41243/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/locale/uk/LC_MESSAGES/db_management.po b/locale/uk/LC_MESSAGES/db_management.po
index ef6ab0dbb..0c2770c00 100644
--- a/locale/uk/LC_MESSAGES/db_management.po
+++ b/locale/uk/LC_MESSAGES/db_management.po
@@ -20,7 +20,7 @@ msgstr ""
 
 #: ../../db_management/db_online.rst:8
 msgid "Online Database management"
-msgstr ""
+msgstr "Управління базами даних онлайн"
 
 #: ../../db_management/db_online.rst:10
 msgid ""
@@ -29,6 +29,10 @@ msgid ""
 "click on the `Manage Your Databases "
 "<https://www.odoo.com/my/databases/manage>`__ button."
 msgstr ""
+"Щоб керувати базами даних, відкрийте `сторінку Керування базою даних "
+"<https://www.odoo.com/my/databases>`__ (вам доведеться увійти в систему). "
+"Потім натисніть кнопку `Керування вашими базами даних "
+"<https://www.odoo.com/my/databases/manage>`__."
 
 #: ../../db_management/db_online.rst:18
 msgid ""
@@ -36,78 +40,91 @@ msgid ""
 " manage - many operations depends on indentifying you remotely to that "
 "database."
 msgstr ""
+"Переконайтеся, що ви підключені як адміністратор бази даних, якою хочете "
+"керувати - багато операцій залежать від того, як ви віддалено ідентифікуєте "
+"цю базу даних."
 
 #: ../../db_management/db_online.rst:22
 msgid "Several actions are available:"
-msgstr ""
+msgstr "Доступні декілька дій:"
 
 #: ../../db_management/db_online.rst:28
 msgid ":ref:`Upgrade <upgrade_button>`"
-msgstr ""
+msgstr ":ref:`Оновлення <upgrade_button>`"
 
 #: ../../db_management/db_online.rst:28
 msgid ""
 "Upgrade your database to the latest Odoo version to enjoy cutting-edge "
 "features"
 msgstr ""
+"Оновіть вашу базу даних до останньої версії Odoo, щоб насолодитися "
+"передовими функціями"
 
 #: ../../db_management/db_online.rst:32
 msgid ":ref:`Duplicate <duplicate_online>`"
-msgstr ""
+msgstr ":ref:`Копіювання <duplicate_online>`"
 
 #: ../../db_management/db_online.rst:31
 msgid ""
 "Make an exact copy of your database, if you want to try out new apps or new "
 "flows without compromising your daily operations"
 msgstr ""
+"Створіть точну копію вашої бази даних, якщо ви хочете спробувати нові "
+"програми або нові процеси, не покладаючи на небезпеку щоденні операції"
 
 #: ../../db_management/db_online.rst:34
 msgid ":ref:`Rename <rename_online_database>`"
-msgstr ""
+msgstr ":ref:`Перейменування <rename_online_database>`"
 
 #: ../../db_management/db_online.rst:35
 msgid "Rename your database (and its URL)"
-msgstr ""
+msgstr "Перейменувати вашу базу даних (і її URL-адресу)"
 
 #: ../../db_management/db_online.rst:37
 msgid "**Backup**"
-msgstr ""
+msgstr "**Резервне копіювання**"
 
 #: ../../db_management/db_online.rst:37
 msgid ""
 "Download an instant backup of your database; note that we back up databases "
 "daily according to our Odoo Cloud SLA"
 msgstr ""
+"Завантажте миттєву резервну копію вашої бази даних; Зверніть увагу, що ми "
+"створюємо резервні копії баз даних щодня згідно з нашими Odoo Cloud SLA"
 
 #: ../../db_management/db_online.rst:40
 msgid ":ref:`Domains <custom_domain>`"
-msgstr ""
+msgstr ":ref:`Домени <custom_domain>`"
 
 #: ../../db_management/db_online.rst:40
 msgid "Configure custom domains to access your database via another URL"
 msgstr ""
+"Налаштуйте власні домени для доступу до вашої бази даних за допомогою іншої "
+"URL-адреси"
 
 #: ../../db_management/db_online.rst:42
 msgid ":ref:`Delete <delete_online_database>`"
-msgstr ""
+msgstr ":ref:`Видалення <delete_online_database>`"
 
 #: ../../db_management/db_online.rst:43
 msgid "Delete a database instantly"
-msgstr ""
+msgstr "Видаліть базу даних миттєво"
 
 #: ../../db_management/db_online.rst:46
 msgid "Contact Support"
-msgstr ""
+msgstr "Зв'язок з техпідтримкою"
 
 #: ../../db_management/db_online.rst:45
 msgid ""
 "Access our `support page <https://www.odoo.com/help>`__ with the correct "
 "database already selected"
 msgstr ""
+"Отримайте доступ до нашої `сторінки підтримки <https://www.odoo.com/help>`__"
+" з уже вибраною правильною базою даних"
 
 #: ../../db_management/db_online.rst:51
 msgid "Upgrade"
-msgstr ""
+msgstr "Оновлення"
 
 #: ../../db_management/db_online.rst:53
 msgid ""
@@ -115,6 +132,9 @@ msgid ""
 " database management page. On the line of the database you want to upgrade, "
 "click on the \"Upgrade\" button."
 msgstr ""
+"Не забудьте підключитися до бази даних, яку потрібно оновити, і отримати "
+"доступ до сторінки керування базою даних. У рядку бази даних, яку ви хочете "
+"оновити, натисніть кнопку \"Оновити\"."
 
 #: ../../db_management/db_online.rst:60
 msgid ""
@@ -124,6 +144,10 @@ msgid ""
 " 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:66
 msgid ""
@@ -131,6 +155,9 @@ msgid ""
 "generated. If our automated system does not encounter any problem, you will "
 "receive a \"Test\" version of your upgraded database."
 msgstr ""
+"Натиснувши кнопку \"Тестове оновлення\", буде створено запит на оновлення. "
+"Якщо на нашу автоматизовану систему не виникне ніяких проблем, ви отримаєте "
+"\"Тестову\" версію оновленої бази даних."
 
 #: ../../db_management/db_online.rst:73
 msgid ""
@@ -138,6 +165,9 @@ msgid ""
 "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."
 msgstr ""
+"Якщо наша автоматична система виявляє проблему під час створення тестової "
+"бази даних, наша команда буде працювати над цим. Ви отримаєте сповіщення "
+"електронною поштою, а процес триватиме до 4 тижнів."
 
 #: ../../db_management/db_online.rst:77
 msgid ""
@@ -145,6 +175,9 @@ msgid ""
 "(e.g. accounting reports, stock valuation, etc.), check that all your usual "
 "flows work correctly (CRM flow, Sales flow, etc.)."
 msgstr ""
+"Ви матимете можливість перевірити його протягом 1 місяця. Перегляньте свої "
+"дані (наприклад, бухгалтерські звіти, складську оцінку тощо), перевірте, чи "
+"правильно працюють всі ваші звичайні процеси (CRM, Продажі тощо)."
 
 #: ../../db_management/db_online.rst:81
 msgid ""
@@ -153,6 +186,10 @@ msgid ""
 "Upgrade (the button with the little rocket!) to switch your production "
 "database to the new version."
 msgstr ""
+"Після того, як ви будете готові і все правильно під час міграції тестування,"
+" ви можете знову натиснути кнопку Оновити та підтвердити, натиснувши кнопку "
+"Оновити (кнопку з маленькою ракетою!), щоб переключити базу даних "
+"впровадження на нову версію."
 
 #: ../../db_management/db_online.rst:89
 msgid ""
@@ -160,10 +197,13 @@ msgid ""
 "30min up to several hours for big databases), so make sure to plan your "
 "migration during non-business hours."
 msgstr ""
+"Ваша база даних буде завантажуватися в режимі офлайн під час оновлення "
+"(зазвичай від 30 хвилин до декількох годин для великих баз даних), тому "
+"обов'язково плануйте міграцію протягом неробочих годин."
 
 #: ../../db_management/db_online.rst:96
 msgid "Duplicating a database"
-msgstr ""
+msgstr "Копіювання бази даних"
 
 #: ../../db_management/db_online.rst:98
 msgid ""
@@ -171,6 +211,9 @@ msgid ""
 "databases on our Online platform. Paid Databases and \"One App Free\" "
 "database can duplicate without problem."
 msgstr ""
+"Дублювання бази даних, перейменування, користувацький DNS і т. д. недоступні"
+" для пробних баз даних на нашій онлайн-платформі. Платні бази даних та база "
+"даних \"One App Free\" може дублювати без проблем."
 
 #: ../../db_management/db_online.rst:103
 msgid ""
@@ -178,26 +221,34 @@ msgid ""
 "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:110
 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:113
 msgid "Emails are sent"
-msgstr ""
+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 ""
+msgstr "Замовлення на доставку (постачальники доставки) відправляються"
 
 #: ../../db_management/db_online.rst:120
 msgid "Etc."
@@ -208,20 +259,24 @@ 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."
 msgstr ""
+"Через кілька секунд ви будете входити в копію бази даних. Зверніть увагу, що"
+" URL-адреса використовує вашу назву для копій бази даних."
 
 #: ../../db_management/db_online.rst:129
 msgid "Duplicate databases expire automatically after 15 days."
-msgstr ""
+msgstr "Копії баз даних закінчуються автоматично через 15 днів."
 
 #: ../../db_management/db_online.rst:137
 msgid "Rename a Database"
-msgstr ""
+msgstr "Перейменування бази даних"
 
 #: ../../db_management/db_online.rst:139
 msgid ""
@@ -230,14 +285,19 @@ msgid ""
 "<https://www.odoo.com/my/databases>`__ and click **Rename**. You will have "
 "to give a new name to your database, then click **Rename Database**."
 msgstr ""
+"Щоб перейменувати вашу базу даних, переконайтеся, що ви підключені до бази "
+"даних, яку ви хочете перейменувати, відкрийте `сторінку керування базою "
+"даних <https://www.odoo.com/my/databases>`__ та натисніть **Перейменувати**."
+" Вам потрібно буде вказати нову назву у вашій базі даних, а потім натиснути "
+"**Перейменувати базу даних**."
 
 #: ../../db_management/db_online.rst:150
 msgid "Deleting a Database"
-msgstr ""
+msgstr "Видалення бази даних"
 
 #: ../../db_management/db_online.rst:152
 msgid "You can only delete databases of which you are the administrator."
-msgstr ""
+msgstr "Ви можете видалити лише ті бази даних, де ви є адміністратором."
 
 #: ../../db_management/db_online.rst:154
 msgid ""
@@ -246,6 +306,10 @@ msgid ""
 "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:160
 msgid ""
@@ -253,23 +317,31 @@ msgid ""
 "on the line of the database you want to delete, click on the \"Delete\" "
 "button."
 msgstr ""
+"На `сторінці управління базою даних <https://www.odoo.com/my/databases>`__, "
+"в рядку бази даних, яку ви хочете видалити, натисніть кнопку \"Видалити\"."
 
 #: ../../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:"
 msgstr ""
+"Будь ласка, уважно прочитайте попередження, яке з'явиться і висітиме , поки "
+"ви повністю не зрозумієте наслідки видалення бази даних:"
 
 #: ../../db_management/db_online.rst:173
 msgid ""
 "After a few seconds, the database will be deleted and the page will reload "
 "automatically."
 msgstr ""
+"Через кілька секунд база даних буде видалена, і сторінка буде автоматично "
+"перезавантажена."
 
 #: ../../db_management/db_online.rst:177
 msgid ""
 "If you need to re-use this database name, it will be immediately available."
 msgstr ""
+"Якщо вам потрібно буде повторно використовувати цю назву бази даних, вона "
+"буде доступна"
 
 #: ../../db_management/db_online.rst:179
 msgid ""
@@ -277,20 +349,25 @@ msgid ""
 "Subscription. In these cases contact `Odoo Support "
 "<https://www.odoo.com/help>`__"
 msgstr ""
+"Неможливо видалити базу даних, якщо вона минула або пов'язана з підпискою. У"
+" цих випадках звертайтеся в `Службу підтримки Odoo "
+"<https://www.odoo.com/help>`__"
 
 #: ../../db_management/db_online.rst:183
 msgid ""
 "If you want to delete your Account, please contact `Odoo Support "
 "<https://www.odoo.com/help>`__"
 msgstr ""
+"Якщо ви хочете видалити свій обліковий запис, зверніться до `Служби "
+"підтримки Odoo <https://www.odoo.com/help>`__"
 
 #: ../../db_management/db_premise.rst:7
 msgid "On-premise Database management"
-msgstr ""
+msgstr "Управління базою даних на своєму хостингу"
 
 #: ../../db_management/db_premise.rst:10
 msgid "Register a database"
-msgstr ""
+msgstr "Реєстрація бази даних"
 
 #: ../../db_management/db_premise.rst:12
 msgid ""
@@ -301,25 +378,33 @@ msgid ""
 "registered database. You can check this Epiration Date in the About menu "
 "(Odoo 9) or in the Settings Dashboard (Odoo 10)."
 msgstr ""
+"Щоб зареєструвати вашу базу даних, вам просто потрібно ввести свій код "
+"підписки у вікні Перемикання Додатків. Переконайтеся, що ви не додали "
+"додаткових пропусків перед або після коду підписки. Якщо реєстрація буде "
+"успішною, вона стане зеленою і надасть вам Дату закінчення термінової "
+"реєстрації вашої бази даних. Ви можете перевірити цю дату закінчення в меню "
+"Про (Odoo 9) або на інформаційній панелі параметрів (Odoo 10)."
 
 #: ../../db_management/db_premise.rst:20
 msgid "Registration Error Message"
-msgstr ""
+msgstr "Повідомлення про помилку реєстрації"
 
 #: ../../db_management/db_premise.rst:22
 msgid ""
 "If you are unable to register your database, you will likely encounter this "
 "message:"
 msgstr ""
+"Якщо ви не можете зареєструвати свою базу даних, ви, імовірно, побачите це "
+"повідомлення:"
 
 #: ../../db_management/db_premise.rst:31 ../../db_management/db_premise.rst:97
 #: ../../db_management/db_premise.rst:130
 msgid "Solutions"
-msgstr ""
+msgstr "Рішення"
 
 #: ../../db_management/db_premise.rst:33
 msgid "Do you have a valid Enterprise subscription?"
-msgstr ""
+msgstr "Чи є у вас дійсна Підписка на Enterprise?"
 
 #: ../../db_management/db_premise.rst:35
 msgid ""
@@ -327,16 +412,22 @@ msgid ""
 " Account <https://accounts.odoo.com/my/subscription>`__ or with your Account"
 " Manager"
 msgstr ""
+"Перевірте, чи отримує інформацію про підписку тег \"В процесі\" в `J,ksre "
+"Odoo <https://accounts.odoo.com/my/subscription>`__ або з вашим менеджером "
+"облікового запису."
 
 #: ../../db_management/db_premise.rst:39
 msgid "Have you already linked a database with your subscription reference?"
-msgstr ""
+msgstr "Ви вже пов'язали базу даних з посиланням на підписку?"
 
 #: ../../db_management/db_premise.rst:41
 msgid ""
 "You can link only one database per subscription. (Need a test or a "
 "development database? `Find a partner <https://www.odoo.com/partners>`__)"
 msgstr ""
+"Ви можете пов'язати лише одну базу даних для кожної підписки. (Потрібен тест"
+" або база даних розробки? `Знайдіть партнера "
+"<https://www.odoo.com/partners>`__)"
 
 #: ../../db_management/db_premise.rst:45
 msgid ""
@@ -344,16 +435,21 @@ msgid ""
 "<https://accounts.odoo.com/my/subscription>`__ with the button \"Unlink "
 "database\""
 msgstr ""
+"Ви можете самостійно від'єднати стару базу даних в своєму `Кнтракті Odoo "
+"<https://accounts.odoo.com/my/subscription>`__  за допомогою кнопки "
+"\"Від'єднати базу даних\"."
 
 #: ../../db_management/db_premise.rst:52
 msgid ""
 "A confirmation message will appear; make sure this is the correct database "
 "as it will be deactivated shortly:"
 msgstr ""
+"З'явиться повідомлення про підтвердження; переконайтеся, що це правильна "
+"база даних, оскільки її буде негайно вимкнено:"
 
 #: ../../db_management/db_premise.rst:59
 msgid "Do you have the updated version of Odoo 9?"
-msgstr ""
+msgstr "У вас є оновлена версія Odoo 9?"
 
 #: ../../db_management/db_premise.rst:61
 #: ../../db_management/db_premise.rst:190
@@ -361,6 +457,8 @@ msgid ""
 "From July 2016 onward, Odoo 9 now automatically change the uuid of a "
 "duplicated database; a manual operation is no longer required."
 msgstr ""
+"З липня 2016 року Odoo 9 тепер автоматично змінює UUID копії бази даних; "
+"ручна операція більше не потрібна."
 
 #: ../../db_management/db_premise.rst:64
 msgid ""
@@ -369,6 +467,10 @@ msgid ""
 "<https://accounts.odoo.com/my/subscription>`__, a short message will appear "
 "specifying which database is problematic:"
 msgstr ""
+"Якщо ні, ви можете мати кілька баз даних, що мають однакову UUID. Будь "
+"ласка, перевірте свій `Контракт Odoo "
+"<https://accounts.odoo.com/my/subscription>`__, з'явиться коротке "
+"повідомлення, в якому буде зазначено, яка база даних є проблематичною:"
 
 #: ../../db_management/db_premise.rst:73
 msgid ""
@@ -376,6 +478,9 @@ msgid ""
 "this issue. You will find more information about this in :ref:`this section "
 "<duplicate_premise>`."
 msgstr ""
+"У цьому випадку вам потрібно змінити UUID на своїх тестових базах даних, "
+"щоби вирішити цю проблему. Ви знайдете додаткову інформацію про це у "
+":ref:`цьому розділі <duplicate_premise>`."
 
 #: ../../db_management/db_premise.rst:76
 msgid ""
@@ -383,32 +488,42 @@ msgid ""
 "database should have a distinct UUID to ensure that registration and "
 "invoicing proceed effortlessly for your and for us."
 msgstr ""
+"Для вашої інформації ми ідентифікуємо базу даних з UUID. Тому кожна база "
+"даних повинна мати чіткий UUID, щоб забезпечити безперебійну реєстрацію та "
+"виставлення рахунків для вас і для нас."
 
 #: ../../db_management/db_premise.rst:82
 msgid "Error message due to too many users"
-msgstr ""
+msgstr "Повідомлення про помилку через через велику кількість користувачів"
 
 #: ../../db_management/db_premise.rst:84
 msgid ""
 "If you have more users in your local database than provisionned in your Odoo"
 " Enterprise subscription, you may encounter this message:"
 msgstr ""
+"Якщо у вашій місцевій базі даних є більше користувачів, ніж передбачено в "
+"підписці Odoo Enterprise, ви можете побачити таке повідомлення:"
 
 #: ../../db_management/db_premise.rst:93
 msgid ""
 "When the message appears you have 30 days before the expiration. The "
 "countdown is updated everyday."
 msgstr ""
+"Коли з'явиться повідомлення, у вас є 30 днів до закінчення терміну дії. "
+"Зворотній відлік оновлюється кожного дня."
 
 #: ../../db_management/db_premise.rst:99
 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
 msgid "or"
-msgstr ""
+msgstr "або"
 
 #: ../../db_management/db_premise.rst:104
 msgid ""
@@ -417,6 +532,10 @@ msgid ""
 "/documentation/user/11.0/db_management/documentation.html#deactivating-"
 "users>`__ and **Reject** the upsell quotation."
 msgstr ""
+"**Вимкніть користувачів**, як це описано в цій "
+"`документації<https://www.odoo.com "
+"/documentation/user/11.0/db_management/documentation.html#deactivating-"
+"users>`__  і **Відхиліть** комерційну пропозицію збільшення."
 
 #: ../../db_management/db_premise.rst:109
 msgid ""
@@ -426,16 +545,23 @@ msgid ""
 " so you can :ref:`force an Update Notification <force_ping>`  to make the "
 "message disappear right away."
 msgstr ""
+"Коли ваша база даних матиме правильну кількість користувачів, повідомлення "
+"про закінчення терміну дії автоматично зникне через кілька днів після "
+"наступної перевірки. Ми розуміємо, що це може бути трохи лякаюче, коли ви "
+"побачите зворотний відлік, тому ви можете запустити Оновлення Повідомлення, "
+"<force_ping>`  щоби повідомлення зникло відразу."
 
 #: ../../db_management/db_premise.rst:116
 msgid "Database expired error message"
-msgstr ""
+msgstr "Помилка повідомлення про закінчення терміну дії бази даних"
 
 #: ../../db_management/db_premise.rst:118
 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
 msgid ""
@@ -443,12 +569,17 @@ msgid ""
 " days. If you fail to take action before the end of the countdown, the "
 "database is expired."
 msgstr ""
+"Це повідомлення про **блокування** з'являється після неблокуючого "
+"повідомлення, яке триває 30 днів. Якщо ви не вживаєте заходів до закінчення "
+"зворотнього відліку, термін дії бази даних закінчиться."
 
 #: ../../db_management/db_premise.rst:134
 msgid ""
 "Renew your subscription: follow the link and renew your subscription - note "
 "that"
 msgstr ""
+"Відновіть свою підписку: перейдіть за посиланням та поновіть свою підписку, "
+"зверніть увагу,"
 
 #: ../../db_management/db_premise.rst:133
 msgid ""
@@ -456,20 +587,25 @@ msgid ""
 "renewed only when the payment arrives, which can take a few days. Credit "
 "card payments are processed immediately."
 msgstr ""
+"якщо ви хочете оплатити Wire Transfer, ваша підписка буде дійсно поновлена "
+"​​лише після отримання платежу, що може тривати кілька днів. Платежі за "
+"кредитною карткою обробляються негайно."
 
 #: ../../db_management/db_premise.rst:136
 msgid "Contact our `Support <https://www.odoo.com/help>`__"
-msgstr ""
+msgstr "Зв'яжіться з нашою `Підтримкою <https://www.odoo.com/help>`__"
 
 #: ../../db_management/db_premise.rst:138
 msgid ""
 "None of those solutions worked for you? Please contact our `Support "
 "<https://www.odoo.com/help>`__"
 msgstr ""
+"Жодні з цих рішень не підходять для вас? Будь ласка, зв'яжіться з нашою "
+"`Підтримкою <https://www.odoo.com/help>`__"
 
 #: ../../db_management/db_premise.rst:145
 msgid "Force an Update Notification"
-msgstr ""
+msgstr "Запуск повідомлення про оновлення"
 
 #: ../../db_management/db_premise.rst:147
 msgid ""
@@ -481,10 +617,19 @@ msgid ""
 "in your App Switcher. When doing such an operation on your subscription, you"
 " can force an Update using the following procedure:"
 msgstr ""
+"Оновлення повідомлень відбувається раз на 7 днів і підтримує оновлення вашої"
+" бази даних з вашою підпискою Odoo Enterprise. Якщо ви змінюєте вашу "
+"підписку (тобто додаєте більше користувачів, поновлюєте їх протягом року "
+"тощо), вашу локальну базу даних буде повідомлено про зміну лише раз на 7 "
+"днів - це може призвести до розбіжностей між вашою підпискою та деякими "
+"повідомленнями у вашому Перемиканні Додатків. Під час виконання такої "
+"операції у вашій підписці ви можете запустити Оновлення за допомогою такої "
+"процедури:"
 
 #: ../../db_management/db_premise.rst:154
 msgid "Connect to the database with the **Administrator** account"
 msgstr ""
+"Підключіться до бази даних за допомогою облікового запису **Адміністратора**"
 
 #: ../../db_management/db_premise.rst:155
 msgid ""
@@ -492,22 +637,29 @@ msgid ""
 "menu (in V9) /  in **Settings**  (in V10): click on **Activate the developer"
 " mode**"
 msgstr ""
+"Перейдіть у режим розробника, скориставшись опцією **Про** у верхньому "
+"правому куті меню (у V9)/ в **Налаштуваннях** (у V10): натисніть "
+"**Активізувати режим розробника**"
 
 #: ../../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 ""
+msgstr "Оновіть сторінку, сповіщення про \"закінчення терміну дії\" має зникнути"
 
 #: ../../db_management/db_premise.rst:165
 msgid ""
@@ -517,10 +669,15 @@ msgid ""
 " change you can force a ping to speed up the verification, your production "
 "database will then be correctly identified."
 msgstr ""
+"Можливо, ви зберегли той самий UUID в різних базах даних, і ми отримуємо "
+"інформацію з цих баз даних теж. Тому, будь ласка, прочитайте :ref:`цю "
+"документацію,  <duplicate_premise>` щоб знати, як змінити UUID. Після зміни "
+"ви можете примусити ping прискорити перевірку, тоді ваша впроваджена база "
+"даних буде правильно визначена."
 
 #: ../../db_management/db_premise.rst:174
 msgid "Duplicate a database"
-msgstr ""
+msgstr "Копіювання бази даних"
 
 #: ../../db_management/db_premise.rst:176
 msgid ""
@@ -528,6 +685,9 @@ msgid ""
 "server (<odoo-server>/web/database/manager). In this page, you can easily "
 "duplicate your database (among other things)."
 msgstr ""
+"Ви можете дублювати свою базу даних, звернувшись до менеджера баз даних на "
+"своєму сервері (<odoo-server>/web/database/manager). На цій сторінці ви "
+"можете легко дублювати вашу базу даних (серед інших)."
 
 #: ../../db_management/db_premise.rst:184
 msgid ""
@@ -537,6 +697,11 @@ msgid ""
 "databases with the same uuid could result in invoicing problems or "
 "registration problems down the line."
 msgstr ""
+"Коли ви копіюєте локальну базу даних, **настійно** рекомендуємо змінювати "
+"uuid дублікатів бази даних (Unniversically Unique Identifier), оскільки цей "
+"uuid - те, як ваша база даних ідентифікує себе на наших серверах. Дві бази "
+"даних з тим самим uuid можуть призвести до виставлення рахунків-фактур або "
+"реєстраційних проблем нижче по рядку."
 
 #: ../../db_management/db_premise.rst:193
 msgid ""
@@ -546,10 +711,16 @@ msgid ""
 " generate a new uuid. You can then simply replace it like any other record "
 "by clicking on it and using the edit button."
 msgstr ""
+"В даний час UIID бази даних доступний з меню **Налаштування > Технічні "
+"параметри > Параметри** системи, ми радимо використовувати `генератор uuid "
+"<https://www.uuidgenerator.net>`__  або використовувати команду unіx "
+"``uuidgen`` для створення нового uuid. Тоді ви можете просто замінити його, "
+"як і будь-який інший запис, натиснувши на нього та використовуючи кнопку "
+"редагування."
 
 #: ../../db_management/documentation.rst:7
 msgid "Users and Features"
-msgstr ""
+msgstr "Користувачі та додатки"
 
 #: ../../db_management/documentation.rst:9
 msgid ""
@@ -557,6 +728,9 @@ msgid ""
 "This includes the Apps you install as well as the number of users currently "
 "in use."
 msgstr ""
+"Як адміністратор вашої бази даних, ви несете відповідальність за її "
+"використання. Вона включає додатки, які ви встановлюєте, а також кількість "
+"користувачів, які наразі користуються системою."
 
 #: ../../db_management/documentation.rst:13
 msgid ""
@@ -566,6 +740,11 @@ msgid ""
 "subscription amount significantly (or switch you from a free account to a "
 "paying one on our online platform)."
 msgstr ""
+"В Odoo є багато речей (ERP, CMS, додаток CRM, бекенд електронної комерції "
+"тощо), але це не смартфон. Ви повинні бути обережними при "
+"додаванні/видаленні функцій (особливо додатків) у вашій базі даних, оскільки"
+" це може суттєво вплинути на суму вашої підписки (або ви можете "
+"переключитися з безкоштовної версії на платну на онлайн-платформі Odoo)."
 
 #: ../../db_management/documentation.rst:19
 msgid ""
@@ -574,6 +753,10 @@ msgid ""
 "to test them on a duplicate of your database first. That way, if something "
 "goes wrong, your day-to-day business is not impacted."
 msgstr ""
+"Ця сторінка містить деяку інформацію про те, як можна керувати версіями "
+"Odoo. Перш ніж виконувати будь-яку з цих дій, **настійно** радимо спочатку "
+"протестувати їх на копії вашої бази даних. Таким чином, якщо щось піде не "
+"так, на ваш щоденний бізнес нічого не впливає."
 
 #: ../../db_management/documentation.rst:24
 msgid ""
@@ -581,6 +764,9 @@ msgid ""
 " <duplicate_online>` and :ref:`on premise <duplicate_premise>` "
 "installations."
 msgstr ""
+"Ви можете знайти довідники про те, як дублювати свої бази даних як. "
+":ref:`онлайн <duplicate_online>` так і :ref:`на вашому хостингу "
+"<duplicate_premise>."
 
 #: ../../db_management/documentation.rst:28
 msgid ""
@@ -588,16 +774,21 @@ msgid ""
 "issue while carrying out these procedures, please contact us through our "
 "`support form <https://www.odoo.com/help>`__."
 msgstr ""
+"Якщо у вас виникли запитання щодо вмісту цієї сторінки або виникли проблеми "
+"під час виконання цих дій, зв'яжіться з нами за допомогою нашої `форми "
+"підтримки <https://www.odoo.com/help>`__."
 
 #: ../../db_management/documentation.rst:34
 msgid "Deactivating Users"
-msgstr ""
+msgstr "Деактивація користувачів"
 
 #: ../../db_management/documentation.rst:36
 msgid ""
 "Make sure you have sufficient **administrative rights** if you want to "
 "change the status of any of your users."
 msgstr ""
+"Переконайтеся, що у вас є достатньо **адміністративних прав**, якщо ви "
+"хочете змінити статус будь-якого з ваших користувачів."
 
 #: ../../db_management/documentation.rst:39
 msgid ""
@@ -605,19 +796,22 @@ msgid ""
 "showing you the active users on your database. Click on **Manage access "
 "rights.**"
 msgstr ""
+"У своїй версії Odoo натисніть **Налаштування**. У вас буде розділ, який "
+"покаже вам активних користувачів у вашій базі даних. Натисніть **Керувати "
+"правами доступу**."
 
 #: ../../db_management/documentation.rst:44
 #: ../../db_management/documentation.rst:82
 msgid "|settings|"
-msgstr ""
+msgstr "|settings|"
 
 #: ../../db_management/documentation.rst:44
 msgid "|browse_users|"
-msgstr ""
+msgstr "|browse_users|"
 
 #: ../../db_management/documentation.rst:47
 msgid "You'll then see the list of your users."
-msgstr ""
+msgstr "Після цього ви побачите список ваших користувачів."
 
 #: ../../db_management/documentation.rst:52
 msgid ""
@@ -625,6 +819,10 @@ msgid ""
 "from the *Portal Users* which are free). If you remove this filter, you'll "
 "get all your users (the ones you pay for and the portal ones)"
 msgstr ""
+"Заздалегідь вибраний фільтр *Внутрішні користувачі* покаже ваших платних "
+"користувачів (відмінних від *Користувачів порталу*, які є безкоштовними). "
+"Якщо ви видалите цей фільтр, ви отримаєте всіх своїх користувачів (тих, кого"
+" ви оплачуєте, а також портальні)."
 
 #: ../../db_management/documentation.rst:57
 msgid ""
@@ -633,18 +831,22 @@ msgid ""
 "(top right). Click on Active and you will notice that the status will change"
 " to **Inactive** immediately."
 msgstr ""
+"У своєму списку користувачів натисніть на користувача, якого ви бажаєте "
+"деактивувати. Як тільки ви зайдете на користувацьку форму, перейдіть за "
+"допомогою курсора миші на статус **Активний** (угорі праворуч). Натисніть на"
+" Активний, і ви помітите, що статус негайно зміниться на **Неактивний**."
 
 #: ../../db_management/documentation.rst:66
 msgid "The user is now deactivated."
-msgstr ""
+msgstr "Користувача деактивовано."
 
 #: ../../db_management/documentation.rst:68
 msgid "**Never** deactivate the main user (*admin*)"
-msgstr ""
+msgstr "**Ніколи** не деактивуйте головного користувача (**адміністратора**)."
 
 #: ../../db_management/documentation.rst:71
 msgid "Uninstalling Apps"
-msgstr ""
+msgstr "Видалення додатків"
 
 #: ../../db_management/documentation.rst:73
 msgid ""
@@ -652,6 +854,9 @@ msgid ""
 "<duplicate_online>` of your database before making any changes (*especially*"
 " installing/uninstalling apps)."
 msgstr ""
+"Перш ніж вносити зміни (особливо встановлення/видалення додатків), спочатку "
+"перевірте, що ви збираєтесь робити на :ref:`тестовій <duplicate_online>` "
+"базі даних. "
 
 #: ../../db_management/documentation.rst:77
 msgid ""
@@ -659,10 +864,13 @@ msgid ""
 "to see how many applications you have installed. Click on **Browse Apps** to"
 " access the list of your installed applications."
 msgstr ""
+"У своїй версії Odoo натисніть **Налаштування**, в цьому додатку ви зможете "
+"побачити, скільки програм було встановлено. Натисніть **Переглянути "
+"додатки**, щоб отримати доступ до списку встановлених програм."
 
 #: ../../db_management/documentation.rst:82
 msgid "|browse_apps|"
-msgstr ""
+msgstr "|browse_apps|"
 
 #: ../../db_management/documentation.rst:85
 msgid ""
@@ -670,6 +878,9 @@ msgid ""
 "applications. Click on the application you want to uninstall. Then, on the "
 "form of the application, click on **Uninstall**."
 msgstr ""
+"На інформаційній панелі вашої програми ви побачите всі значки ваших "
+"додатків. Натисніть програму, яку ви хочете видалити. Потім, за формою "
+"додатку, натисніть кнопку **Видалити**."
 
 #: ../../db_management/documentation.rst:92
 msgid ""
@@ -680,19 +891,26 @@ msgid ""
 "permanently disappear). If you are sure you still want to uninstall it, then"
 " click **Confirm**."
 msgstr ""
+"Деякі програми мають залежності, такі як виставлення рахунків, електронна "
+"комерція та інше. Таким чином, система попередить вас, що ви збирається "
+"видалити. Якщо ви деінсталюєте вашу програму, всі її залежності буде також "
+"видалено (і дані в них назавжди зникнуть). Якщо ви впевнені, що все одно "
+"хочете видалити додаток, натисніть кнопку **Підтвердити**."
 
 #: ../../db_management/documentation.rst:99
 msgid ""
 "Last, after having checked the warning message (if any), click **Confirm**."
 msgstr ""
+"Нарешті, після перевірки попередження (якщо воно є), натисніть кнопку "
+"**Підтвердити**."
 
 #: ../../db_management/documentation.rst:104
 msgid "You have finished uninstalling your application."
-msgstr ""
+msgstr "Ви завершили видалення вашої програми."
 
 #: ../../db_management/documentation.rst:107
 msgid "Good to know"
-msgstr ""
+msgstr "Варто знати"
 
 #: ../../db_management/documentation.rst:109
 msgid ""
@@ -703,6 +921,12 @@ msgid ""
 "*do not know how you work* and therefore cannot validate these kinds of "
 "operations."
 msgstr ""
+"**Видалення додатків, керування користувачами тощо залежить від вас**: ніхто"
+" знає краще за вас, чи ваш бізнес-процес зламаний. Якщо ми хотіли б "
+"деінсталювати додатки для вас, ми ніколи не зможемо визначити, чи були "
+"видалені релевантні дані або якщо один із ваших бізнес-процесів був "
+"зламаний, оскільки ми не знаємо, як ви працюєте, і тому не можемо перевірити"
+" такі операції."
 
 #: ../../db_management/documentation.rst:115
 msgid ""
@@ -713,6 +937,13 @@ msgid ""
 "need or use the Website itself, it is needed for the Online Quotes feature "
 "to work properly."
 msgstr ""
+"**Додатки Odoo мають залежності**: це означає, що вам може знадобитися "
+"встановити модулі, які ви не використовуєте, для доступу до деяких функцій "
+"Odoo, які вам можуть знадобитися. Наприклад, додаток Website Builder "
+"потрібен, аби показати своєму клієнту свої комерційні пропозиції на веб-"
+"сторінці. Незважаючи на те, чи вам може не знадобитися використання самого "
+"Веб-сайту, це необхідно, щоби функція комерційних пропозицій онлайн "
+"працювала належним чином."
 
 #: ../../db_management/documentation.rst:122
 msgid ""
@@ -720,3 +951,7 @@ msgid ""
 "database): that way you can know what other apps may be required, etc. This "
 "will avoid surprises when uninstalling or when receiving your invoices."
 msgstr ""
+"**Завжди перевіряйте встановлення/видалення додатку на тестовій базі** (або "
+"на базі безкоштовної пробної версії): таким чином ви можете дізнатися, які "
+"інші програми можуть знадобитися. Це допоможе уникнути несподіванок при "
+"видаленні або при отриманні рахунків-фактур."
diff --git a/locale/uk/LC_MESSAGES/discuss.po b/locale/uk/LC_MESSAGES/discuss.po
index f78bd8fd6..b660fd0db 100644
--- a/locale/uk/LC_MESSAGES/discuss.po
+++ b/locale/uk/LC_MESSAGES/discuss.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-27 11:08+0200\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018\n"
 "Language-Team: Ukrainian (https://www.transifex.com/odoo/teams/41243/uk/)\n"
@@ -32,35 +32,50 @@ msgstr ""
 msgid ""
 "This document is mainly dedicated to Odoo on-premise users who don't benefit"
 " from an out-of-the-box solution to send and receive emails in Odoo, unlike "
-"in `Odoo Online <https://www.odoo.com/trial>`__ & `Odoo.sh "
+"`Odoo Online <https://www.odoo.com/trial>`__ & `Odoo.sh "
 "<https://www.odoo.sh>`__."
 msgstr ""
-"Ця документація, в основному, націлена на користувачів Odoo, які не "
-"користуються нестандартним рішенням для надсилання та отримання електронних "
-"листів в Odoo, на відміну від `Odoo Online <https://www.odoo.com/trial>`__ &"
-" `Odoo.sh <https://www.odoo.sh>`__."
+"Цей документ, в основному, присвячений користувачам Odoo на власному "
+"сервері, які не користуються нестандартним рішенням для надсилання та "
+"отримання електронних листів в Odoo, на відміну від `Odoo Online "
+"<https://www.odoo.com/trial>`__ & `Odoo.sh <https://www.odoo.sh>`__."
 
 #: ../../discuss/email_servers.rst:9
 msgid ""
 "If no one in your company is used to manage email servers, we strongly "
-"recommend that you opt for such convenient Odoo hosting solutions. Indeed "
-"their email system works instantly and is monitored by professionals. "
-"Nevertheless you can still use your own email servers if you want to manage "
-"your email server's reputation yourself."
+"recommend that you opt for those Odoo hosting solutions. Their email system "
+"works instantly and is monitored by professionals. Nevertheless you can "
+"still use your own email servers if you want to manage your email server's "
+"reputation yourself."
 msgstr ""
-"Якщо ніхто у вашій компанії не використовує керування поштовими серверами, "
-"ми настійно рекомендуємо вам вибрати такі зручні рішення хостингу Odoo. "
-"Дійсно, їх електронна пошта працює миттєво і контролюється професіоналами. "
-"Тим не менше, ви все ще можете використовувати власні поштові сервери, якщо "
-"хочете самостійно керувати репутацією свого сервера електронної пошти."
+"Якщо жоден із вашої компанії не використовується для керування поштовими "
+"серверами, ми настійно рекомендуємо вам вибрати ці рішення для хостингу "
+"Odoo. Їх система електронної пошти працює миттєво і контролюється "
+"професіоналами. Тим не менше, ви все ще можете використовувати власні "
+"поштові сервери, якщо хочете самостійно керувати вашим сервером електронної "
+"пошти."
 
 #: ../../discuss/email_servers.rst:15
 msgid ""
-"You will find here below some useful information to do so by integrating "
-"your own email solution with Odoo. .. note::"
+"You will find here below some useful information on how to integrate your "
+"own email solution with Odoo."
 msgstr ""
-"Тут ви знайдете деяку корисну інформацію для цього, інтегруючи власне "
-"рішення електронної пошти з Odoo. .. note::"
+"Нижче ви знайдете деяку корисну інформацію про те, як інтегрувати власне "
+"рішення електронної пошти з Odoo."
+
+#: ../../discuss/email_servers.rst:18
+msgid ""
+"Office 365 email servers don't allow easiliy to send external emails from "
+"hosts like Odoo. Refer to the `Microsoft's documentation "
+"<https://support.office.com/en-us/article/How-to-set-up-a-multifunction-"
+"device-or-application-to-send-email-using-"
+"Office-365-69f58e99-c550-4274-ad18-c805d654b4c4>`__ to make it work."
+msgstr ""
+"Сервери електронної пошти Office 365 не дозволяють просто надсилати сторонні"
+" електронні листи з хостів, таких як Odoo. Зверніться до `документації "
+"Microsoft <https://support.office.com/en-us/article/How-to-set-up-a"
+"-multifunction-device-or-application-to-send-email-using-"
+"Office-365-69f58e99-c550-4274-ad18-c805d654b4c4>`__ щоби це запрацювало."
 
 #: ../../discuss/email_servers.rst:24
 msgid "How to manage outbound messages"
@@ -650,6 +665,27 @@ msgstr ""
 "планування календаря, переконайтеся, що їх *категорія* встановлена як "
 "*Зустріч*."
 
+#: ../../discuss/plan_activities.rst:40
+msgid "Schedule a chain of activities to follow"
+msgstr ""
+
+#: ../../discuss/plan_activities.rst:42
+msgid ""
+"Odoo helps you easily plan your usual flow of activities. Go to "
+":menuselection:`Configuration --> Activity Types` and set the common "
+"following steps as *Recommended next activities*."
+msgstr ""
+
+#: ../../discuss/plan_activities.rst:49
+msgid ""
+"Now, when an activity is completed, you can select *Done & schedule next*. "
+"The next steps will automatically be suggested to you."
+msgstr ""
+
+#: ../../discuss/plan_activities.rst:55
+msgid "Have fun getting better organized by planning activities !"
+msgstr ""
+
 #: ../../discuss/team_communication.rst:3
 msgid "How to efficiently communicate in team using channels"
 msgstr "Як ефективно комунікувати у команді, використовуючи канали"
diff --git a/locale/uk/LC_MESSAGES/ecommerce.po b/locale/uk/LC_MESSAGES/ecommerce.po
index f6bade8f1..3bb22669c 100644
--- a/locale/uk/LC_MESSAGES/ecommerce.po
+++ b/locale/uk/LC_MESSAGES/ecommerce.po
@@ -1,14 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2015-TODAY, Odoo S.A.
-# This file is distributed under the same license as the Odoo Business package.
+# This file is distributed under the same license as the Odoo package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 10.0\n"
+"Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-10 09:08+0200\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018\n"
 "Language-Team: Ukrainian (https://www.transifex.com/odoo/teams/41243/uk/)\n"
@@ -557,7 +557,7 @@ msgstr ""
 #: ../../ecommerce/maximizing_revenue/promo_code.rst:9
 #: ../../ecommerce/maximizing_revenue/reviews.rst:13
 msgid "Setup"
-msgstr "Налаштування"
+msgstr "Встановіть"
 
 #: ../../ecommerce/maximizing_revenue/promo_code.rst:11
 msgid ""
@@ -795,7 +795,7 @@ msgstr "Отримайте оплату"
 
 #: ../../ecommerce/shopper_experience/authorize.rst:3
 msgid "How to get paid with Authorize.Net"
-msgstr "Як отримати оплату з Authorize.Net"
+msgstr "Як отримати плату за допомогою Authorize.Net"
 
 #: ../../ecommerce/shopper_experience/authorize.rst:5
 msgid ""
@@ -1031,11 +1031,11 @@ msgstr "PayUmoney"
 
 #: ../../ecommerce/shopper_experience/payment.rst:33
 msgid "Sips"
-msgstr "Sips"
+msgstr "Набирає"
 
 #: ../../ecommerce/shopper_experience/payment.rst:34
 msgid "Stripe"
-msgstr "Stripe"
+msgstr "Смуга"
 
 #: ../../ecommerce/shopper_experience/payment.rst:38
 msgid "How to go live"
diff --git a/locale/uk/LC_MESSAGES/general.po b/locale/uk/LC_MESSAGES/general.po
index 398d3c519..b9aa0f807 100644
--- a/locale/uk/LC_MESSAGES/general.po
+++ b/locale/uk/LC_MESSAGES/general.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2015-TODAY, Odoo S.A.
-# This file is distributed under the same license as the Odoo Business package.
+# This file is distributed under the same license as the Odoo package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 10.0\n"
+"Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-10 09:08+0200\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Alina Semeniuk <alinasemeniuk1@gmail.com>, 2018\n"
+"Last-Translator: Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018\n"
 "Language-Team: Ukrainian (https://www.transifex.com/odoo/teams/41243/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,15 +20,17 @@ msgstr ""
 
 #: ../../general.rst:5
 msgid "General"
-msgstr ""
+msgstr "Загальне"
 
 #: ../../general/auth.rst:3
 msgid "Authentication"
-msgstr ""
+msgstr "Аутентифікація"
 
 #: ../../general/auth/google.rst:3
 msgid "How to allow users to sign in with their Google account"
 msgstr ""
+"Як дозволити користувачам входити за допомогою свого облікового запису "
+"Google"
 
 #: ../../general/auth/google.rst:5
 msgid ""
@@ -36,39 +38,50 @@ msgid ""
 "`https://console.developers.google.com/ "
 "<https://console.developers.google.com/>`_."
 msgstr ""
+"Підключіться до свого облікового запису Google і перейдіть на сторінку "
+"`https://console.developers.google.com/ "
+"<https://console.developers.google.com/>`_."
 
 #: ../../general/auth/google.rst:7
 msgid ""
 "Click on **Create Project** and enter the project name and other details."
-msgstr ""
+msgstr "Натисніть **Створити проект** і введіть назву проекту та інші деталі."
 
 #: ../../general/auth/google.rst:15
 msgid "Click on **Use Google APIs**"
-msgstr ""
+msgstr "Натисніть **Використовувати Google API**"
 
 #: ../../general/auth/google.rst:20
 msgid ""
 "On the left side menu, select the sub menu **Credentials** (from **API "
 "Manager**) then select **OAuth consent screen**."
 msgstr ""
+"У лівій частині меню виберіть підменю **Перелік** (у **Менеджер API**), "
+"потім виберіть **Екран згоди OAuth**."
 
 #: ../../general/auth/google.rst:25
 msgid ""
 "Fill in your address, email and the product name (for example odoo) and then"
 " save."
 msgstr ""
+"Введіть адресу, електронну пошту та назву товару (наприклад, odoo), а потім "
+"збережіть."
 
 #: ../../general/auth/google.rst:30
 msgid ""
 "Then click on **Add Credentials** and select the second option (OAuth 2.0 "
 "Client ID)."
 msgstr ""
+"Потім натисніть **Додати повноваження** та виберіть другий варіант (OAuth "
+"2.0 Client ID)."
 
 #: ../../general/auth/google.rst:38
 msgid ""
 "Check that the application type is set on **Web Application**. Now configure"
 " the allowed pages on which you will be redirected."
 msgstr ""
+"Перевірте, чи встановлено тип програми на **Веб-додаток**. Тепер налаштуйте "
+"дозволені сторінки, на які вас буде перенаправлено."
 
 #: ../../general/auth/google.rst:40
 msgid ""
@@ -76,20 +89,26 @@ msgid ""
 " the following link in the box: http://mydomain.odoo.com/auth_oauth/signin. "
 "Then click on **Create**"
 msgstr ""
+"Для цього заповніть поле **Авторизовані URI перенаправлення**. Скопіюйте та "
+"вставте наступне посилання в поле: "
+"http://mydomain.odoo.com/auth_oauth/signin. Потім натисніть **Створити**."
 
 #: ../../general/auth/google.rst:48
 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 ""
+"Після цього ви отримуєте дві інформації (ваш ID клієнта та Секретний ключ "
+"клієнта). Вам потрібно вставити свій ID клієнта в **Загальних "
+"налаштуваннях**."
 
 #: ../../general/base_import.rst:3
 msgid "Data Import"
-msgstr ""
+msgstr "Імпорт даних"
 
 #: ../../general/base_import/adapt_template.rst:3
 msgid "How to adapt an import template"
-msgstr ""
+msgstr "Як імпортувати шаблон імпорту"
 
 #: ../../general/base_import/adapt_template.rst:5
 msgid ""
@@ -127,12 +146,17 @@ msgid ""
 " its label doesn't fit any field of the system. If so, find the "
 "corresponding field using the search."
 msgstr ""
+"Коли ви додаєте новий стовпець, Odoo, можливо, не зможе його автоматично "
+"помітити, якщо його мітка не підходить для будь-якого поля системи. Якщо "
+"так, знайдіть відповідне поле за допомогою пошуку."
 
 #: ../../general/base_import/adapt_template.rst:27
 msgid ""
 "Then, use the label you found in your import template in order to make it "
 "work straight away the very next time you try to import."
 msgstr ""
+"Потім використовуйте мітку, яку ви знайшли у своєму шаблоні імпорту, щоби "
+"він працював відразу ж під час наступної спроби імпорту."
 
 #: ../../general/base_import/adapt_template.rst:31
 msgid "Why an “ID” column"
@@ -144,6 +168,9 @@ msgid ""
 "free to use the one of your previous software to ease the transition to "
 "Odoo."
 msgstr ""
+"**ID** (зовнішній ідентифікатор) - це унікальний ідентифікатор елементу. Не "
+"соромтеся використовувати попереднє програмне забезпечення для полегшення "
+"переходу на Odoo."
 
 #: ../../general/base_import/adapt_template.rst:36
 msgid ""
@@ -190,15 +217,15 @@ msgstr ""
 "Ви можете зробити це, використовуючи ім'я відповідного запису або його ID. "
 "ID очікується тоді, коли два записи мають однакове ім'я. У такому випадку "
 "додайте \"/ ID\" в кінці заголовку стовпця (наприклад, для атрибутів товару:"
-" атрибутитовару / атрибут / ID товару)."
+" атрибути товару / атрибут / ID товару)."
 
 #: ../../general/base_import/import_faq.rst:3
 msgid "How to import data into Odoo"
-msgstr ""
+msgstr "Як імпортувати дані в Odoo"
 
 #: ../../general/base_import/import_faq.rst:6
 msgid "How to start"
-msgstr ""
+msgstr "З чого почати?"
 
 #: ../../general/base_import/import_faq.rst:7
 msgid ""
@@ -206,10 +233,15 @@ msgid ""
 " or CSV (.csv) formats: contacts, products, bank statements, journal entries"
 " and even orders!"
 msgstr ""
+"Ви можете імпортувати дані в систему Odoo, використовуючи формат Excel "
+"(.xlsx) або CSV (.csv): контакти, товари, банківські виписки, записи в "
+"журналі та навіть замовлення!"
 
 #: ../../general/base_import/import_faq.rst:11
 msgid "Open the view of the object you want to populate and click *Import*."
 msgstr ""
+"Відкрийте перегляд об'єкта, який хочете заповнити, та натисніть "
+"*Імпортувати*."
 
 #: ../../general/base_import/import_faq.rst:16
 msgid ""
@@ -217,18 +249,22 @@ msgid ""
 "data. Such templates can be imported in one click; The data mapping is "
 "already done."
 msgstr ""
+"Вам надаються шаблони, які можна легко заповнити власними даними. Такі "
+"шаблони можна імпортувати одним кліком; Відображення даних вже виконано."
 
 #: ../../general/base_import/import_faq.rst:22
 msgid "How to adapt the template"
-msgstr ""
+msgstr "Як адаптувати шаблон?"
 
 #: ../../general/base_import/import_faq.rst:24
 msgid "Add, remove and sort columns to fit at best your data structure."
 msgstr ""
+"Додайте, видаліть та відсортуйте стовпці, щоби найкраще відповідати "
+"структурі даних."
 
 #: ../../general/base_import/import_faq.rst:25
 msgid "We advise to not remove the **ID** one (see why in the next section)."
-msgstr ""
+msgstr "Ми радимо не видаляти **ID** (Чому? Дивіться в наступному розділі)."
 
 #: ../../general/base_import/import_faq.rst:31
 msgid ""
@@ -237,16 +273,22 @@ msgid ""
 "columns manually when you test the import. Search the list for the "
 "corresponding field."
 msgstr ""
+"Коли ви додасте новий стовпець, Odoo, можливо, не зможе його автоматично "
+"помітити, якщо його мітка не підходить для будь-якого поля в Odoo. Не "
+"хвилюйтеся! Ви можете вставляти нові стовпці вручну під час перевірки "
+"імпорту. Знайдіть список відповідного поля."
 
 #: ../../general/base_import/import_faq.rst:39
 msgid ""
 "Then, use this field's label in your file in order to make it work straight "
 "on the very next time."
 msgstr ""
+"Потім використовуйте мітку цього поля у вашому файлі, щоби він працював "
+"наступного разу."
 
 #: ../../general/base_import/import_faq.rst:44
 msgid "How to import from another application"
-msgstr ""
+msgstr "Як імпортувати з іншої програми?"
 
 #: ../../general/base_import/import_faq.rst:46
 msgid ""
@@ -257,6 +299,13 @@ msgid ""
 "unique identifier. You can also find this record using its name but you will"
 " be stuck if at least 2 records have the same name."
 msgstr ""
+"Щоб відновити взаємозв'язок між різними записами, ви повинні використовувати"
+" унікальний ідентифікатор з оригінальної програми та позначити його на "
+"**ID** стовпця (зовнішній ідентифікатор) в Odoo. Коли ви імпортуєте інший "
+"запис, який посилається на перший, використовуйте **XXX/ID** (XXX/Зовнішній "
+"ідентифікатор) до оригінального унікального ідентифікатора. Ви також можете "
+"знайти цей запис, використовуючи його назву, але ви зупинитесь, якщо "
+"принаймні 2 записи мають однакову назву."
 
 #: ../../general/base_import/import_faq.rst:54
 msgid ""
@@ -264,10 +313,13 @@ msgid ""
 "re-import modified data later, it's thus good practice to specify it "
 "whenever possible."
 msgstr ""
+"**ID** також буде використаний для оновлення оригінального імпорту, якщо вам"
+" доведеться повторно імпортувати змінені дані пізніше, тому, якщо можливо, "
+"ви зможете його вказати."
 
 #: ../../general/base_import/import_faq.rst:60
 msgid "I cannot find the field I want to map my column to"
-msgstr ""
+msgstr "Я не можу знайти поле, в якому я хочу позначити стовпець"
 
 #: ../../general/base_import/import_faq.rst:62
 msgid ""
@@ -279,6 +331,12 @@ msgid ""
 "wrong or that you want to map your column to a field that is not proposed by"
 " default."
 msgstr ""
+"Odoo намагається знайти тип поля для кожного стовпця всередині вашого файлу "
+"на основі перших десяти рядків файлів. Наприклад, якщо у вас є стовпчик, "
+"який містить лише цифри, для вас буде вибрано лише ті поля, які мають тип "
+"*Ціле число*. Незважаючи на те, що в більшості випадків ця поведінка може "
+"бути хорошою і легкою, можливо, що це трапиться не так, або ви хочете "
+"вказати стовпчик на поле, яке не пропонується за замовчуванням."
 
 #: ../../general/base_import/import_faq.rst:71
 msgid ""
@@ -286,10 +344,13 @@ msgid ""
 "fields (advanced)** option, you will then be able to choose from the "
 "complete list of fields for each column."
 msgstr ""
+"Якщо це станеться, вам просто потрібно перевірити параметри **Показати поля "
+"пов'язаної моделі (розширено)**, після чого ви зможете вибрати з повного "
+"списку полів для кожного стовпця."
 
 #: ../../general/base_import/import_faq.rst:79
 msgid "Where can I change the date import format?"
-msgstr ""
+msgstr "Де я можу змінити формат імпортування дати?"
 
 #: ../../general/base_import/import_faq.rst:81
 msgid ""
@@ -300,6 +361,12 @@ msgid ""
 "inverted as example) as it is difficult to guess correctly which part is the"
 " day and which one is the month in a date like '01-03-2016'."
 msgstr ""
+"Odoo може автоматично визначити, якщо стовпчик є датою, і він намагатиметься"
+" вгадати формат дати з набору найбільш часто використовуваного формату дати."
+" Хоча цей процес може працювати для багатьох простих форматів дати, деякі "
+"екзотичні формати дат не будуть розпізнані, і це також може стати плутаниною"
+" (наприклад, день і місяць навпаки), оскільки важко правильно вгадати, яка "
+"частина є днем, а яка місяцем - \"01-03-2016\"."
 
 #: ../../general/base_import/import_faq.rst:83
 msgid ""
@@ -308,6 +375,10 @@ msgid ""
 "selector. If this format is incorrect you can change it to your liking using"
 " the *ISO 8601* to define the format."
 msgstr ""
+"Щоби переглянути, який формат дати Odoo знайшов у вашому файлі, ви можете "
+"перевірити **Формат дати**, який відображається, коли ви натискаєте "
+"**Параметри** під списком файлів. Якщо цей формат неправильний, ви можете "
+"змінити його, використовуючи *ISO 8601*, щоби визначити формат."
 
 #: ../../general/base_import/import_faq.rst:86
 msgid ""
@@ -316,10 +387,15 @@ msgid ""
 " stored. That way you will be sure that the date format is correct in Odoo "
 "whatever your locale date format is."
 msgstr ""
+"Якщо ви імпортуєте файл Excel (.xls, .xlsx), ви можете використовувати "
+"цифрові дати для зберігання дат, оскільки відображення дати у форматі excel "
+"відрізняється від способу його зберігання. Таким чином, ви будете впевнені, "
+"що формат дати в Odoo правильний, незалежно від формату вашої локальної "
+"дати."
 
 #: ../../general/base_import/import_faq.rst:91
 msgid "Can I import numbers with currency sign (e.g.: $32.00)?"
-msgstr ""
+msgstr "Чи можу я імпортувати номери з позначкою валюти (наприклад, $ 32.00)?"
 
 #: ../../general/base_import/import_faq.rst:93
 msgid ""
@@ -330,55 +406,65 @@ msgid ""
 "known to Odoo, it might not be recognized as a number though and it will "
 "crash."
 msgstr ""
+"Так, ми повністю підтримуємо числа в круглих дужках, щоби відобразити "
+"негативний знак, а також цифри з прикріпленим до них знаком валюти. Odoo "
+"також автоматично визначає, який тисячний/десятковий роздільник ви "
+"використовуєте (ви можете змінити ці параметри під **параметрами**). Якщо ви"
+" використовуєте символ валюти, який не відомий Odoo, він, можливо, не буде "
+"визнаний як номер, хоча й буде збігатися."
 
 #: ../../general/base_import/import_faq.rst:95
 msgid ""
 "Examples of supported numbers (using thirty-two thousands as an example):"
 msgstr ""
+"Приклади підтримуваних чисел (наприклад, з використанням тридцяти двох "
+"тисяч):"
 
 #: ../../general/base_import/import_faq.rst:97
 msgid "32.000,00"
-msgstr ""
+msgstr "32.000,00"
 
 #: ../../general/base_import/import_faq.rst:98
 msgid "32000,00"
-msgstr ""
+msgstr "32000,00"
 
 #: ../../general/base_import/import_faq.rst:99
 msgid "32,000.00"
-msgstr ""
+msgstr "32,000.00"
 
 #: ../../general/base_import/import_faq.rst:100
 msgid "-32000.00"
-msgstr ""
+msgstr "-32000.00"
 
 #: ../../general/base_import/import_faq.rst:101
 msgid "(32000.00)"
-msgstr ""
+msgstr "(32000.00)"
 
 #: ../../general/base_import/import_faq.rst:102
 msgid "$ 32.000,00"
-msgstr ""
+msgstr "$ 32.000,00"
 
 #: ../../general/base_import/import_faq.rst:103
 msgid "(32000.00 €)"
-msgstr ""
+msgstr "(32000.00 €)"
 
 #: ../../general/base_import/import_faq.rst:105
 msgid "Example that will not work:"
-msgstr ""
+msgstr "Приклад, який не буде працювати:"
 
 #: ../../general/base_import/import_faq.rst:107
 msgid "ABC 32.000,00"
-msgstr ""
+msgstr "ABC 32.000,00"
 
 #: ../../general/base_import/import_faq.rst:108
 msgid "$ (32.000,00)"
-msgstr ""
+msgstr "$ (32.000,00)"
 
 #: ../../general/base_import/import_faq.rst:113
 msgid "What can I do when the Import preview table isn't displayed correctly?"
 msgstr ""
+"Що робити, коли таблиці попереднього перегляду імпорту відображаються "
+"неправильно?"
 
 #: ../../general/base_import/import_faq.rst:115
 msgid ""
@@ -387,6 +473,10 @@ msgid ""
 "settings, you can modify the File Format Options (displayed under the Browse"
 " CSV file bar after you select your file)."
 msgstr ""
+"За замовчуванням попередній перегляд імпорту встановлюється комами як "
+"роздільники розділів і лапки як роздільники тексту. Якщо ваш файл CSV не має"
+" цих налаштувань, ви можете змінити параметри формату файлу (відображається "
+"під панеллю перегляду файлів CSV після вибору файлу)."
 
 #: ../../general/base_import/import_faq.rst:117
 msgid ""
@@ -394,12 +484,18 @@ msgid ""
 "detect the separations. You will need to change the file format options in "
 "your spreadsheet application. See the following question."
 msgstr ""
+"Зверніть увагу, якщо файл CSV має табуляцію як розділювач, Odoo не буде "
+"виявляти розділення. Вам потрібно буде змінити параметри формату файлу у "
+"вашій програмі для роботи з електронними таблицями. Дивіться наступне "
+"питання."
 
 #: ../../general/base_import/import_faq.rst:122
 msgid ""
 "How can I change the CSV file format options when saving in my spreadsheet "
 "application?"
 msgstr ""
+"Як змінити параметри формату файлу CSV при збереженні електронної таблиці в "
+"моїй програмі?"
 
 #: ../../general/base_import/import_faq.rst:124
 msgid ""
@@ -409,16 +505,25 @@ msgid ""
 "modify all three options (in 'Save As' dialog box > Check the box 'Edit "
 "filter settings' > Save)."
 msgstr ""
+"Якщо ви редагуєте та зберігаєте файли CSV у програмах електронної таблиці, "
+"регіональні параметри комп'ютера застосовуватимуться до сепаратора та "
+"розділювача. Ми рекомендуємо вам скористатись OpenOffice або LibreOffice "
+"Calc, оскільки вони дозволять вам змінити всі три варіанти (в діалоговому "
+"вікні «Зберегти як»> встановіть прапорець «Редагувати параметри фільтра»> "
+"Зберегти)."
 
 #: ../../general/base_import/import_faq.rst:126
 msgid ""
 "Microsoft Excel will allow you to modify only the encoding when saving (in "
 "'Save As' dialog box > click 'Tools' dropdown list > Encoding tab)."
 msgstr ""
+"Microsoft Excel дозволить вам змінювати лише кодування при збереженні (у "
+"діалоговому вікні «Зберегти як»> натисніть «Інструменти» у спадному списку> "
+"вкладка «Кодування»)."
 
 #: ../../general/base_import/import_faq.rst:131
 msgid "What's the difference between Database ID and External ID?"
-msgstr ""
+msgstr "Яка різниця між ID бази даних та зовнішнім ID?"
 
 #: ../../general/base_import/import_faq.rst:133
 msgid ""
@@ -429,44 +534,56 @@ msgid ""
 "mechanisms. You must use one and only one mechanism per field you want to "
 "import."
 msgstr ""
+"Деякі поля визначають зв'язок з іншим об'єктом. Наприклад, країна контакту -"
+" це посилання на запис об'єкта \"Країна\". Якщо ви хочете імпортувати такі "
+"поля, Odoo доведеться відтворити посилання між різними записами. Щоби "
+"допомогти вам імпортувати такі поля, Odoo надає 3 механізми. Для поля, яке "
+"потрібно імпортувати, потрібно використовувати єдиний механізм."
 
 #: ../../general/base_import/import_faq.rst:135
 msgid ""
 "For example, to reference the country of a contact, Odoo proposes you 3 "
 "different fields to import:"
 msgstr ""
+"Наприклад, щоби вказати країну контакту, Odoo пропонує вам 3 різних поля для"
+" імпорту:"
 
 #: ../../general/base_import/import_faq.rst:137
 msgid "Country: the name or code of the country"
-msgstr ""
+msgstr "Країна: назва або код країни"
 
 #: ../../general/base_import/import_faq.rst:138
 msgid ""
 "Country/Database ID: the unique Odoo ID for a record, defined by the ID "
 "postgresql column"
 msgstr ""
+"Країна/ID бази даних: унікальний ID Odoo для запису, визначеного стовпцем ID"
+" postgresql"
 
 #: ../../general/base_import/import_faq.rst:139
 msgid ""
 "Country/External ID: the ID of this record referenced in another application"
 " (or the .XML file that imported it)"
 msgstr ""
+"Країна/Зовнішній ID: ID запису, зазначеного в іншій програмі (або .XML-"
+"файлі, який імпортував його)"
 
 #: ../../general/base_import/import_faq.rst:141
 msgid "For the country Belgium, you can use one of these 3 ways to import:"
 msgstr ""
+"Для країни Бельгії можна використовувати один із цих 3 способів імпорту:"
 
 #: ../../general/base_import/import_faq.rst:143
 msgid "Country: Belgium"
-msgstr ""
+msgstr "Країна: Бельгія"
 
 #: ../../general/base_import/import_faq.rst:144
 msgid "Country/Database ID: 21"
-msgstr ""
+msgstr "Країна/ID бази даних: 21"
 
 #: ../../general/base_import/import_faq.rst:145
 msgid "Country/External ID: base.be"
-msgstr ""
+msgstr "Країна/Зовнішній ID: base.be"
 
 #: ../../general/base_import/import_faq.rst:147
 msgid ""
@@ -474,12 +591,17 @@ msgid ""
 "records in relations. Here is when you should use one or the other, "
 "according to your need:"
 msgstr ""
+"Згідно з вашими потребами, ви повинні використовувати один із цих трьох "
+"способів відстежувати пов'язані записи. Ось коли ви повинні використовувати "
+"той чи інший спосіб, відповідно до вашої потреби:"
 
 #: ../../general/base_import/import_faq.rst:149
 msgid ""
 "Use Country: This is the easiest way when your data come from CSV files that"
 " have been created manually."
 msgstr ""
+"Використовуйте країну: це найпростіший спосіб, коли ваші дані надходять з "
+"файлів CSV, які були створені вручну."
 
 #: ../../general/base_import/import_faq.rst:150
 msgid ""
@@ -488,12 +610,18 @@ msgid ""
 "may have several records with the same name, but they always have a unique "
 "Database ID)"
 msgstr ""
+"Використовуйте країну/ID бази даних: рідко використовуйте цю позначку. В "
+"основному це використовують розробники, оскільки головна перевага полягає в "
+"тому, щоби ніколи не було конфліктів (у вас може бути кілька записів з "
+"однаковою назвою, але вони завжди мають унікальний ID бази даних)."
 
 #: ../../general/base_import/import_faq.rst:151
 msgid ""
 "Use Country/External ID: Use External ID when you import data from a third "
 "party application."
 msgstr ""
+"Використовуйте назву країни/зовнішній ID: використовуйте зовнішній ID, коли "
+"ви імпортуєте дані зі сторонньої програми."
 
 #: ../../general/base_import/import_faq.rst:153
 msgid ""
@@ -503,22 +631,31 @@ msgid ""
 "\"Field/External ID\". The following two CSV files give you an example for "
 "Products and their Categories."
 msgstr ""
+"Коли ви використовуєте зовнішні ID, ви можете імпортувати файли CSV за "
+"допомогою стовпця \"Зовнішній ID\", щоби визначити зовнішній ID кожного "
+"імпортованого запису. Потім ви зможете зробити посилання на цей запис зі "
+"стовпчиками типу \"Поле/Зовнішній ID\". Наступні два файли CSV наводять "
+"приклад для товарів і їх категорій."
 
 #: ../../general/base_import/import_faq.rst:155
 msgid ""
 "`CSV file for categories "
 "<../../_static/example_files/External_id_3rd_party_application_product_categories.csv>`_."
 msgstr ""
+"`CSV файл для категорій "
+"<../../_static/example_files/External_id_3rd_party_application_product_categories.csv>`_."
 
 #: ../../general/base_import/import_faq.rst:157
 msgid ""
 "`CSV file for Products "
 "<../../_static/example_files/External_id_3rd_party_application_products.csv>`_."
 msgstr ""
+"`CSV файл для товарів "
+"<../../_static/example_files/External_id_3rd_party_application_products.csv>`_."
 
 #: ../../general/base_import/import_faq.rst:161
 msgid "What can I do if I have multiple matches for a field?"
-msgstr ""
+msgstr "Що робити, якщо у мене є кілька співпадінь для поля?"
 
 #: ../../general/base_import/import_faq.rst:163
 msgid ""
@@ -530,6 +667,13 @@ msgid ""
 "Category list (\"Misc. Products/Sellable\"). We recommend you modify one of "
 "the duplicates' values or your product category hierarchy."
 msgstr ""
+"Якщо, наприклад, у вас є дві категорії товарів з дочірнім ім'ям \"Sellable\""
+" (тобто. \"Різні Товари/ Продаються\" та \"Інші товари/Продаються\"), ваша "
+"перевірка призупиняється, але ви все одно можете імпортувати свої дані. "
+"Однак ми рекомендуємо не імпортувати дані, оскільки всі вони будуть "
+"пов'язані з першою категорією \"Продаються\", яка знаходиться в списку "
+"\"Категорії товарів\" (\"Різні Товари/Продаються\"). Ми рекомендуємо змінити"
+" один зі значень дублікатів або ієрархію категорії товарів."
 
 #: ../../general/base_import/import_faq.rst:165
 msgid ""
@@ -537,12 +681,17 @@ msgid ""
 "categories, we recommend you use make use of the external ID for this field "
 "'Category'."
 msgstr ""
+"Якщо ви не бажаєте змінювати своє налаштування категорій товарів, ми "
+"рекомендуємо використовувати зовнішній ідентифікатор для цього поля "
+"\"Категорія\"."
 
 #: ../../general/base_import/import_faq.rst:170
 msgid ""
 "How can I import a many2many relationship field (e.g. a customer that has "
 "multiple tags)?"
 msgstr ""
+"Як я можу імпортувати поле зв'язку many2many (наприклад, клієнта з кількома "
+"тегами)?"
 
 #: ../../general/base_import/import_faq.rst:172
 msgid ""
@@ -551,18 +700,26 @@ msgid ""
 "'Retailer' then you will encode \"Manufacturer,Retailer\" in the same column"
 " of your CSV file."
 msgstr ""
+"Теги слід розділити комою без будь-якого інтервалу. Наприклад, якщо ви "
+"хочете, щоби ваш клієнт був пов'язаний з обома тегами \"Виробник\" та "
+"\"Роздрібний продавець\", ви кодуєте \"Виробник, роздрібний продавець\" у "
+"тому ж рядку файлу CSV."
 
 #: ../../general/base_import/import_faq.rst:174
 msgid ""
 "`CSV file for Manufacturer, Retailer "
 "<../../_static/example_files/m2m_customers_tags.csv>`_."
 msgstr ""
+"`CSV для виробника, роздрібного продавця "
+"<../../_static/example_files/m2m_customers_tags.csv>`_."
 
 #: ../../general/base_import/import_faq.rst:179
 msgid ""
 "How can I import a one2many relationship (e.g. several Order Lines of a "
 "Sales Order)?"
 msgstr ""
+"Як імпортувати зв'язок one2many (наприклад, кілька рядків замовлення від "
+"замовлення на продаж)?"
 
 #: ../../general/base_import/import_faq.rst:181
 msgid ""
@@ -574,40 +731,58 @@ msgid ""
 "purchase.order_functional_error_line_cant_adpat.CSV file of some quotations "
 "you can import, based on demo data."
 msgstr ""
+"Якщо ви хочете імпортувати замовлення клієнта, що має кілька рядків "
+"замовлень; для кожного рядка замовлення вам потрібно зарезервувати певний "
+"рядок у файлі CSV. Рядок першого замовлення буде імпортовано в тому ж рядку,"
+" що й інформація щодо замовлення. Для будь-яких додаткових рядків замовлення"
+" буде потрібно додатковий рядок файлу, який не містить інформації у полях "
+"щодо замовлення. Наприклад, тут є файл "
+"buy.order_functional_error_line_cant_adpat.CSV деяких комерційних "
+"пропозицій, які ви можете імпортувати, на основі демо-даних."
 
 #: ../../general/base_import/import_faq.rst:184
 msgid ""
 "`File for some Quotations "
 "<../../_static/example_files/purchase.order_functional_error_line_cant_adpat.csv>`_."
 msgstr ""
+"`Файл для деяких комерційних пропозицій "
+"<../../_static/example_files/purchase.order_functional_error_line_cant_adpat.csv>`_."
 
 #: ../../general/base_import/import_faq.rst:186
 msgid ""
 "The following CSV file shows how to import purchase orders with their "
 "respective purchase order lines:"
 msgstr ""
+"У наведеному нижче файлі CSV показано, як імпортувати замовлення на купівлю "
+"за допомогою відповідних рядків замовлення."
 
 #: ../../general/base_import/import_faq.rst:188
 msgid ""
 "`Purchase orders with their respective purchase order lines "
 "<../../_static/example_files/o2m_purchase_order_lines.csv>`_."
 msgstr ""
+"`Замовлення на купівлю з відповідними рядками замовлення на купівлю "
+"<../../_static/example_files/o2m_purchase_order_lines.csv>`_."
 
 #: ../../general/base_import/import_faq.rst:190
 msgid ""
 "The following CSV file shows how to import customers and their respective "
 "contacts:"
 msgstr ""
+"У наведеному нижче файлі CSV показано, як імпортувати клієнтів та їх "
+"відповідні контакти:"
 
 #: ../../general/base_import/import_faq.rst:192
 msgid ""
 "`Customers and their respective contacts "
 "<../../_static/example_files/o2m_customers_contacts.csv>`_."
 msgstr ""
+"`Клієнти та їхні відповідні контакти "
+"<../../_static/example_files/o2m_customers_contacts.csv>`_."
 
 #: ../../general/base_import/import_faq.rst:197
 msgid "Can I import several times the same record?"
-msgstr ""
+msgstr "Чи можу я кілька разів імпортувати той самий запис?"
 
 #: ../../general/base_import/import_faq.rst:199
 msgid ""
@@ -618,16 +793,24 @@ msgid ""
 "two imports. Odoo will take care of creating or modifying each record "
 "depending if it's new or not."
 msgstr ""
+"Якщо ви імпортуєте файл, який містить один зі стовпців \"Зовнішній ID\" або "
+"\"ID бази даних\", записи, які вже були імпортовані, будуть змінені, а не "
+"створені. Це дуже зручно, оскільки система дозволяє імпортувати кілька разів"
+" один і той же файл CSV при внесенні деяких змін між двома імпортами. Odoo "
+"буде дбати про створення або зміну кожного запису залежно від того, він "
+"новий чи ні."
 
 #: ../../general/base_import/import_faq.rst:201
 msgid ""
 "This feature allows you to use the Import/Export tool of Odoo to modify a "
 "batch of records in your favorite spreadsheet application."
 msgstr ""
+"Ця функція дозволяє вам використовувати інструмент імпорту/експорту Odoo для"
+" зміни записів цілим пакетом у вашій програмі електронної таблиці."
 
 #: ../../general/base_import/import_faq.rst:206
 msgid "What happens if I do not provide a value for a specific field?"
-msgstr ""
+msgstr "Що станеться, якщо я не надам значення для конкретного поля?"
 
 #: ../../general/base_import/import_faq.rst:208
 msgid ""
@@ -636,10 +819,14 @@ msgid ""
 "in your CSV file, Odoo will set the EMPTY value in the field, instead of "
 "assigning the default value."
 msgstr ""
+"Якщо ви не встановлюєте всі поля у файлі CSV, Odoo призначить значення за "
+"замовчуванням для всіх невизначених полів. Але якщо ви встановлюєте поля з "
+"порожніми значеннями у своєму файлі CSV, Odoo встановить значення EMPTY у "
+"полі, замість того, аби призначити значення за замовчуванням."
 
 #: ../../general/base_import/import_faq.rst:213
 msgid "How to export/import different tables from an SQL application to Odoo?"
-msgstr ""
+msgstr "Як експортувати/імпортувати різні таблиці з додатка SQL до Odoo?"
 
 #: ../../general/base_import/import_faq.rst:215
 msgid ""
@@ -648,6 +835,10 @@ msgid ""
 " companies and persons, you will have to recreate the link between each "
 "person and the company they work for)."
 msgstr ""
+"Якщо вам потрібно імпортувати дані з різних таблиць, вам доведеться "
+"відтворити зв'язки між записами, що належать до різних таблиць. (наприклад, "
+"якщо ви імпортуєте компанії та людей, вам доведеться відтворити зв'язок між "
+"кожною особою та компанією, в якій вони працюють)."
 
 #: ../../general/base_import/import_faq.rst:217
 msgid ""
@@ -658,6 +849,12 @@ msgid ""
 "this \"External ID\" with the name of the application or table. (like "
 "'company_1', 'person_1' instead of '1')"
 msgstr ""
+"Щоби керувати зв'язками між таблицями, ви можете використовувати \"Зовнішній"
+" ID\" об'єктів Odoo. \"Зовнішній ID\" запису є унікальним ідентифікатором "
+"цього запису в іншій програмі. Цей \"Зовнішній ID\" повинен бути унікальним "
+"для всіх записів усіх об'єктів, тому доцільно привласнити \"Зовнішній ID\" з"
+" назвою програми чи таблиці. (наприклад, \"company_1\", \"person_1\" замість"
+" \"1\")."
 
 #: ../../general/base_import/import_faq.rst:219
 msgid ""
@@ -668,26 +865,36 @@ msgid ""
 "href=\"/base_import/static/csv/database_import_test.sql\">dump of such a "
 "PostgreSQL database</a>)"
 msgstr ""
+"Припустимо, у вас є база даних SQL з двома таблицями, які ви хочете "
+"імпортувати: компанії та особи. Кожна людина належить до однієї компанії, "
+"тому вам доведеться відтворити зв'язок між людиною та компанією, в якій він "
+"працює. (Якщо ви хочете перевірити цей приклад, ось <a "
+"href=\"/base_import/static/csv/database_import_test.sql\">копія такої бази "
+"даних PostgreSQL</a>)"
 
 #: ../../general/base_import/import_faq.rst:221
 msgid ""
 "We will first export all companies and their \"External ID\". In PSQL, write"
 " the following command:"
 msgstr ""
+"Спочатку ми експортуємо всі компанії та їх \"Зовнішній ID\". У PSQL, "
+"напишіть таку команду:"
 
 #: ../../general/base_import/import_faq.rst:227
 msgid "This SQL command will create the following CSV file::"
-msgstr ""
+msgstr "Ця команда SQL створить наступний файл CSV::"
 
 #: ../../general/base_import/import_faq.rst:234
 msgid ""
 "To create the CSV file for persons, linked to companies, we will use the "
 "following SQL command in PSQL:"
 msgstr ""
+"Щоби створити файл CSV для осіб, пов'язаних з компаніями, ми використаємо "
+"наступну команду SQL у PSQL:"
 
 #: ../../general/base_import/import_faq.rst:240
 msgid "It will produce the following CSV file::"
-msgstr ""
+msgstr "Він буде створювати такий файл CSV::"
 
 #: ../../general/base_import/import_faq.rst:248
 msgid ""
@@ -698,6 +905,12 @@ msgid ""
 "avoid a conflict of ID between persons and companies (person_1 and company_1"
 " who shared the same ID 1 in the orignial database)."
 msgstr ""
+"Як ви бачите у цьому файлі, Фаб'єн і Лоуренс працюють у компанії Bigees "
+"(company_1), а Ерік працює в компанії Organi. Зв'язок між особами та "
+"компаніями здійснюється за допомогою зовнішнього ідентифікатора компаній. "
+"Нам довелося привласнювати \"Зовнішній ID\" за назвою таблиці, щоб уникнути "
+"конфлікту ідентифікатора між особами та компаніями (person_1 та company_1, "
+"які поділилися однаковим ідентифікатором 1 в оригінальній базі даних)."
 
 #: ../../general/base_import/import_faq.rst:250
 msgid ""
@@ -706,24 +919,28 @@ msgid ""
 "contacts and 3 companies. (the firsts two contacts are linked to the first "
 "company). You must first import the companies and then the persons."
 msgstr ""
+"Обидва файли готові до імпорту в Odoo без будь-яких змін. Після імпорту цих "
+"двох файлів CSV у вас буде 4 контакти та 3 компанії. (перші два контакти "
+"пов'язані з першою компанією). Спочатку потрібно імпортувати компанії, а "
+"потім особи."
 
 #: ../../general/odoo_basics.rst:3
 msgid "Basics"
-msgstr ""
+msgstr "Основне"
 
 #: ../../general/odoo_basics/add_user.rst:3
 msgid "How to add a user"
-msgstr ""
+msgstr "Як додати користувача"
 
 #: ../../general/odoo_basics/add_user.rst:5
 msgid ""
 "Odoo provides you with the option to add additional users at any given "
 "point."
-msgstr ""
+msgstr "Odoo надає вам можливість додавати користувачів у будь-який момент."
 
 #: ../../general/odoo_basics/add_user.rst:9
 msgid "Add individual users"
-msgstr ""
+msgstr "Додайте окремих користувачів"
 
 #: ../../general/odoo_basics/add_user.rst:11
 msgid ""
@@ -732,12 +949,19 @@ msgid ""
 "professional email address - the one he will use to log into Odoo instance -"
 " and a picture."
 msgstr ""
+"У модулі \"Налаштування\" перейдіть до підменю :menuselection:`Користувачі "
+"--> Користувачі` та натисніть **СТВОРИТИ**. Спочатку додайте ім'я вашого "
+"нового користувача та адресу електронної пошти - ту, яку він буде "
+"використовувати для входу в Odoo, та зображення."
 
 #: ../../general/odoo_basics/add_user.rst:19
 msgid ""
 "Under Access Rights, you can choose which applications your user can access "
 "and use. Different levels of rights are available depending on the app."
 msgstr ""
+"У розділі Права доступу ви можете вибрати, до яких додатків ваш користувач "
+"може отримати доступ та які використовувати. Доступні різні рівні залежно "
+"від програми."
 
 #: ../../general/odoo_basics/add_user.rst:23
 msgid ""
@@ -745,6 +969,10 @@ msgid ""
 "invitation email will automatically be sent to the user. The user must click"
 " on it to accept the invitation to your instance and create a log-in."
 msgstr ""
+"Коли ви закінчите редагувати сторінку та натиснете кнопку **ЗБЕРЕГТИ**, "
+"електронний лист запрошення автоматично надсилатиметься користувачеві. "
+"Користувач повинен натиснути на нього, щоби прийняти запрошення до системи "
+"та створити вхід."
 
 #: ../../general/odoo_basics/add_user.rst:32
 msgid ""
@@ -752,6 +980,9 @@ msgid ""
 "Refer to our `*Pricing page* <https://www.odoo.com/pricing>`__ for more "
 "information."
 msgstr ""
+"Пам'ятайте, що кожен додатковий користувач збільшить вашу плату за підписку."
+" Для отримання додаткової інформації зверніться до нашої сторінки `*Ціна* "
+"<https://www.odoo.com/pricing>`__."
 
 #: ../../general/odoo_basics/add_user.rst:39
 msgid ""
@@ -761,36 +992,42 @@ msgid ""
 " to set his password. You will then be able to define his accesses rights "
 "under the :menuselection:`Settings --> Users menu`."
 msgstr ""
+"Ви також можете додати нового користувача \"на льоту\" з інформаційної "
+"панелі. З наведеного вище знімка екрану введіть адресу електронної пошти "
+"користувача, якого ви хочете додати, і натисніть на **ЗАПРОСИТИ**. "
+"Користувач отримає запрошення електронною поштою, що містить посилання для "
+"встановлення його пароля. Після цього ви зможете визначити його права "
+"доступу в меню :menuselection:`Налаштування --> Меню користувача`."
 
 #: ../../general/odoo_basics/add_user.rst:45
 msgid ""
 "`Deactivating Users <../../db_management/documentation.html#deactivating-"
 "users>`_"
 msgstr ""
-
-#: ../../general/odoo_basics/add_user.rst:46
-msgid ":doc:`../../crm/salesteam/setup/create_team`"
-msgstr ""
+"`Деактивувати користувачів <../../db_management/documentation.html"
+"#deactivating-users>`_"
 
 #: ../../general/odoo_basics/choose_language.rst:3
 msgid "Manage Odoo in your own language"
-msgstr ""
+msgstr "Управляйте Odoo вашою рідною мовою"
 
 #: ../../general/odoo_basics/choose_language.rst:5
 msgid ""
 "Odoo provides you with the option to manage Odoo in different languages, and"
 " each user can use Odoo in his own language ."
 msgstr ""
+"Odoo надає вам можливість керувати Odoo різними мовами, і кожен користувач "
+"може використовувати Odoo своєю мовою."
 
 #: ../../general/odoo_basics/choose_language.rst:9
 msgid "Load your desired language"
-msgstr ""
+msgstr "Завантажте потрібну мову"
 
 #: ../../general/odoo_basics/choose_language.rst:11
 msgid ""
 "The first thing to do is to load your desired language on your Odoo "
 "instance."
-msgstr ""
+msgstr "Перше, що потрібно зробити, це завантажити бажану мову у версію Odoo."
 
 #: ../../general/odoo_basics/choose_language.rst:14
 msgid ""
@@ -798,42 +1035,53 @@ msgid ""
 " the page select :menuselection:`Translations --> Load a Translation`, "
 "select a language to install and click on **LOAD.**"
 msgstr ""
+"На загальній інформаційній панелі натисніть на додаток **Налаштування**; у "
+"верхньому лівому куті сторінки виберіть :menuselection:`Переклад --> "
+"Завантажити переклад`, виберіть мову для встановлення та натисніть на "
+"**ЗАВАНТАЖИТИ**."
 
 #: ../../general/odoo_basics/choose_language.rst:23
 msgid ""
 "If you check the \"Websites to translate\" checkbox you will have the option"
 " to change the navigation language on your website."
 msgstr ""
+"Якщо ви перевірите позначення \"Веб-сайти для перекладу\", ви зможете "
+"змінити мову навігації на своєму веб-сайті."
 
 #: ../../general/odoo_basics/choose_language.rst:27
 msgid "Change your language"
-msgstr ""
+msgstr "Змініть мову"
 
 #: ../../general/odoo_basics/choose_language.rst:29
 msgid ""
 "You can change the language to the installed language by going to the drop-"
 "down menu at the top right side of the screen, choose **Preferences**."
 msgstr ""
+"Ви можете змінити мову на встановлену, перейшовши до спадного меню у верхній"
+" правій частині екрана та вибравши **Параметри**."
 
 #: ../../general/odoo_basics/choose_language.rst:36
 msgid ""
 "Then change the Language setting to your installed language and click "
 "**SAVE.**"
 msgstr ""
+"Потім змініть налаштування мови на встановлену та натисніть **Зберегти**."
 
 #: ../../general/odoo_basics/choose_language.rst:42
 msgid "Open a new menu to view the changes."
-msgstr ""
+msgstr "Відкрийте нове меню, щоби переглянути зміни."
 
 #: ../../general/odoo_basics/choose_language.rst:45
 msgid "Change another user's language"
-msgstr ""
+msgstr "Змініть мову іншого користувача"
 
 #: ../../general/odoo_basics/choose_language.rst:47
 msgid ""
 "Odoo also gives you the possibility for each user to choose his preferred "
 "language."
 msgstr ""
+"Odoo також дає вам можливість для кожного користувача вибрати його бажану "
+"мову."
 
 #: ../../general/odoo_basics/choose_language.rst:50
 msgid ""
@@ -844,7 +1092,13 @@ msgid ""
 " change the Language to any previously installed language and click "
 "**SAVE.**"
 msgstr ""
+"Щоби змінити мову іншого користувача, виберіть :menuselection:`Користувачі "
+"--> Користувачі` в додатку Налаштування. Тут ви маєте список всіх "
+"користувачів, і ви можете вибрати користувача, для якого ви хочете змінити "
+"мову. Виберіть користувача та натисніть **Редагувати** у верхньому лівому "
+"куті. У розділі Параметри ви можете змінити мову на будь-яку раніше "
+"встановлену та натисніть **ЗБЕРЕГТИ**."
 
 #: ../../general/odoo_basics/choose_language.rst:61
 msgid ":doc:`../../website/publish/translate`"
-msgstr ""
+msgstr ":doc:`../../website/publish/translate`"
diff --git a/locale/uk/LC_MESSAGES/getting_started.po b/locale/uk/LC_MESSAGES/getting_started.po
index 0d66b6db0..49786956e 100644
--- a/locale/uk/LC_MESSAGES/getting_started.po
+++ b/locale/uk/LC_MESSAGES/getting_started.po
@@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-07-26 12:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Alina Semeniuk <alinasemeniuk1@gmail.com>, 2018\n"
+"Last-Translator: Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018\n"
 "Language-Team: Ukrainian (https://www.transifex.com/odoo/teams/41243/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -368,7 +368,7 @@ msgstr ""
 
 #: ../../getting_started/documentation.rst:224
 msgid "Support"
-msgstr ""
+msgstr "Підтримка"
 
 #: ../../getting_started/documentation.rst:226
 msgid ""
diff --git a/locale/uk/LC_MESSAGES/helpdesk.po b/locale/uk/LC_MESSAGES/helpdesk.po
index a58889f86..f454a15cf 100644
--- a/locale/uk/LC_MESSAGES/helpdesk.po
+++ b/locale/uk/LC_MESSAGES/helpdesk.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2015-TODAY, Odoo S.A.
-# This file is distributed under the same license as the Odoo Business package.
+# This file is distributed under the same license as the Odoo package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 10.0\n"
+"Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-08 14:28+0100\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Alina Semeniuk <alinasemeniuk1@gmail.com>, 2018\n"
+"Last-Translator: Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018\n"
 "Language-Team: Ukrainian (https://www.transifex.com/odoo/teams/41243/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,11 +20,11 @@ msgstr ""
 
 #: ../../helpdesk.rst:5
 msgid "Helpdesk"
-msgstr ""
+msgstr "Служба підтримки"
 
 #: ../../helpdesk/getting_started.rst:3
 msgid "Get started with Odoo Helpdesk"
-msgstr ""
+msgstr "Почніть Службу підтримку в Odoo"
 
 #: ../../helpdesk/getting_started.rst:6
 msgid "Overview"
@@ -32,29 +32,33 @@ msgstr "Загальний огляд"
 
 #: ../../helpdesk/getting_started.rst:9
 msgid "Getting started with Odoo Helpdesk"
-msgstr ""
+msgstr "Початок роботи зі Службою підтримки Odoo"
 
 #: ../../helpdesk/getting_started.rst:11
 msgid "Installing Odoo Helpdesk:"
-msgstr ""
+msgstr "Встановлення Служби підтримки Odoo:"
 
 #: ../../helpdesk/getting_started.rst:13
 msgid "Open the Apps module, search for \"Helpdesk\", and click install"
-msgstr ""
+msgstr "Відкрийте Модулі, знайдіть \"Службу підтримки\" та встановіть."
 
 #: ../../helpdesk/getting_started.rst:19
 msgid "Set up Helpdesk teams"
-msgstr ""
+msgstr "Налаштуйте команди служби підтримки"
 
 #: ../../helpdesk/getting_started.rst:21
 msgid "By default, Odoo Helpdesk comes with a team installed called \"Support\""
 msgstr ""
+"За замовчуванням Служба підтримки Odoo встановлюється з командою під назвою "
+"\"Підтримка\""
 
 #: ../../helpdesk/getting_started.rst:26
 msgid ""
 "To modify this team, or create additional teams, select \"Configuration\" in"
 " the purple bar and select \"Settings\""
 msgstr ""
+"Щоб змінити цю команду або створити додаткові команди, виберіть "
+"\"Налаштування\" на фіолетовий панелі та виберіть \"Налаштування\"."
 
 #: ../../helpdesk/getting_started.rst:32
 msgid ""
@@ -63,10 +67,14 @@ msgid ""
 "For the assignation method you can have tickets assigned randomly, balanced,"
 " or manually."
 msgstr ""
+"Тут ви можете створити нові команди, вирішити, які члени команди додавати до"
+" цієї команди, як ваші клієнти можуть подавати заявки та встановлювати "
+"політику та рейтинги SLA. Для методів присвоєння ви можете мати заявки, "
+"призначені випадково, збалансовано або вручну."
 
 #: ../../helpdesk/getting_started.rst:38
 msgid "How to set up different stages for each team"
-msgstr ""
+msgstr "Як налаштувати різні етапи для кожної команди"
 
 #: ../../helpdesk/getting_started.rst:40
 msgid ""
@@ -74,6 +82,9 @@ msgid ""
 "settings module, and select the link for \"Activate the developer mode\" on "
 "the lower right-hand side."
 msgstr ""
+"Спочатку вам потрібно активувати режим розробника. Для цього перейдіть до "
+"свого модуля налаштувань та виберіть посилання \"Активувати режим "
+"розробника\" у нижній правій частині сторінки."
 
 #: ../../helpdesk/getting_started.rst:47
 msgid ""
@@ -82,26 +93,36 @@ msgid ""
 "can create new stages and assign those stages to 1 or multiple teams "
 "allowing for customizable stages for each team!"
 msgstr ""
+"Тепер, коли ви повернетесь до свого модуля Служба підтримки і виберете "
+"\"Налаштування\" на фіолетовій панелі, ви знайдете додаткові параметри, такі"
+" як \"Етапи\". Тут ви можете створити нові етапи та призначити їх для однієї"
+" або кількох команд, що дозволить налаштувати етапи для кожної команди."
 
 #: ../../helpdesk/getting_started.rst:53
 msgid "Start receiving tickets"
-msgstr ""
+msgstr "Почніть отримувати заявки"
 
 #: ../../helpdesk/getting_started.rst:56
 msgid "How can my customers submit tickets?"
-msgstr ""
+msgstr "Як мої клієнти можуть подавати заявки?"
 
 #: ../../helpdesk/getting_started.rst:58
 msgid ""
 "Select \"Configuration\" in the purple bar and select \"Settings\", select "
 "your Helpdesk team. Under \"Channels you will find 4 options:"
 msgstr ""
+"Виберіть \"Налаштування\" на фіолетовий панелі та виберіть \"Налаштування\","
+" виберіть команду \"Служба підтримки\". У розділі \"Канали\" ви знайдете 4 "
+"варіанти:"
 
 #: ../../helpdesk/getting_started.rst:64
 msgid ""
 "Email Alias allows for customers to email the alias you choose to create a "
 "ticket. The subject line of the email with become the Subject on the ticket."
 msgstr ""
+"Псевдонім електронної пошти дозволяє клієнтам надсилати електронні листи, "
+"які ви обираєте для створення заявки. Тема рядка електронного листа стає "
+"темою заявки."
 
 #: ../../helpdesk/getting_started.rst:71
 msgid ""
@@ -109,6 +130,9 @@ msgid ""
 "yourwebsite.com/helpdesk/support-1/submit and submit a ticket via a website "
 "form - much like odoo.com/help!"
 msgstr ""
+"Форма веб-сайту дозволяє вашому клієнту перейти на сторінку "
+"yourwebsite.com/helpdesk/support-1/submit і надіслати заявку через форму "
+"веб-сайту - так само, як odoo.com/help!"
 
 #: ../../helpdesk/getting_started.rst:78
 msgid ""
@@ -116,6 +140,9 @@ msgid ""
 "website. Your customer will begin the live chat and your Live Chat Operator "
 "can create the ticket by using the command /helpdesk Subject of Ticket."
 msgstr ""
+"Онлайн-чат дозволяє вашим клієнтам подавати заявки через онлайн-чат на "
+"вашому веб-сайті. Ваш клієнт розпочне чат, і оператор онлайн-чату зможе "
+"створити заявку за допомогою теми заявки команди/служби підтримки."
 
 #: ../../helpdesk/getting_started.rst:86
 msgid ""
@@ -123,10 +150,13 @@ msgid ""
 "documentation `*here* "
 "<https://www.odoo.com/documentation/11.0/webservices/odoo.html>`__."
 msgstr ""
+"Остаточний варіант відправлення заявок - через з'єднання API. Перегляньте "
+"документацію `*тут* "
+"<https://www.odoo.com/documentation/11.0/webservices/odoo.html>`__."
 
 #: ../../helpdesk/getting_started.rst:91
 msgid "Tickets have been created, now what?"
-msgstr ""
+msgstr "Заявки створені, що тепер?"
 
 #: ../../helpdesk/getting_started.rst:93
 msgid ""
@@ -135,22 +165,30 @@ msgid ""
 "tickets using the \"Assign To Me\" button on the top left of a ticket or by "
 "adding themselves to the \"Assigned to\" field."
 msgstr ""
+"Тепер ваші співробітники можуть почати працювати над ними! Якщо ви обрали "
+"метод ручного присвоєння, то вашим співробітникам доведеться призначати себе"
+" на заявки, використовуючи кнопку \"Призначити для мене\" в лівому верхньому"
+" кутку заявки або додати себе до поля \"Призначений для\"."
 
 #: ../../helpdesk/getting_started.rst:101
 msgid ""
 "If you have selected \"Random\" or \"Balanced\" assignation method, your "
 "tickets will be assigned to a member of that Helpdesk team."
 msgstr ""
+"Якщо ви вибрали метод призначення \"Випадковий\" або \"Збалансований\", ваші"
+" заявки будуть призначатися членам цієї команди служби підтримки."
 
 #: ../../helpdesk/getting_started.rst:104
 msgid ""
 "From there they will begin working on resolving the tickets! When they are "
 "completed, they will move the ticket to the solved stage."
 msgstr ""
+"Звідти вони почнуть працювати над вирішенням заявок! Коли вони будуть "
+"завершені, вони перемістять заявку на стадію завершення."
 
 #: ../../helpdesk/getting_started.rst:108
 msgid "How do I mark this ticket as urgent?"
-msgstr ""
+msgstr "Як позначити цю заявку, як термінову?"
 
 #: ../../helpdesk/getting_started.rst:110
 msgid ""
@@ -158,54 +196,65 @@ msgid ""
 " but selecting one or more stars on the ticket. You can do this in the "
 "Kanban view or on the ticket form."
 msgstr ""
+"На ваших заявках ви побачите зірочки. Ви можете визначити, наскільки "
+"терміновою є заявка, але вибирати одну або декілька зірок на ній. Ви можете "
+"зробити це в Канбані або на формі заявки."
 
 #: ../../helpdesk/getting_started.rst:117
 msgid ""
 "To set up a Service Level Agreement Policy for your employees, first "
 "activate the setting under \"Settings\""
 msgstr ""
+"Щоб налаштувати політику Угоди про якість обслуговування ваших "
+"співробітників, спершу активуйте налаштування в розділі \"Налаштування\"."
 
 #: ../../helpdesk/getting_started.rst:123
 msgid "From here, select \"Configure SLA Policies\" and click \"Create\"."
-msgstr ""
+msgstr "Звідси виберіть \"Налаштувати політику SLA\" та натисніть \"Створити\"."
 
 #: ../../helpdesk/getting_started.rst:125
 msgid ""
 "You will fill in information like the Helpdesk team, what the minimum "
 "priority is on the ticket (the stars) and the targets for the ticket."
 msgstr ""
+"Ви будете заповнювати інформацію, подібну до команди служби підтримки, про "
+"мінімальний пріоритет на заявці (зірки) та цілі для заявки."
 
 #: ../../helpdesk/getting_started.rst:132
 msgid "What if a ticket is blocked or is ready to be worked on?"
-msgstr ""
+msgstr "Що робити, якщо заявка заблоковано або готова до виконання?"
 
 #: ../../helpdesk/getting_started.rst:134
 msgid ""
 "If a ticket cannot be resolved or is blocked, you can adjust the \"Kanban "
 "State\" on the ticket. You have 3 options:"
 msgstr ""
+"Якщо заявка не може бути вирішеною або заблокована, ви можете змінити стан "
+"заявки на Канбані. У вас є 3 варіанти:"
 
 #: ../../helpdesk/getting_started.rst:137
 msgid "Grey - Normal State"
-msgstr ""
+msgstr "Сірий - нормальний стан"
 
 #: ../../helpdesk/getting_started.rst:139
 msgid "Red - Blocked"
-msgstr ""
+msgstr "Червоний - заблокована"
 
 #: ../../helpdesk/getting_started.rst:141
 msgid "Green - Ready for next stage"
-msgstr ""
+msgstr "Зелений - готова до наступного етапу"
 
 #: ../../helpdesk/getting_started.rst:143
 msgid ""
 "Like the urgency stars you can adjust the state in the Kanban or on the "
 "Ticket form."
 msgstr ""
+"Подібно зіркам із нагальністю, ви можете налаштувати стан у Канбані або на "
+"формі заявки."
 
 #: ../../helpdesk/getting_started.rst:150
 msgid "How can my employees log time against a ticket?"
-msgstr ""
+msgstr "Як мої співробітники можуть зареєструвати час за заявкою?"
 
 #: ../../helpdesk/getting_started.rst:152
 msgid ""
@@ -213,36 +262,48 @@ msgid ""
 "Ticket\". You will see a field appear where you can select the project the "
 "timesheets will log against."
 msgstr ""
+"Спочатку перейдіть до \"Налаштування\" та виберіть параметр \"Табель на "
+"заявці\". З'явиться поле, де ви можете вибрати проект, куди потрібно "
+"записувати табель."
 
 #: ../../helpdesk/getting_started.rst:159
 msgid ""
 "Now that you have selected a project, you can save. If you move back to your"
 " tickets, you will see a new tab called \"Timesheets\""
 msgstr ""
+"Тепер, коли ви вибрали проект, ви можете зберегти. Якщо ви повернетесь до "
+"своїх заявок, ви побачите нову вкладку \"Табелі\"."
 
 #: ../../helpdesk/getting_started.rst:165
 msgid ""
 "Here you employees can add a line to add work they have done for this "
 "ticket."
 msgstr ""
+"Тут співробітники можуть додати рядок, щоб додати роботу, яку вони зробили "
+"для цієї заявки."
 
 #: ../../helpdesk/getting_started.rst:169
 msgid "How to allow your customers to rate the service they received"
-msgstr ""
+msgstr "Як дозволити своїм клієнтам оцінювати отриману ними послугу"
 
 #: ../../helpdesk/getting_started.rst:171
 msgid "First, you will need to activate the ratings setting under \"Settings\""
 msgstr ""
+"По-перше, вам потрібно активувати параметри оцінювання в розділі "
+"\"Налаштування\"."
 
 #: ../../helpdesk/getting_started.rst:176
 msgid ""
 "Now, when a ticket is moved to its solved or completed stage, it will send "
 "an email to the customer asking how their service went."
 msgstr ""
+"Тепер, коли заявка переміщується до її вирішення або завершеного етапу, вона"
+" надішле електронний лист клієнту, який запитає, як пройшло їхнє "
+"обслуговування."
 
 #: ../../helpdesk/invoice_time.rst:3
 msgid "Record and invoice time for tickets"
-msgstr ""
+msgstr "Запис часу на завдання та виставлення рахунку"
 
 #: ../../helpdesk/invoice_time.rst:5
 msgid ""
@@ -250,10 +311,14 @@ msgid ""
 "in case of a problem. For this purpose, Odoo will help you record the time "
 "spent fixing the issue and most importantly, to invoice it to your clients."
 msgstr ""
+"Ви можете мати контракти на обслуговування з клієнтами, щоб надати їм "
+"допомогу у разі виникнення проблеми. Для цього Odoo допоможе вам записати "
+"час, який витрачається на вирішення завдання, а головне, виставляти рахунки "
+"своїм клієнтам."
 
 #: ../../helpdesk/invoice_time.rst:11
 msgid "The modules needed"
-msgstr ""
+msgstr "Необхідні модулі"
 
 #: ../../helpdesk/invoice_time.rst:13
 msgid ""
@@ -261,14 +326,18 @@ msgid ""
 "needed : Helpdesk, Project, Timesheets, Sales. If you are missing one of "
 "them, go to the Apps module, search for it and then click on *Install*."
 msgstr ""
+"Для запису та виставлення рахунків-фактур на завдання потрібні наступні "
+"модулі: Служба підтримки, Проект, Табелі, Продажі. Якщо вам не вистачає "
+"одного з них, перейдіть до модуля Додатки, знайдіть його, а потім натисніть "
+"кнопку *Встановити*."
 
 #: ../../helpdesk/invoice_time.rst:19
 msgid "Get started to offer the helpdesk service"
-msgstr ""
+msgstr "Почніть пропонувати службу підтримки"
 
 #: ../../helpdesk/invoice_time.rst:22
 msgid "Step 1 : start a helpdesk project"
-msgstr ""
+msgstr "Крок 1: запустіть проект служби підтримки"
 
 #: ../../helpdesk/invoice_time.rst:24
 msgid ""
@@ -276,16 +345,21 @@ msgid ""
 ":menuselection:`Project --> Configuration --> Settings` and make sure that "
 "the *Timesheets* feature is activated."
 msgstr ""
+"Щоб запустити спеціальний проект для служби підтримки, спочатку перейдіть до"
+" :menuselection:`Проект --> Налаштування --> Налаштування` та переконайтеся,"
+" що функція *Табелі* активована."
 
 #: ../../helpdesk/invoice_time.rst:31
 msgid ""
 "Then, go to your dashboard, create the new project and allow timesheets for "
 "it."
 msgstr ""
+"Потім перейдіть на свою інформаційну панель, створіть новий проект і "
+"дозвольте табелі для нього."
 
 #: ../../helpdesk/invoice_time.rst:35
 msgid "Step 2 : gather a helpdesk team"
-msgstr ""
+msgstr "Крок 2: встановіть команду служби підтримки"
 
 #: ../../helpdesk/invoice_time.rst:37
 msgid ""
@@ -295,10 +369,15 @@ msgid ""
 " activate the feature. Make sure to select the helpdesk project you have "
 "previously created as well."
 msgstr ""
+"Щоб встановити команду, яка відповідає за службу підтримки, перейдіть до "
+":menuselection:`Служба підтримки --> Налаштування --> Команда служби "
+"підтримки` і створіть нову команду або виберіть існуючу. На формі, позначте "
+"поле перед *Табелем на заявці*, щоб активувати цю функцію. Не забудьте "
+"вибрати раніше створений вами проект служби підтримки."
 
 #: ../../helpdesk/invoice_time.rst:47
 msgid "Step 3 : launch the helpdesk service"
-msgstr ""
+msgstr "Крок 3: запустіть службу підтримки"
 
 #: ../../helpdesk/invoice_time.rst:49
 msgid ""
@@ -306,18 +385,25 @@ msgid ""
 ":menuselection:`Sales --> Configuration --> Settings` and make sure that the"
 " *Units of Measure* feature is activated."
 msgstr ""
+"Нарешті, щоб запустити нову службу підтримки, спочатку перейдіть до "
+":menuselection:`Продажі --> Налаштування --> Налаштування` та переконайтеся,"
+" що активовано функцію *Одиниця вимірювання*."
 
 #: ../../helpdesk/invoice_time.rst:56
 msgid ""
 "Then, go to :menuselection:`Products --> Products` and create a new one. "
 "Make sure that the product is set as a service."
 msgstr ""
+"Потім перейдіть на :menuselection:`Товари --> Товари` та створіть новий. "
+"Переконайтеся, що товар встановлено як послугу."
 
 #: ../../helpdesk/invoice_time.rst:63
 msgid ""
 "Here, we suggest that you set the *Unit of Measure* as *Hour(s)*, but any "
 "unit will do."
 msgstr ""
+"Тут ми пропонуємо встановити *Одиницю вимірювання* як *Годину(и)*, але будь-"
+"яка одиниця буде виконуватися."
 
 #: ../../helpdesk/invoice_time.rst:66
 msgid ""
@@ -325,18 +411,20 @@ msgid ""
 "*Sales* tab of the product form. Here, we recommend the following "
 "configuration :"
 msgstr ""
+"Нарешті, виберіть керування рахунками-фактурами, які ви хочете мати на "
+"вкладці *Продажі* форми товару. Тут ми рекомендуємо наступне налатування:"
 
 #: ../../helpdesk/invoice_time.rst:73
 msgid "Now, you are ready to start receiving tickets !"
-msgstr ""
+msgstr "Тепер ви готові отримувати завдання!"
 
 #: ../../helpdesk/invoice_time.rst:76
 msgid "Solve issues and record time spent"
-msgstr ""
+msgstr "Вирішіть проблеми та зафіксуйте витрачений час"
 
 #: ../../helpdesk/invoice_time.rst:79
 msgid "Step 1 : place an order"
-msgstr ""
+msgstr "Крок 1: розмістіть замовлення"
 
 #: ../../helpdesk/invoice_time.rst:81
 msgid ""
@@ -346,10 +434,15 @@ msgid ""
 " recorded. Set the number of hours needed to assist the client and confirm "
 "the sale."
 msgstr ""
+"Ви перебуваєте в модулі Служба підтримки, і ви тільки що отримали заявку від"
+" клієнта. Щоб розмістити нове замовлення, перейдіть на "
+":menuselection:`Продажі --> Замовлення --> Замовлення` та створіть його для "
+"послуги служби підтримки, яку ви раніше записали. Встановіть кількість "
+"годин, необхідних для надання послуги клієнту та підтвердіть продаж."
 
 #: ../../helpdesk/invoice_time.rst:91
 msgid "Step 2 : link the task to the ticket"
-msgstr ""
+msgstr "Крок 2: пов'яжіть завдання із заявкою"
 
 #: ../../helpdesk/invoice_time.rst:93
 msgid ""
@@ -358,10 +451,15 @@ msgid ""
 " the client ticket, go to the Helpdesk module, access the ticket in question"
 " and select the task on its form."
 msgstr ""
+"Якщо ви отримуєте доступ до конкретного проекту служби підтримки, ви "
+"помітите, що із замовленням було автоматично створене нове завдання. Щоби "
+"пов'язати це завдання з клієнтською заявкою, перейдіть до модуля Служба "
+"підтримки, отримайте доступ до відповідної заявки та оберіть завдання у її "
+"формі."
 
 #: ../../helpdesk/invoice_time.rst:102
 msgid "Step 3 : record the time spent to help the client"
-msgstr ""
+msgstr "Крок 3: запишіть час, витрачений на допомогу клієнту"
 
 #: ../../helpdesk/invoice_time.rst:104
 msgid ""
@@ -369,16 +467,21 @@ msgid ""
 "performed for this task, go back to the ticket form and add them under the "
 "*Timesheets* tab."
 msgstr ""
+"Робота виконана, а заявка клієнта відсортована. Аби записати години, "
+"виконані для цього завдання, поверніться до форми заявки та додайте її на "
+"вкладку *Табелі*."
 
 #: ../../helpdesk/invoice_time.rst:112
 msgid ""
 "The hours recorded on the ticket will also automatically appear in the "
 "Timesheet module and on the dedicated task."
 msgstr ""
+"Часи, записані в заявці, також автоматично з'являться в модулі табелю та у "
+"конкретному завданні."
 
 #: ../../helpdesk/invoice_time.rst:116
 msgid "Step 4 : invoice the client"
-msgstr ""
+msgstr "Крок 4: виставіть рахунок-фактуру клієнту"
 
 #: ../../helpdesk/invoice_time.rst:118
 msgid ""
@@ -386,9 +489,14 @@ msgid ""
 " had been placed. Notice that the hours recorded on the ticket form now "
 "appear as the delivered quantity."
 msgstr ""
+"Щоби виставити рахунок-фактуру клієнту, поверніться до модуля продажу та "
+"виберіть замовлення, яке було розміщено. Зверніть увагу, що години, записані"
+" у формі заявки, тепер відображаються як доставлена кількість."
 
 #: ../../helpdesk/invoice_time.rst:125
 msgid ""
 "All that is left to do, is to create the invoice from the order and then "
 "validate it. Now you just have to wait for the client's payment !"
 msgstr ""
+"Все, що потрібно зробити - це створити рахунок-фактуру із замовлення, а "
+"потім перевірити його. Тепер вам просто доведеться чекати оплату клієнта!"
diff --git a/locale/uk/LC_MESSAGES/index.po b/locale/uk/LC_MESSAGES/index.po
index 23d38f688..6fd707419 100644
--- a/locale/uk/LC_MESSAGES/index.po
+++ b/locale/uk/LC_MESSAGES/index.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2015-TODAY, Odoo S.A.
-# This file is distributed under the same license as the Odoo Business package.
+# This file is distributed under the same license as the Odoo package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 10.0\n"
+"Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-07 09:30+0200\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Alina Semeniuk <alinasemeniuk1@gmail.com>, 2018\n"
+"Last-Translator: Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018\n"
 "Language-Team: Ukrainian (https://www.transifex.com/odoo/teams/41243/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/locale/uk/LC_MESSAGES/inventory.po b/locale/uk/LC_MESSAGES/inventory.po
index d9bc125cf..398ceba91 100644
--- a/locale/uk/LC_MESSAGES/inventory.po
+++ b/locale/uk/LC_MESSAGES/inventory.po
@@ -1,14 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2015-TODAY, Odoo S.A.
-# This file is distributed under the same license as the Odoo Business package.
+# This file is distributed under the same license as the Odoo package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 10.0\n"
+"Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-08 17:10+0100\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018\n"
 "Language-Team: Ukrainian (https://www.transifex.com/odoo/teams/41243/uk/)\n"
@@ -24,29 +24,31 @@ msgstr "Склад"
 
 #: ../../inventory/barcode.rst:3
 msgid "Barcodes"
-msgstr ""
+msgstr "Штрих-коди"
 
 #: ../../inventory/barcode/operations.rst:3
 msgid "Daily Operations"
-msgstr ""
+msgstr "Щоденні операції"
 
 #: ../../inventory/barcode/operations/adjustments.rst:3
 msgid "How to do an inventory adjustment with barcodes?"
-msgstr ""
+msgstr "Як зробити коригування запасів зі штрих-кодом?"
 
 #: ../../inventory/barcode/operations/adjustments.rst:5
 msgid "From the Barcode application:"
-msgstr ""
+msgstr "З додатку Штрих-коду:"
 
 #: ../../inventory/barcode/operations/adjustments.rst:7
 msgid "Click on **Inventory**"
-msgstr ""
+msgstr "Натисніть на **Склад**"
 
 #: ../../inventory/barcode/operations/adjustments.rst:12
 msgid ""
 "Scan all the products (if you have 5 identical articles, scan it 5 times, or"
 " use the keyboard to set the quantity)."
 msgstr ""
+"Відскануйте всі товари (якщо у вас 5 ідентичних пунктів, перевірте 5 разів "
+"або скористайтеся клавіатурою, щоби встановити кількість)."
 
 #: ../../inventory/barcode/operations/adjustments.rst:16
 msgid ""
@@ -54,16 +56,21 @@ msgid ""
 "products. Eg. scan a shelf's barcode ; scan each product on the shelf ; "
 "repeat for each shelf in the wharehouse."
 msgstr ""
+"Якщо ви керуєте кількома місцезнаходженнями, перевірте місцезнаходження "
+"перед скануванням товарів. Напр., сканування штрих-коду полиці; сканування "
+"кожного товару на полиці; повторіть для кожної полиці складу."
 
 #: ../../inventory/barcode/operations/adjustments.rst:20
 msgid ""
 "When you've scanned all the items of the location, validate the inventory "
 "manually or by scanning the **Validate** barcode."
 msgstr ""
+"Коли ви перевірили всі елементи місцезнаходження, перевірте інвентаризацію "
+"вручну або скануючи **Перевірити** штрих-код."
 
 #: ../../inventory/barcode/operations/delivery.rst:3
 msgid "How to process delivery orders?"
-msgstr ""
+msgstr "Як обробляти замовлення на доставку?"
 
 #: ../../inventory/barcode/operations/delivery.rst:5
 msgid ""
@@ -71,22 +78,30 @@ msgid ""
 "printed documents (and scan lines on the documents), or on a screen (and "
 "scan products directly)."
 msgstr ""
+"Існує два підходи для обробки замовлень на доставку: ви можете працювати над"
+" друкованими документами (і рядками сканування в документах), або на екрані "
+"(і сканувати товари безпосередньо)."
 
 #: ../../inventory/barcode/operations/delivery.rst:10
 msgid "Process printed delivery orders:"
-msgstr ""
+msgstr "Процес друкованих замовлень на доставку:"
 
 #: ../../inventory/barcode/operations/delivery.rst:12
 msgid ""
 "Print delivery orders of the day by selecting all documents from the **To "
 "Do** list and print **Picking Operations** from the top menu."
 msgstr ""
+"Роздрукуйте замовлення на доставку за день, вибравши всі документи зі списку"
+" **Зробити** і друкуючи **Операції комплектування** у верхньому меню."
 
 #: ../../inventory/barcode/operations/delivery.rst:15
 msgid ""
 "Once you start processing your delivery orders, **scan the barcode** on the "
 "top-right corner of the document to load the right record on the screen."
 msgstr ""
+"Коли ви починаєте обробляти замовлення на доставку, **сканування штрих-"
+"коду** у верхньому правому куті документа дозволяє завантажити потрібний "
+"запис на екрані."
 
 #: ../../inventory/barcode/operations/delivery.rst:19
 msgid ""
@@ -94,6 +109,9 @@ msgid ""
 "product on the picking line if the barcode on the product is not easily "
 "accessible, visible or is missing."
 msgstr ""
+"Потім **сканування штрих-коду** кожного товару або сканування штрих-коду "
+"товару на рядку комплектування, якщо штрих-код на товарі важкодоступний, "
+"видимий або відсутній."
 
 #: ../../inventory/barcode/operations/delivery.rst:23
 #: ../../inventory/barcode/operations/receipts.rst:24
@@ -101,112 +119,134 @@ msgid ""
 "Once you scanned all products, scan the **Validate** barcode action to "
 "finish the operation."
 msgstr ""
+"Після того як ви відскануєте всі товари, відскануйте дію **перевірки** "
+"штрих-коду, щоб завершити операцію."
 
 #: ../../inventory/barcode/operations/delivery.rst:30
 msgid "Process delivery orders from a computer or mobile device:"
 msgstr ""
+"Процес обробки замовлення на доставку з комп'ютера або мобільного пристрою:"
 
 #: ../../inventory/barcode/operations/delivery.rst:32
 msgid ""
 "Load all the delivery orders marked as **To Do**, and open the first one."
 msgstr ""
+"Завантажте всі замовлення на доставку, позначені як **Зробити**, і відкрийте"
+" перше."
 
 #: ../../inventory/barcode/operations/delivery.rst:35
 #: ../../inventory/barcode/operations/receipts.rst:33
 msgid "Pick up and scan each listed product."
-msgstr ""
+msgstr "Підніміть і відскануйте кожний із зазначених товарів."
 
 #: ../../inventory/barcode/operations/delivery.rst:37
 msgid ""
 "When you've picked all the items, click the **Validate** button or scan the "
 "**Validate barcode** action to finish the Operation."
 msgstr ""
+"Коли ви виберете всі елементи, натисніть кнопку **Перевірити** або перевірте"
+" дію **Дійсний штрих-код**, щоб завершити операцію."
 
 #: ../../inventory/barcode/operations/delivery.rst:40
 msgid ""
 "Move to the next delivery order to process by clicking on the top-right "
 "right **arrow** or scanning the **Pager-Next** barcode action."
 msgstr ""
+"Перемістіть до наступного замовлення на доставку, натиснувши **стрілку** "
+"зверху праворуч або скануючи дію на штрих-коді **Pager-Next**."
 
 #: ../../inventory/barcode/operations/internal.rst:3
 msgid "How to do an internal transfer?"
-msgstr ""
+msgstr "Як зробити внутрішнє переміщення?"
 
 #: ../../inventory/barcode/operations/internal.rst:5
 msgid "In Odoo, there are two types of internal transfers:"
-msgstr ""
+msgstr "В Odoo існує два типи внутрішніх переміщень:"
 
 #: ../../inventory/barcode/operations/internal.rst:7
 msgid ""
 "Those initiated automatically by the system (for example, a quality control)"
-msgstr ""
+msgstr "Ті, що ініціюються автоматично системою (наприклад, контроль якості)."
 
 #: ../../inventory/barcode/operations/internal.rst:10
 msgid ""
 "Those created by a worker (for example, through the internal transfer area "
 "of the dashboard)."
 msgstr ""
+"Ті, що створюються працівником (наприклад, через внутрішню область передачі "
+"інформаційної панелі)."
 
 #: ../../inventory/barcode/operations/internal.rst:13
 msgid "To make an Internal Transfer:"
-msgstr ""
+msgstr "Щоб зробити внутрішнє переміщення:"
 
 #: ../../inventory/barcode/operations/internal.rst:15
 msgid "From the home of the barcode application, scan the **source location**"
 msgstr ""
+"З домашнього додатку штрих-коду відскануйте **місцезнаходження джерела**."
 
 #: ../../inventory/barcode/operations/internal.rst:17
 msgid "Pick up and **scan the products**"
-msgstr ""
+msgstr "Підніміть і **відскануйте товари**."
 
 #: ../../inventory/barcode/operations/internal.rst:19
 msgid "Scan the **destination location**"
-msgstr ""
+msgstr "Сканування **місця призначення**."
 
 #: ../../inventory/barcode/operations/internal.rst:21
 msgid "**Validate** the transfer to finish it"
-msgstr ""
+msgstr "**Перевірте** переміщення, щоб закінчити його."
 
 #: ../../inventory/barcode/operations/lots_serial_numbers.rst:3
 msgid "How to handle lots and serial numbers with barcodes?"
-msgstr ""
+msgstr "Як обробляти партії та серійні номери зі штрих-кодами?"
 
 #: ../../inventory/barcode/operations/lots_serial_numbers.rst:5
 msgid ""
 "Lots Numbers can be encoded from incoming shipments, internal moves and "
 "outgoing deliveries:"
 msgstr ""
+"Партійні номери можуть бути закодовані з вхідних відправлень, внутрішніх "
+"переміщень і вихідних доставок:"
 
 #: ../../inventory/barcode/operations/lots_serial_numbers.rst:8
 msgid ""
 "In the barcode interface, **scan** the products you want create a lot from"
 msgstr ""
+"В інтерфейсі штрих-коду **відскануйте** товари, які ви хочете створити в "
+"партії"
 
 #: ../../inventory/barcode/operations/lots_serial_numbers.rst:10
 msgid ""
 "If this product should be manage by lots, a window opens to help you scan "
 "the lots/serial numbers"
 msgstr ""
+"Якщо цей товар має керуватися партіями, відкриється вікно, яке допоможе вам "
+"відсканувати партії/серійні номери"
 
 #: ../../inventory/barcode/operations/lots_serial_numbers.rst:13
 msgid ""
 "**Scan** a lot barcode, **type** one manually or **leave empty** to generate"
 " one automatically"
 msgstr ""
+"**Відскануйте** штрих-код партії, **введіть** його вручну або **залиште "
+"порожнім**, щоб автоматично створити його"
 
 #: ../../inventory/barcode/operations/lots_serial_numbers.rst:16
 msgid "Click or scan **Validate** once you are done"
-msgstr ""
+msgstr "Клікніть або відскануйте **Перевірити** після завершення"
 
 #: ../../inventory/barcode/operations/lots_serial_numbers.rst:18
 msgid "What is the difference between **Lots** and **Serial Numbers**?"
-msgstr ""
+msgstr "У чому різниця між **Партіями** та **Серійними номерами**?"
 
 #: ../../inventory/barcode/operations/lots_serial_numbers.rst:20
 msgid ""
 "**Lot** numbers are attributed to several identical products, so each time "
 "you scan a lot number, Odoo will add one on the product count."
 msgstr ""
+"Номери **партій** відносяться до кількох однакових товарів, тому кожен раз, "
+"коли ви скануєте партійні номери, Odoo додасть один до кількості товарів."
 
 #: ../../inventory/barcode/operations/lots_serial_numbers.rst:24
 msgid ""
@@ -214,24 +254,30 @@ msgid ""
 "barcode, sticked on only one item. This means that Odoo won't accept "
 "scanning the same serial number more than once per operation."
 msgstr ""
+"З іншого боку, **серійний номер** унікальний, і представлений лише одним "
+"штрих-кодом, прикріпленим лише до одного елемента. Це означає, що Odoo не "
+"прийматиме сканування одного і того ж серійного номера більше одного разу за"
+" операцію."
 
 #: ../../inventory/barcode/operations/lots_serial_numbers.rst:32
 msgid "Here, we configured **Lu - Petit Beukelaer** tracking by lots."
-msgstr ""
+msgstr "Тут ми налаштували відстеження **Lu - Petit Beukelaer** за партіями."
 
 #: ../../inventory/barcode/operations/lots_serial_numbers.rst:37
 msgid ""
 "Scan a product from this incoming shipment, then scan the lot number of each"
 " product (you can also use the keyboard)."
 msgstr ""
+"Відскануйте товари з цієї вхідної відправки, після чого перевірте номер "
+"партії кожного товару (також можна скористатись клавіатурою)."
 
 #: ../../inventory/barcode/operations/lots_serial_numbers.rst:43
 msgid "Click save/scan **Validate** and you are done."
-msgstr ""
+msgstr "Натисніть Зберегти/Сканувати **Перевірити**, і ви закінчите."
 
 #: ../../inventory/barcode/operations/receipts.rst:3
 msgid "How to process incoming receipts?"
-msgstr ""
+msgstr "Як обробляти вхідні поставки?"
 
 #: ../../inventory/barcode/operations/receipts.rst:5
 msgid ""
@@ -239,22 +285,29 @@ msgid ""
 "on printed documents (and scan lines on the documents), or on a screen (and "
 "scan products directly)."
 msgstr ""
+"Існує два підходи до обробки вхідних поставок: ви можете працювати на "
+"друкованих документах (і сканувати рядки на документах), або на екрані (і "
+"сканувати товари безпосередньо)."
 
 #: ../../inventory/barcode/operations/receipts.rst:10
 msgid "Process printed incoming receipts:"
-msgstr ""
+msgstr "Процес друкованих вхідних поставок:"
 
 #: ../../inventory/barcode/operations/receipts.rst:12
 msgid ""
 "Print incoming receipts of the day by selecting all documents from the **To "
 "Receive** list and print **Picking Operations** from the top menu."
 msgstr ""
+"Надрукуйте вхідні поставки за день, вибравши всі документи зі списку "
+"**Прийняти** та друкуючи **Операції комплектування** у верхньому меню."
 
 #: ../../inventory/barcode/operations/receipts.rst:16
 msgid ""
 "Once you start processing your incoming receipts, scan the barcode on the "
 "top-right corner of the document to load the right record on the screen."
 msgstr ""
+"Коли ви почнете обробку вхідних поставок, відскануйте штрих-код у верхньому "
+"правому куті документа, щоб завантажити потрібний запис на екрані."
 
 #: ../../inventory/barcode/operations/receipts.rst:20
 msgid ""
@@ -262,28 +315,38 @@ msgid ""
 "on the picking line if the barcode on the product is not easily accessible, "
 "visible or is missing."
 msgstr ""
+"Потім відскануйте штрих-код кожного товару або штрих-код товару на рядку "
+"комплектування, якщо штрих-код на товарі важкодоступний, видимий або "
+"відсутній."
 
 #: ../../inventory/barcode/operations/receipts.rst:28
 msgid "Process incoming receipts from a computer or mobile device:"
-msgstr ""
+msgstr "Обробка вхідних поставок з комп'ютера або мобільного пристрою:"
 
 #: ../../inventory/barcode/operations/receipts.rst:30
 msgid ""
 "Load all the incoming receipts marked as **To Receive**, and open the first "
 "one."
 msgstr ""
+"Завантажте всі вхідні поставки, позначені як **Прийняти**, і відкрийте "
+"першу."
 
 #: ../../inventory/barcode/operations/receipts.rst:35
 msgid ""
 "When you've picked all the items, click the **Validate** button or scan the "
 "**Validate** barcode action to finish the Operation."
 msgstr ""
+"Коли ви виберете всі елементи, натисніть кнопку **Перевірити** або "
+"відскануйте дію штрих-коду **Перевірити**, щоб завершити операцію."
 
 #: ../../inventory/barcode/operations/receipts.rst:38
 msgid ""
 "Move to the next incoming receipt to process by clicking on the top-right "
 "right **arrow** or scanning the **Pager-Next** barcode action."
 msgstr ""
+"Перемістіть до наступної вхідної поставки, щоб обробити її, натиснувши "
+"**стрілку** в правому верхньому куті або скануючи дію на штрих-коді **Pager-"
+"Next**."
 
 #: ../../inventory/barcode/operations/receipts.rst:42
 #: ../../inventory/management/delivery/scheduled_dates.rst:137
@@ -292,25 +355,27 @@ msgstr "Приклад"
 
 #: ../../inventory/barcode/operations/receipts.rst:44
 msgid "Open operation interface."
-msgstr ""
+msgstr "Відкритий операційний інтерфейс."
 
 #: ../../inventory/barcode/operations/receipts.rst:49
 msgid "Scan."
-msgstr ""
+msgstr "Відскануйте."
 
 #: ../../inventory/barcode/operations/receipts.rst:54
 msgid ""
 "The picking appears. Scan items and/or fill in informations using the mouse "
 "and keyboard."
 msgstr ""
+"Відобразиться комплектування. Відскануйте елементи та/або заповнення "
+"інформації за допомогою миші та клавіатури."
 
 #: ../../inventory/barcode/setup.rst:3
 msgid "Setup"
-msgstr "Налаштування"
+msgstr "Встановіть"
 
 #: ../../inventory/barcode/setup/hardware.rst:3
 msgid "Set up your barcode scanner"
-msgstr ""
+msgstr "Встановлення сканеру штрих-коду"
 
 #: ../../inventory/barcode/setup/hardware.rst:5
 msgid ""
@@ -318,10 +383,14 @@ msgid ""
 "user experience relies on an appropriate hardware setup. This guide will "
 "help you through the task of choosing and configuring the barcode scanner."
 msgstr ""
+"Початок роботи зі скануванням штрих-кодів в Odoo досить легкий. Тим не менш,"
+" хороший користувацький досвід покладається на відповідну установку "
+"апаратного забезпечення. Цей посібник допоможе вам вирішити завдання вибору "
+"та налаштування сканера штрих-кодів."
 
 #: ../../inventory/barcode/setup/hardware.rst:11
 msgid "Find the barcode scanner that suits your needs"
-msgstr ""
+msgstr "Знайдіть сканер штрих-коду, який відповідає вашим потребам"
 
 #: ../../inventory/barcode/setup/hardware.rst:13
 msgid ""
@@ -329,6 +398,9 @@ msgid ""
 "**Inventory** and **Barcode Scanning** apps are the **USB scanner**, **the "
 "bluetooth scanner** and the **mobile computer scanner**."
 msgstr ""
+"Є три рекомендовані сканери штрихкодів для роботи у програмамі **Складу** "
+"Odoo  та **Сканер штрих-коду** - **сканер USB**, **сканер Bluetooth** і "
+"**мобільний сканер**."
 
 #: ../../inventory/barcode/setup/hardware.rst:20
 msgid ""
@@ -337,6 +409,10 @@ msgid ""
 " you buy it that the scanner is compatible with your keyboard layout or can "
 "be configured to be so."
 msgstr ""
+"Якщо ви скануєте товари на комп'ютері, це шлях до **сканера USB**. Просто "
+"підключіть його до комп'ютера, щоб розпочати сканування. Переконайтеся, коли"
+" ви купуєте його, сканер сумісний з розкладкою клавіатури або може бути "
+"налаштований таким чином."
 
 #: ../../inventory/barcode/setup/hardware.rst:25
 msgid ""
@@ -346,6 +422,12 @@ msgid ""
 "with the smartphone and work in the warehouse with always the possibility to"
 " check your smartphone from time to time and use the software 'manually'."
 msgstr ""
+"**Сканер Bluetooth** може бути з'єднаний зі смартфоном або планшетом, і це "
+"хороший вибір, якщо ви хочете бути мобільним, але не потребуєте великих "
+"інвестицій. Підхід полягає в тому, щоб увійти в Odoo на вашому смартфоні, "
+"об'єднати сканер Bluetooth зі смартфоном і працювати на складі, завжди час "
+"від часу перевіряти свій смартфон і використовувати програмне забезпечення "
+"«вручну»."
 
 #: ../../inventory/barcode/setup/hardware.rst:32
 msgid ""
@@ -357,14 +439,21 @@ msgid ""
 "job. However, due to the variety of models and configurations on the market,"
 " it is essential to test it first."
 msgstr ""
+"Для важкого використання, **мобільний сканер** є найдоступнішим рішенням. "
+"Він складається з невеликого комп'ютера із вбудованим сканером штрих-кодів. "
+"Це може виявитись дуже продуктивним рішенням, однак ви повинні переконатися,"
+" що воно здатне працювати з Odoo швидко. Найновіші моделі, що використовують"
+" Android + Google Chrome або Windows + Internet Explorer Mobile, повинні "
+"виконувати цю роботу. Однак через різноманітність моделей та конфігурацій "
+"важливо його спочатку протестувати."
 
 #: ../../inventory/barcode/setup/hardware.rst:42
 msgid "Configure your barcode scanner"
-msgstr ""
+msgstr "Налаштування сканеру штрих-кодів"
 
 #: ../../inventory/barcode/setup/hardware.rst:45
 msgid "Keyboard layout"
-msgstr ""
+msgstr "Макет клавіатури"
 
 #: ../../inventory/barcode/setup/hardware.rst:50
 msgid ""
@@ -373,10 +462,15 @@ msgid ""
 "characters correctly (replacing a 'A' with a 'Q' for example). Most scanners"
 " are configured by scanning the appropriate barcode in the user manual."
 msgstr ""
+"Сканер штрих-коду USB повинен бути налаштований таким чином, щоб "
+"використовувати таку саму розкладку клавіатури як ваша операційна система. В"
+" іншому випадку ваш сканер не буде правильно перекладати символи (наприклад,"
+" замінивши \"A\" на \"Q\"). Більшість сканерів налаштовані шляхом сканування"
+" відповідного штрих-коду в посібнику користувача."
 
 #: ../../inventory/barcode/setup/hardware.rst:57
 msgid "Automatic carriage return"
-msgstr ""
+msgstr "Автоматичне повернення тари"
 
 #: ../../inventory/barcode/setup/hardware.rst:59
 msgid ""
@@ -387,10 +481,17 @@ msgid ""
 "explicitly configured by scanning a specific barcode in the user manual ('CR"
 " suffix ON', 'Apply Enter for suffix', etc.)."
 msgstr ""
+"За замовчуванням Odoo має затримку 50 мілісекунд між кожним наступним "
+"скануванням (це допомагає уникнути випадкового подвійного сканування). Якщо "
+"ви хочете зменшити цю затримку, ви можете налаштувати сканер, щоб вставити "
+"повернення тари в кінці кожного штрих-коду. Зазвичай це налаштуванням за "
+"замовчуванням і може бути явним чином налаштоване сканування певного штрих-"
+"коду в посібнику користувача (\"суфікс CR на\", \"Застосувати введення для "
+"суфікса\" тощо)."
 
 #: ../../inventory/barcode/setup/software.rst:3
 msgid "How to activate the barcodes in Odoo?"
-msgstr ""
+msgstr "Як активувати штрих-коди в Odoo?"
 
 #: ../../inventory/barcode/setup/software.rst:5
 msgid ""
@@ -400,20 +501,27 @@ msgid ""
 "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 ""
+msgstr "Документ: |download_barcode|"
 
 #: ../../inventory/barcode/setup/software.rst:23
 msgid "Set products barcodes"
-msgstr ""
+msgstr "Встановіть штрих-коди товарів"
 
 #: ../../inventory/barcode/setup/software.rst:28
 msgid ""
@@ -425,6 +533,14 @@ msgid ""
 "go back into the previous screen to click Configure Product Barcodes.  This "
 "interface can also be accessed via the planner."
 msgstr ""
+"Щоб заповнити комплектування або провести інвентаризацію, вам слід "
+"переконатися, що ваші товари закодовані в Odoo поряд з їх штрих-кодами. Якщо"
+" це ще не зроблено, ви можете заповнити штрих-коди товару за допомогою "
+"зручного інтерфейсу. Перейдіть до :menuselection:`Складу --> Налаштування "
+"--> Налаштування` та натисніть :menuselection:`Операції --> Сканер штрих-"
+"коду`. Натисніть Зберегти та поверніться до попереднього екрану, щоб "
+"натиснути Налаштувати штрих-коди товарів. Цей інтерфейс також доступний "
+"через планувальник."
 
 #: ../../inventory/barcode/setup/software.rst:39
 msgid ""
@@ -432,10 +548,12 @@ msgid ""
 "not the template product (otherwise you won't be able to differentiate "
 "them)."
 msgstr ""
+"Варіанти товару: будьте обережні, щоб додати штрих-код безпосередньо до "
+"варіанту, а не до шаблону товару (інакше ви не зможете їх диференціювати)."
 
 #: ../../inventory/barcode/setup/software.rst:44
 msgid "Set locations barcodes"
-msgstr ""
+msgstr "Встановіть місцезнаходження штрих-кодів"
 
 #: ../../inventory/barcode/setup/software.rst:49
 msgid ""
@@ -447,16 +565,26 @@ msgid ""
 "barcodes per page, arranged in a way that is convenient to print on sticker "
 "paper."
 msgstr ""
+"Якщо ви керуєте кількома місцезнаходженнями та вважаєте за потрібне "
+"привласнити штрих-код кожному місцю та прикріпити його до розташування. Ви "
+"можете налаштувати штрих-коди місцезнаходжень у :menuselection:`Складі --> "
+"Налаштування --> Управління складом --> Місцезнаходження`. У меню **Друк** є"
+" кнопка, яку можна використовувати для друку назв місцезнаходжень та штрих-"
+"кодів. На кожній сторінці є 4 штрих-коди, розташовані так, що зручно "
+"друкувати на наклейковому паперті."
 
 #: ../../inventory/barcode/setup/software.rst:58
 msgid ""
 "Example of location naming: **warehouse short name** - **location short "
 "name** - (**Corridor X** - **Shelf Y** - **Height Z**) Example: A032-025-133"
 msgstr ""
+"Приклад іменування місцезнаходжень: **коротка назва складу** - **коротка "
+"назва місцезнаходження** - (**коридор X** - **полиця Y** - **висота Z**) "
+"Приклад: A032-025-133"
 
 #: ../../inventory/barcode/setup/software.rst:65
 msgid "Barcode formats"
-msgstr ""
+msgstr "Формати штрих-кодів"
 
 #: ../../inventory/barcode/setup/software.rst:67
 msgid ""
@@ -465,16 +593,23 @@ msgid ""
 "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 ""
+"Більшість роздрібних товарів використовують штрих-коди EAN-13. Їх не можна "
+"скласти без належної авторизації: ви повинні сплатити Міжнародній асоціації "
+"нумерації плату в обмін на кодову послідовність коду EAN (саме тому два "
+"твари в магазині не матимуть однакового коду EAN)."
 
 #: ../../inventory/barcode/setup/software.rst:72
 msgid ""
 "Still, as Odoo supports any string as a barcode, so you can always define "
 "your own barcode format for internal use."
 msgstr ""
+"Тим не менше, оскільки Odoo підтримує будь-який рядок як штрих-код, ви "
+"завжди можете визначити свій власний формат штрих-коду для внутрішнього "
+"використання."
 
 #: ../../inventory/management.rst:3
 msgid "Warehouse Management"
-msgstr ""
+msgstr "Управління складом"
 
 #: ../../inventory/management/adjustment.rst:3
 msgid "Inventory Adjustment"
@@ -776,7 +911,7 @@ msgstr ""
 
 #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
 msgid "Active"
-msgstr "Активний"
+msgstr "Активно"
 
 #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
 msgid ""
@@ -915,7 +1050,7 @@ msgstr ""
 
 #: ../../inventory/management/delivery.rst:3
 msgid "Delivery Orders"
-msgstr ""
+msgstr "Замовлення на доставку"
 
 #: ../../inventory/management/delivery/cancel_order.rst:3
 msgid "How do I cancel a delivery order?"
@@ -1249,7 +1384,7 @@ msgstr ""
 
 #: ../../inventory/management/delivery/dropshipping.rst:103
 msgid ":doc:`inventory_flow`"
-msgstr ""
+msgstr ":doc:`inventory_flow`"
 
 #: ../../inventory/management/delivery/inventory_flow.rst:3
 msgid "How to choose the right inventory flow to handle delivery orders?"
@@ -1377,6 +1512,8 @@ msgid ""
 "In the **Inventory** module, Go to **Configuration** and click on **Delivery"
 " methods**."
 msgstr ""
+"У модулі **Склад**, перейдіть до **Налаштування** та натисніть на **Методи "
+"доставки**."
 
 #: ../../inventory/management/delivery/label_type.rst:18
 msgid "Choose a delivery method and then click on **Edit**."
@@ -2035,7 +2172,7 @@ msgstr ""
 
 #: ../../inventory/management/delivery/three_steps.rst:77
 msgid "Create a Sale Order"
-msgstr ""
+msgstr "Створіть замовлення на продаж"
 
 #: ../../inventory/management/delivery/three_steps.rst:79
 msgid ""
@@ -2346,6 +2483,9 @@ msgid ""
 "customer (Click **Apply** to assign the quantities based on the quantities "
 "listed in the **To Do** column)"
 msgstr ""
+"Натисніть на **Підтвердити**, щоб завершити переміщення зі "
+"**Склад/Відправка** клієнту (Натисніть **Підтвердити**, щоби призначити "
+"кількість на основі кількості, зазначеної в колонці **Зробити**)."
 
 #: ../../inventory/management/delivery/two_steps.rst:125
 msgid ""
@@ -2462,7 +2602,7 @@ msgstr "Це налаштування за замовчуванням в Odoo"
 #: ../../inventory/management/incoming/three_steps.rst:126
 #: ../../inventory/management/incoming/two_steps.rst:97
 msgid ":doc:`../delivery/inventory_flow`"
-msgstr ""
+msgstr ":doc:`../delivery/inventory_flow`"
 
 #: ../../inventory/management/incoming/three_steps.rst:3
 msgid "How to add a quality control step in goods receipt? (3 steps)"
@@ -2688,7 +2828,7 @@ msgstr ""
 
 #: ../../inventory/management/incoming/three_steps.rst:127
 msgid ":doc:`two_steps`"
-msgstr ""
+msgstr ":doc:`two_steps`"
 
 #: ../../inventory/management/incoming/two_steps.rst:3
 msgid "How to unload your shipment to an input location? (2 steps)"
@@ -2831,11 +2971,11 @@ msgstr ""
 
 #: ../../inventory/management/incoming/two_steps.rst:98
 msgid ":doc:`three_steps`"
-msgstr ""
+msgstr ":doc:`three_steps`"
 
 #: ../../inventory/management/lots_serial_numbers.rst:3
 msgid "Lots and Serial Numbers"
-msgstr ""
+msgstr "Партії та серійні номери"
 
 #: ../../inventory/management/lots_serial_numbers/differences.rst:3
 msgid "What's the difference between lots and serial numbers?"
@@ -2933,12 +3073,12 @@ msgstr ""
 #: ../../inventory/management/lots_serial_numbers/differences.rst:46
 #: ../../inventory/management/lots_serial_numbers/lots.rst:135
 msgid ":doc:`serial_numbers`"
-msgstr ""
+msgstr ":doc:`serial_numbers`"
 
 #: ../../inventory/management/lots_serial_numbers/differences.rst:47
 #: ../../inventory/management/lots_serial_numbers/serial_numbers.rst:129
 msgid ":doc:`lots`"
-msgstr ""
+msgstr ":doc:`lots`"
 
 #: ../../inventory/management/lots_serial_numbers/lots.rst:3
 msgid "How to manage lots of identical products?"
@@ -3160,7 +3300,7 @@ msgstr ""
 #: ../../inventory/management/lots_serial_numbers/lots.rst:134
 #: ../../inventory/management/lots_serial_numbers/serial_numbers.rst:128
 msgid ":doc:`differences`"
-msgstr ""
+msgstr ":doc:`differences`"
 
 #: ../../inventory/management/lots_serial_numbers/serial_numbers.rst:3
 msgid "How to work with serial numbers?"
@@ -3308,7 +3448,7 @@ msgstr ""
 
 #: ../../inventory/management/misc.rst:3
 msgid "Miscellaneous Operations"
-msgstr ""
+msgstr "Різні операції"
 
 #: ../../inventory/management/misc/immediate_planned_transfers.rst:2
 msgid "Immediate & Planned Transfers"
@@ -3559,7 +3699,7 @@ msgstr ""
 
 #: ../../inventory/management/misc/schedulers.rst:63
 msgid ":doc:`../delivery/scheduled_dates`"
-msgstr ""
+msgstr ":doc:`../delivery/scheduled_dates`"
 
 #: ../../inventory/management/misc/scrap.rst:3
 msgid "How to scrap products?"
@@ -3730,7 +3870,7 @@ msgstr ""
 
 #: ../../inventory/management/reporting.rst:3
 msgid "Valuation Methods"
-msgstr ""
+msgstr "Методи оцінки"
 
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:5
 msgid "How to do an inventory valuation? (Anglo-Saxon Accounting)"
@@ -3952,7 +4092,7 @@ msgstr "$20"
 
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:54
 msgid "Receive 2 Products at $9"
-msgstr ""
+msgstr "Отримати 2 товари за $9"
 
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:56
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:101
@@ -3963,7 +4103,7 @@ msgstr ""
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:157
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:210
 msgid "4"
-msgstr ""
+msgstr "4"
 
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:57
 msgid "+2*$10"
@@ -4001,7 +4141,7 @@ msgstr "$12"
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:146
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:199
 msgid "+4*$16"
-msgstr ""
+msgstr "+4*$16"
 
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:92
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:147
@@ -4021,21 +4161,21 @@ msgstr "$24"
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:154
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:207
 msgid "Receive 2 Products at $6"
-msgstr ""
+msgstr "Отримати 2 товари за $6"
 
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:100
 msgid "$9"
-msgstr ""
+msgstr "$9"
 
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:102
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:157
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:210
 msgid "+2*$6"
-msgstr ""
+msgstr "+2*$6"
 
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:103
 msgid "$36"
-msgstr ""
+msgstr "$36"
 
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:105
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:106
@@ -4044,11 +4184,14 @@ msgid ""
 "has been processed, based on prices defined in tied purchase orders: FORMULA"
 " (see here attached)"
 msgstr ""
+"Метод **Середня ціна** перерозподіляє собівартість, оскільки обробка "
+"замовлення на отримання була оброблена, виходячи з цін, визначених у "
+"прив'язаних замовленнях на закупівлю: FORMULA (див. тут додаток)"
 
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:109
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:110
 msgid "The average cost does not change when products leave the warehouse."
-msgstr ""
+msgstr "Середня вартість не змінюється, коли товари забирають зі складу."
 
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:111
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:112
@@ -4058,6 +4201,10 @@ msgid ""
 "complexity. Your actually need a software like Odoo to easily keep this cost"
 " up-to-date."
 msgstr ""
+"З точки зору бухгалтерського обліку, цей метод в основному виправданий у "
+"разі великих коливань цін на купівлі та є досить незвичним через його "
+"операційну складність. Насправді вам потрібне таке програмне забезпечення, "
+"як Odoo, щоб легко оновлювати ці витрати."
 
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:116
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:117
@@ -4066,6 +4213,9 @@ msgid ""
 "business processes because the order in which you process receipt orders "
 "matters in the cost computation."
 msgstr ""
+"Цей метод призначений для досвідчених користувачів. Це вимагає добре "
+"сформованих бізнес-процесів, оскільки порядок, в якому ви обробляєте "
+"замовлення на забезпечення, має значення для розрахунку вартості."
 
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:171
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:172
@@ -4074,7 +4224,7 @@ msgstr "FIFO"
 
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:149
 msgid "$16"
-msgstr ""
+msgstr "$16"
 
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:0
 msgid "-8*$10"
@@ -4082,20 +4232,20 @@ msgstr "-8*$10"
 
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:0
 msgid "-2*$16"
-msgstr ""
+msgstr "-2*$16"
 
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:153
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:211
 msgid "$32"
-msgstr ""
+msgstr "$32"
 
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:155
 msgid "$11"
-msgstr ""
+msgstr "$11"
 
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:158
 msgid "$44"
-msgstr ""
+msgstr "$44"
 
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:160
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:213
@@ -4111,6 +4261,15 @@ msgid ""
 "last item(s) shipped. This cost price is used to value any product not "
 "received from a purchase order (e.g. inventory adjustments)."
 msgstr ""
+"За **Реальною ціною** (FIFO, LIFO, FEFO тощо) ціна далі вдосконалюється "
+"стратегією видалення, встановленою на місці складу або внутрішній категорії "
+"товару. Стратегія за замовчуванням - це FIFO. За допомогою такого методу "
+"вартість вашого запасу обчислюється з реальної вартості ваших товарів, що "
+"зберігаються (з кількісним оцінюванням), а не від собівартості, вказаної у "
+"формі товару. Кожного разу, коли ви доставляєте товари, вартість "
+"відновлюється до вартості останнього товару(-ів), що відправляється. Ця "
+"собівартість використовується для оцінки будь-якого товару, який не отримано"
+" із замовлення на купівлю (наприклад, інвентаризація)."
 
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:170
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:171
@@ -4118,6 +4277,8 @@ msgid ""
 "FIFO is advised if you manage all your workflow into Odoo (Sales, Purchases,"
 " Inventory). It suits any kind of users."
 msgstr ""
+"FIFO рекомендується, якщо ви керуєте всім своїм робочим процесом в Odoo "
+"(продажі, купівлі, склад). Це підходить будь-якому користувачу."
 
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:223
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:224
@@ -4126,7 +4287,7 @@ msgstr "LIFO (не прийнятний в IFRS)"
 
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:0
 msgid "-4*$16"
-msgstr ""
+msgstr "-4*$16"
 
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:0
 msgid "-6*$10"
@@ -4134,12 +4295,12 @@ msgstr "-6*$10"
 
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:208
 msgid "$8"
-msgstr ""
+msgstr "$8"
 
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:223
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:224
 msgid "LIFO is not permitted outside the United States."
-msgstr ""
+msgstr "LIFO не дозволяється за межами Сполучених Штатів."
 
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:225
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:226
@@ -4198,7 +4359,7 @@ msgstr ""
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:263
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:263
 msgid "Vendor Bill"
-msgstr "Рахунок постачальника"
+msgstr "Рахунок від постачальника"
 
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:253
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:271
@@ -4207,7 +4368,7 @@ msgstr "Рахунок постачальника"
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:271
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:305
 msgid "\\"
-msgstr ""
+msgstr "\\"
 
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:253
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:271
@@ -4307,7 +4468,7 @@ msgstr "Прийом товарів"
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:286
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:288
 msgid "No Journal Entry"
-msgstr ""
+msgstr "Немає журнальних записів"
 
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:284
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:283
@@ -4317,7 +4478,7 @@ msgstr "Рахунок клієнта"
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:273
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:273
 msgid "Revenues: Sold Goods"
-msgstr ""
+msgstr "Доходи: продані товари"
 
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:273
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:273
@@ -4327,17 +4488,17 @@ msgstr "100"
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:274
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:274
 msgid "Liabilities: Deferred Tax Liabilities"
-msgstr ""
+msgstr "Обов'язки: відстрочені податкові зобов'язання"
 
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:274
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:274
 msgid "9"
-msgstr ""
+msgstr "9"
 
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:275
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:275
 msgid "Assets: Accounts Receivable"
-msgstr ""
+msgstr "Активи: дебіторська заборгованість"
 
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:275
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:275
@@ -4350,16 +4511,21 @@ msgid ""
 "Revenues: defined on the product or on the internal category of related "
 "product (Income Account field)"
 msgstr ""
+"Доходи: визначаються по товару або за внутрішньою категорією відповідного "
+"товару (поле Поточний рахунок)"
 
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:281
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:280
 msgid "Deferred Tax Liabilities: defined on the tax used on the invoice line"
 msgstr ""
+"Податкові зобов'язання майбутніх періодів: визначається податком, що "
+"використовується на рядку рахунку-фактури"
 
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:282
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:281
 msgid "Accounts Receivable: defined on the customer (Receivable Account)"
 msgstr ""
+"Дебіторська заборгованість: визначається на клієнта (Рахунок на отримання)"
 
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:284
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:283
@@ -4462,7 +4628,7 @@ msgstr "Давайте розглянемо справу продавця."
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:340
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:340
 msgid "**Configuration:**"
-msgstr ""
+msgstr "**Налаштування:**"
 
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:342
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:342
@@ -4532,7 +4698,7 @@ msgstr ""
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:367
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:356
 msgid ":doc:`../../routes/strategies/removal`"
-msgstr ""
+msgstr ":doc:`../../routes/strategies/removal`"
 
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:368
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:357
@@ -4542,7 +4708,7 @@ msgstr ":doc:`../../../accounting/others/inventory/avg_price_valuation`"
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:369
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:358
 msgid ":doc:`../../routes/costing/landed_costs`"
-msgstr ""
+msgstr ":doc:`../../routes/costing/landed_costs`"
 
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:5
 msgid "How to do an inventory valuation? (Continental Accounting)"
@@ -4632,19 +4798,19 @@ msgstr "€40"
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:145
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:198
 msgid "€12"
-msgstr ""
+msgstr "€12"
 
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:92
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:147
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:200
 msgid "+4*€16"
-msgstr ""
+msgstr "+4*€16"
 
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:93
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:148
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:201
 msgid "€144"
-msgstr ""
+msgstr "€144"
 
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:0
 msgid "-10*€12"
@@ -4652,31 +4818,31 @@ msgstr "-10*€12"
 
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:99
 msgid "€24"
-msgstr ""
+msgstr "€24"
 
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:100
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:155
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:208
 msgid "Receive 2 Products at €6"
-msgstr ""
+msgstr "Отримати 2 товари за €6"
 
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:101
 msgid "€9"
-msgstr ""
+msgstr "€9"
 
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:103
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:158
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:211
 msgid "+2*€6"
-msgstr ""
+msgstr "+2*€6"
 
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:104
 msgid "€36"
-msgstr ""
+msgstr "€36"
 
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:150
 msgid "€16"
-msgstr ""
+msgstr "€16"
 
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:0
 msgid "-8*€10"
@@ -4684,24 +4850,24 @@ msgstr "-8*€10"
 
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:0
 msgid "-2*€16"
-msgstr ""
+msgstr "-2*€16"
 
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:154
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:212
 msgid "€32"
-msgstr ""
+msgstr "€32"
 
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:156
 msgid "€11"
-msgstr ""
+msgstr "€11"
 
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:159
 msgid "€44"
-msgstr ""
+msgstr "€44"
 
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:0
 msgid "-4*€16"
-msgstr ""
+msgstr "-4*€16"
 
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:0
 msgid "-6*€10"
@@ -4709,7 +4875,7 @@ msgstr "-6*€10"
 
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:209
 msgid "€8"
-msgstr ""
+msgstr "€8"
 
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:297
 msgid ""
@@ -4779,7 +4945,7 @@ msgstr ""
 
 #: ../../inventory/overview/concepts/double-entry.rst:30
 msgid "Production Order"
-msgstr ""
+msgstr "Замовлення на виробництво"
 
 #: ../../inventory/overview/concepts/double-entry.rst:24
 msgid "Consume:"
@@ -4811,132 +4977,132 @@ msgstr "Виробництво: у формі ndfhe, поле \"Місцезна
 
 #: ../../inventory/overview/concepts/double-entry.rst:36
 msgid "Drop-shipping"
-msgstr ""
+msgstr "Дропшипінг"
 
 #: ../../inventory/overview/concepts/double-entry.rst:33
 msgid "1 Bicycle: Supplier → Customer"
-msgstr ""
+msgstr "1 велосипед: Постачальник → Клієнт"
 
 #: ../../inventory/overview/concepts/double-entry.rst:36
 msgid "Configurarion:"
-msgstr ""
+msgstr "Налаштування:"
 
 #: ../../inventory/overview/concepts/double-entry.rst:0
 msgid "Supplier: on the product form"
-msgstr ""
+msgstr "Постачальник: на формі товару"
 
 #: ../../inventory/overview/concepts/double-entry.rst:0
 msgid "Customer: on the sale order itself"
-msgstr ""
+msgstr "Клієнт: на самому замовленні на продаж"
 
 #: ../../inventory/overview/concepts/double-entry.rst:45
 msgid "Client Delivery"
-msgstr ""
+msgstr "Клієнтська доставка"
 
 #: ../../inventory/overview/concepts/double-entry.rst:39
 msgid "Pick"
-msgstr ""
+msgstr "Комплектувати"
 
 #: ../../inventory/overview/concepts/double-entry.rst:40
 msgid "1 Bicycle: Stock → Packing Zone"
-msgstr ""
+msgstr "1 велосипед: склад → зона пакування"
 
 #: ../../inventory/overview/concepts/double-entry.rst:41
 msgid "Pack"
-msgstr ""
+msgstr "Упаковка"
 
 #: ../../inventory/overview/concepts/double-entry.rst:42
 msgid "1 Bicycle: Packing Zone → Output"
-msgstr ""
+msgstr "1 велосипед: зона пакування → відправлення"
 
 #: ../../inventory/overview/concepts/double-entry.rst:43
 #: ../../inventory/shipping.rst:3
 msgid "Shipping"
-msgstr ""
+msgstr "Відправлення"
 
 #: ../../inventory/overview/concepts/double-entry.rst:44
 msgid "1 Bicycle: Output → Customer"
-msgstr ""
+msgstr "1 велосипед: відправка → клієнт"
 
 #: ../../inventory/overview/concepts/double-entry.rst:0
 msgid "on the pick+pack+ship route for the warehouse"
-msgstr ""
+msgstr "на маршруті комплектувати+пакувати+відправити для складу"
 
 #: ../../inventory/overview/concepts/double-entry.rst:52
 msgid "Inter-Warehouse transfer"
-msgstr ""
+msgstr "Внутрішньо-складські переміщення"
 
 #: ../../inventory/overview/concepts/double-entry.rst:49
 msgid "Transfer:"
-msgstr ""
+msgstr "Переміщення:"
 
 #: ../../inventory/overview/concepts/double-entry.rst:0
 msgid "1 Bicycle: Warehouse 1 → Transit"
-msgstr ""
+msgstr "1 велосипед: Склад 1 → Транзит"
 
 #: ../../inventory/overview/concepts/double-entry.rst:0
 msgid "1 Bicycle: Transit → Warehouse 2"
-msgstr ""
+msgstr "1 велосипед: Транзит → Склад 2"
 
 #: ../../inventory/overview/concepts/double-entry.rst:0
 msgid "Warehouse 2: the location the transfer is initiated from"
-msgstr ""
+msgstr "Склад 2: місцезнаходження переміщення запущено з"
 
 #: ../../inventory/overview/concepts/double-entry.rst:0
 msgid "Warehouse 1: on the transit route"
-msgstr ""
+msgstr "Склад 1: на маршруті транзиту"
 
 #: ../../inventory/overview/concepts/double-entry.rst:57
 msgid "Broken Product (scrapped)"
-msgstr ""
+msgstr "Пошкодженні товари (браковані)"
 
 #: ../../inventory/overview/concepts/double-entry.rst:55
 msgid "1 Bicycle: Warehouse → Scrap"
-msgstr ""
+msgstr "1 велосипед: Склад → Брак"
 
 #: ../../inventory/overview/concepts/double-entry.rst:58
 msgid "Scrap: Scrap Location when creating the scrapping"
-msgstr ""
+msgstr "Брак: Місцезнаходження браку під час створення браку"
 
 #: ../../inventory/overview/concepts/double-entry.rst:60
 msgid "Missing products in inventory"
-msgstr ""
+msgstr "Відсутні товари на складі"
 
 #: ../../inventory/overview/concepts/double-entry.rst:61
 msgid "1 Bicycle: Warehouse → Inventory Loss"
-msgstr ""
+msgstr "1 велосипед: Склад → Втрата запасу"
 
 #: ../../inventory/overview/concepts/double-entry.rst:62
 msgid "Extra products in inventory"
-msgstr ""
+msgstr "Додаткові товари на складі"
 
 #: ../../inventory/overview/concepts/double-entry.rst:63
 msgid "1 Bicycle: Inventory Loss → Warehouse"
-msgstr ""
+msgstr "1 велосипед: втрата запасу → склад"
 
 #: ../../inventory/overview/concepts/double-entry.rst:65
 msgid "Inventory Loss: \"Inventory Location\" field on the product"
-msgstr ""
+msgstr "Втрата запасу: поле на товарі \"місцезнаходження складу\""
 
 #: ../../inventory/overview/concepts/double-entry.rst:72
 msgid "Reception"
-msgstr ""
+msgstr "Надходження"
 
 #: ../../inventory/overview/concepts/double-entry.rst:0
 msgid "1 Bicycle: Supplier → Input"
-msgstr ""
+msgstr "1 велосипед: постачальник → прийом"
 
 #: ../../inventory/overview/concepts/double-entry.rst:0
 msgid "1 Bicycle: Input → Stock"
-msgstr ""
+msgstr "1 велосипед: Прийом → Склад"
 
 #: ../../inventory/overview/concepts/double-entry.rst:0
 msgid "Supplier: purchase order supplier"
-msgstr ""
+msgstr "Постачальник: замовлення на купівлю постачальника"
 
 #: ../../inventory/overview/concepts/double-entry.rst:0
 msgid "Input: \"destination\" field on the purchase order"
-msgstr ""
+msgstr "Прийом: поле на замовленні на купівлю \"призначення\""
 
 #: ../../inventory/overview/concepts/double-entry.rst:75
 msgid "Analysis"
@@ -4970,7 +5136,7 @@ msgstr ""
 
 #: ../../inventory/overview/concepts/double-entry.rst:159
 msgid "New sale orders"
-msgstr ""
+msgstr "Нове замовлення на продаж"
 
 #: ../../inventory/overview/concepts/double-entry.rst:157
 #: ../../inventory/overview/concepts/double-entry.rst:162
@@ -4996,23 +5162,23 @@ msgstr ""
 
 #: ../../inventory/overview/concepts/double-entry.rst:164
 msgid "Minimum Stock Rules"
-msgstr ""
+msgstr "Правила мінімального запасу"
 
 #: ../../inventory/overview/concepts/double-entry.rst:163
 msgid "A procurement is created at the rule's location."
-msgstr ""
+msgstr "Забезпечення створюється за місцезнаходженням правил."
 
 #: ../../inventory/overview/concepts/double-entry.rst:165
 msgid "Procurement location: on the rule, field \"Location\""
-msgstr ""
+msgstr "Місцезнаходження забезпечення: за правилом, поле \"Місцезнаходження\""
 
 #: ../../inventory/overview/concepts/double-entry.rst:168
 msgid "Procurement rules"
-msgstr ""
+msgstr "Правила забезпечення"
 
 #: ../../inventory/overview/concepts/double-entry.rst:168
 msgid "A new procurement is created on the rule's source location"
-msgstr ""
+msgstr "Нове забезпечення створено на місцезнаходженні джерела правила"
 
 #: ../../inventory/overview/concepts/double-entry.rst:170
 msgid ""
@@ -5059,7 +5225,7 @@ msgstr ""
 #: ../../inventory/overview/concepts/double-entry.rst:202
 #: ../../inventory/settings/warehouses.rst:3
 msgid "Warehouses"
-msgstr ""
+msgstr "Склади"
 
 #: ../../inventory/overview/concepts/double-entry.rst:194
 msgid "Warehouse Route Example: Pick → Pack → Ship"
@@ -5101,77 +5267,77 @@ msgstr ""
 
 #: ../../inventory/overview/concepts/double-entry.rst:212
 msgid "A Product"
-msgstr ""
+msgstr "Товар"
 
 #: ../../inventory/overview/concepts/double-entry.rst:205
 msgid "Product Route Example: Quality Control"
-msgstr ""
+msgstr "Приклад маршруту товару: Контроль якості"
 
 #: ../../inventory/overview/concepts/double-entry.rst:207
 #: ../../inventory/overview/concepts/double-entry.rst:217
 msgid "Reception:"
-msgstr ""
+msgstr "Надходження:"
 
 #: ../../inventory/overview/concepts/double-entry.rst:208
 #: ../../inventory/overview/concepts/double-entry.rst:218
 msgid "Supplier → Input"
-msgstr ""
+msgstr "Постачальник → Прийом"
 
 #: ../../inventory/overview/concepts/double-entry.rst:209
 msgid "Confirmation:"
-msgstr ""
+msgstr "Підтвердження:"
 
 #: ../../inventory/overview/concepts/double-entry.rst:210
 msgid "Input → Quality Control"
-msgstr ""
+msgstr "Прийом → Контроль якості"
 
 #: ../../inventory/overview/concepts/double-entry.rst:212
 msgid "Storage:"
-msgstr ""
+msgstr "Зберігання:"
 
 #: ../../inventory/overview/concepts/double-entry.rst:212
 msgid "Quality Control → Stock"
-msgstr ""
+msgstr "Контроль якості → Склад"
 
 #: ../../inventory/overview/concepts/double-entry.rst:221
 msgid "Product Category"
-msgstr ""
+msgstr "Категорія товару"
 
 #: ../../inventory/overview/concepts/double-entry.rst:215
 msgid "Product Category Route Example: cross-dock"
-msgstr ""
+msgstr "Приклад маршруту категорії товару: крос-докінг"
 
 #: ../../inventory/overview/concepts/double-entry.rst:219
 msgid "Cross-Docks:"
-msgstr ""
+msgstr "Крос-докінг:"
 
 #: ../../inventory/overview/concepts/double-entry.rst:220
 msgid "Input → Output"
-msgstr ""
+msgstr "Прийом → Відправка"
 
 #: ../../inventory/overview/concepts/double-entry.rst:221
 msgid "Delivery:"
-msgstr ""
+msgstr "Доставка:"
 
 #: ../../inventory/overview/concepts/double-entry.rst:222
 msgid "Output → Customer"
-msgstr ""
+msgstr "Відвантаження → Клієнт"
 
 #: ../../inventory/overview/concepts/double-entry.rst:227
 msgid "Sale Order Line"
-msgstr ""
+msgstr "Рядок замовлення на продаж"
 
 #: ../../inventory/overview/concepts/double-entry.rst:224
 msgid "Sale Order Line Example: Drop-shipping"
-msgstr ""
+msgstr "Приклад рядка замовлення на продаж: Дропшипінг"
 
 #: ../../inventory/overview/concepts/double-entry.rst:227
 msgid "Order:"
-msgstr ""
+msgstr "Замовлення:"
 
 #: ../../inventory/overview/concepts/double-entry.rst:227
 msgid "Supplier → Customer"
-msgstr ""
+msgstr "Постачальник → Клієнт"
 
 #: ../../inventory/overview/concepts/double-entry.rst:230
 msgid "Push Rules"
@@ -5206,15 +5372,15 @@ msgstr "Натисніть 2: Контроль якості → Склад"
 
 #: ../../inventory/overview/concepts/double-entry.rst:244
 msgid "Warehouse Transit"
-msgstr ""
+msgstr "Транзит складу"
 
 #: ../../inventory/overview/concepts/double-entry.rst:243
 msgid "Product lands in Transit"
-msgstr ""
+msgstr "Товар на транзиті"
 
 #: ../../inventory/overview/concepts/double-entry.rst:244
 msgid "Push: Transit → Warehouse 2"
-msgstr ""
+msgstr "Виштовхування: Транзит → Склад 2"
 
 #: ../../inventory/overview/concepts/double-entry.rst:247
 msgid "Procurement Groups"
@@ -5883,15 +6049,15 @@ msgstr ""
 
 #: ../../inventory/routes.rst:3
 msgid "Advanced Routes"
-msgstr ""
+msgstr "Розширені маршрути"
 
 #: ../../inventory/routes/concepts.rst:3
 msgid "Concepts"
-msgstr ""
+msgstr "Поняття"
 
 #: ../../inventory/routes/concepts/cross_dock.rst:3
 msgid "How to organize a cross-dock in your warehouse?"
-msgstr ""
+msgstr "Як організувати крос-докінг на вашому складі?"
 
 #: ../../inventory/routes/concepts/cross_dock.rst:5
 msgid ""
@@ -5901,6 +6067,12 @@ msgid ""
 "are managing our products with docking area where product directly place "
 "from supplier location and transfer this to gate pass for customer delivery."
 msgstr ""
+"Територія крос-докінгу тимчасово є місцем, де ми не зберігаємо жодного "
+"товару, а просто керуємо місцем згідно із доставкою для іншого клієнта. Це "
+"заощадить багато часу на переміщення та зберігання між складами. Ми керуємо "
+"нашою продукцією за допомогою док-зони, де товар безпосередньо розміщується "
+"з місцезнаходження постачальника, і передає його на ворота для доставки "
+"клієнтам."
 
 #: ../../inventory/routes/concepts/cross_dock.rst:17
 msgid ""
@@ -5908,10 +6080,14 @@ msgid ""
 "docking and is it for me? <https://www.odoo.com/blog/business-hacks-1/post"
 "/what-is-cross-docking-and-is-it-for-me-270>`_"
 msgstr ""
+"Для детальної інформації про те, як організувати ваш внутрішній склад, "
+"прочитайте `Що таке крос-докінг і чи підходить він мені? "
+"<https://www.odoo.com/blog/business-hacks-1/post/what-is-cross-docking-and-"
+"is-it-for-me-270>`_"
 
 #: ../../inventory/routes/concepts/cross_dock.rst:24
 msgid "Warehouse and routes"
-msgstr ""
+msgstr "Склад і маршрути"
 
 #: ../../inventory/routes/concepts/cross_dock.rst:26
 msgid ""
@@ -5919,91 +6095,112 @@ msgid ""
 " --> Location & Warehouse`, then in **Routes**, select **Advanced routing of"
 " products using rules**, then click on **Apply**."
 msgstr ""
+"У модулі Склад відкрийте розділ :menuselection:`Налаштування --> "
+"Налаштування --> Місцезнаходження та склад`, а потім у **Маршрутах** "
+"виберіть **Додаткові маршрутизації товарів за допомогою правил** та "
+"натисніть кнопку **Застосувати**."
 
 #: ../../inventory/routes/concepts/cross_dock.rst:33
 msgid ""
 "Open :menuselection:`Configuration --> Warehouse Management --> Warehouses`,"
 " then open the warehouse you want to cross-dock from and click on **Edit**."
 msgstr ""
+"Відкрийте  :menuselection:`Налаштування --> Управління складом --> Склади`, "
+"а потім відкрийте склад, з якого потрібно застосувати крос-докіг, і "
+"натисніть **Редагувати**."
 
 #: ../../inventory/routes/concepts/cross_dock.rst:36
 msgid "In the **Warehouse Configuration** tab, select:"
-msgstr ""
+msgstr "На вкладці **Налаштування складу** виберіть:"
 
 #: ../../inventory/routes/concepts/cross_dock.rst:38
 msgid ""
 "**Incoming Shipments**: Unload in input location then go to stock (2 steps)"
 msgstr ""
+"**Вхідні відправлення**: вивантажте у місці прийому, потім перейдіть до "
+"складу (2 кроки)"
 
 #: ../../inventory/routes/concepts/cross_dock.rst:41
 msgid "**Outgoing Shipments**: Ship directly from stock (Ship only)"
 msgstr ""
+"**Вихідні відправлення**: відправляйте безпосередньо зі складу (тільки "
+"доставка)"
 
 #: ../../inventory/routes/concepts/cross_dock.rst:43
 msgid "then click on **Save**."
-msgstr ""
+msgstr "потім натисніть **Зберегти**."
 
 #: ../../inventory/routes/concepts/cross_dock.rst:48
 msgid ""
 "This steps has generated a cross-docking route that you can see in "
 ":menuselection:`Inventory --> Configurations --> Routes --> Routes`."
 msgstr ""
+"Ці кроки спричинили крос-докінг, який ви можете побачити у "
+":menuselection:`Склад --> Налаштування --> Маршрути --> Маршрути`."
 
 #: ../../inventory/routes/concepts/cross_dock.rst:52
 msgid "Cross Docking Route"
-msgstr ""
+msgstr "Маршрут крос-докінгу"
 
 #: ../../inventory/routes/concepts/cross_dock.rst:54
 msgid ""
 "We will use the route **Buy** for first part of the flow and create a route "
 "for the remaining part:"
 msgstr ""
+"Ми використаємо маршрут **Купити** для першої частини потоку та створимо "
+"маршрут для решти частини:"
 
 #: ../../inventory/routes/concepts/cross_dock.rst:60
 msgid ""
 "Each of the procurement rule will now be configured. Cross Dock location is "
 "created as an internal physical location."
 msgstr ""
+"Кожне з правил закупівлі буде налаштоване. Місце крос-докінгу створюється як"
+" внутрішнє фізичне розташування."
 
 #: ../../inventory/routes/concepts/cross_dock.rst:67
 msgid ":menuselection:`Input --> Cross Dock`"
-msgstr ""
+msgstr ":menuselection:`Прийом --> Крос-докінг`"
 
 #: ../../inventory/routes/concepts/cross_dock.rst:73
 msgid ":menuselection:`Cross Dock --> Output`"
-msgstr ""
+msgstr ":menuselection:`Крос-докінг --> Відвантаження`"
 
 #: ../../inventory/routes/concepts/cross_dock.rst:79
 msgid ":menuselection:`Output --> Customer`"
-msgstr ""
+msgstr ":menuselection:`Відвантаження --> Клієнт`"
 
 #: ../../inventory/routes/concepts/cross_dock.rst:82
 msgid "Product with cross dock"
-msgstr ""
+msgstr "Товар з крос-докінгом"
 
 #: ../../inventory/routes/concepts/cross_dock.rst:84
 msgid ""
 "We have created the Vegetable Fennel product and assigned the routes created"
 " above as well as the **Buy** route."
 msgstr ""
+"Ми створили товар Овочевий фенхель і призначили маршрути, створені вище, а "
+"також маршрут **Купити**."
 
 #: ../../inventory/routes/concepts/cross_dock.rst:87
 msgid ""
 "We have also specified a supplier and a minimum order rule which is needed "
 "for replenishment of a stockable product."
 msgstr ""
+"Ми також вказали постачальника та мінімальне правило замовлення, яке "
+"необхідне для поповнення запасного товару."
 
 #: ../../inventory/routes/concepts/cross_dock.rst:95
 msgid ":doc:`use_routes`"
-msgstr ""
+msgstr ":doc:`use_routes`"
 
 #: ../../inventory/routes/concepts/cross_dock.rst:96
 msgid ":doc:`../../management/incoming/two_steps`"
-msgstr ""
+msgstr ":doc:`../../management/incoming/two_steps`"
 
 #: ../../inventory/routes/concepts/inter_warehouse.rst:3
 msgid "How to do inter-warehouses transfers?"
-msgstr ""
+msgstr "Як робити внутрішньо-складські переміщення?"
 
 #: ../../inventory/routes/concepts/inter_warehouse.rst:5
 msgid ""
@@ -6011,6 +6208,8 @@ msgid ""
 "warehouse to the other. This is very easy thanks to the inventory "
 "application in Odoo."
 msgstr ""
+"Якщо у вас є різні складські приміщення, ви можете перемістити товари з "
+"одного складу на інший. Це дуже просто завдяки складу в Odoo."
 
 #: ../../inventory/routes/concepts/inter_warehouse.rst:12
 msgid ""
@@ -6019,12 +6218,19 @@ msgid ""
 "application**. Then tick the **Manage several locations per warehouse** "
 "option. Please don't forget to **apply** your changes."
 msgstr ""
+"Перш за все вам потрібно вибрати варіант декількох місцезнаходжень. "
+"Перейдіть до :menuselection:`Налаштування --> Налаштування`в додатку "
+"**Склад**. Потім поставте галочку на пункті **Керування кількома "
+"місцезнаходженнями на складі**. Будь ласка, не забудьте **застосувати** свої"
+" зміни."
 
 #: ../../inventory/routes/concepts/inter_warehouse.rst:22
 msgid ""
 "This option should also be ticked if you wish to manage different locations "
 "and routes in your warehouse."
 msgstr ""
+"Цей параметр слід також позначити, якщо ви хочете керувати різними "
+"місцезнаходженнями та маршрутами на своєму складі."
 
 #: ../../inventory/routes/concepts/inter_warehouse.rst:26
 #: ../../inventory/settings/warehouses/warehouse_creation.rst:9
@@ -6038,12 +6244,18 @@ msgid ""
 "Warehouses`. You are now able to create your warehouse by clicking on "
 "**Create**."
 msgstr ""
+"Наступним кроком є створення вашого нового складу. У програмі Склад "
+"натисніть на :menuselection:`Налаштування --> Управління складами --> "
+"Склади`. Тепер ви можете створити свій склад, натиснувши кнопку "
+"**Створити**."
 
 #: ../../inventory/routes/concepts/inter_warehouse.rst:33
 msgid ""
 "Fill in a **Warehouse Name** and a **Short Name**. The short name is 5 "
 "characters maximum."
 msgstr ""
+"Заповніть **назву складу** та **коротку назву**, яка повинна становити "
+"максимум 5 символів."
 
 #: ../../inventory/routes/concepts/inter_warehouse.rst:41
 msgid ""
@@ -6051,16 +6263,22 @@ msgid ""
 "your transfer orders and other warehouse documents. It might be smart to use"
 " an understandable one (e.g.: WH/[first letters of location])."
 msgstr ""
+"Зверніть увагу на те, що **коротка назва** є дуже важливою, оскільки вона "
+"відображатиметься у вашому розпорядженні та інших складських документах. "
+"Можливо, розумно використовувати зрозумілу назву (наприклад, ВС/ [перші "
+"літери внутрішнього складу])."
 
 #: ../../inventory/routes/concepts/inter_warehouse.rst:46
 msgid ""
 "If you go back to your dashboard, new operations will automatically have "
 "been generated for your new warehouse."
 msgstr ""
+"Якщо ви повернетесь на інформаційну панель, нові операції буде автоматично "
+"створено для вашого нового складу."
 
 #: ../../inventory/routes/concepts/inter_warehouse.rst:53
 msgid "Creating a new inventory"
-msgstr ""
+msgstr "Створення нової інвентаризації"
 
 #: ../../inventory/routes/concepts/inter_warehouse.rst:55
 msgid ""
@@ -6068,6 +6286,9 @@ msgid ""
 "inventory in it. In that case you should create an inventory in Odoo, if not"
 " you can skip this step."
 msgstr ""
+"Якщо ви створите новий склад, у вас може бути наявна існуюча інвентаризація."
+" У такому випадку ви повинні створити інвентаризацію в Odoo, якщо не можете "
+"пропустити цей крок."
 
 #: ../../inventory/routes/concepts/inter_warehouse.rst:59
 msgid ""
@@ -6076,6 +6297,10 @@ msgid ""
 "on **Create**. Fill in the **Inventory Reference**, **Date** and be sure to "
 "select the right warehouse and location."
 msgstr ""
+"Перейдіть до програми Склад, виберіть :menuselection:`Контроль "
+"інвентаризації --> Налаштування інвентаризації`. Потім можна створити нову "
+"інвентаризацію, натиснувши кнопку **Створити**. Заповніть **реєстр товару**,"
+" **дату** та обов'язково виберіть правильний склад та місцезнаходження."
 
 #: ../../inventory/routes/concepts/inter_warehouse.rst:67
 msgid ""
@@ -6085,16 +6310,23 @@ msgid ""
 "not be changed as it represents a computed quantity from purchase and sales "
 "orders."
 msgstr ""
+"Потім натисніть **Почати інвентаризацію**. Відкриється нове вікно, де ви "
+"зможете вводити існуючі товари. Виберіть додавання елементу та вкажіть "
+"**Реальний обсяг**, наявний на складі. Теоретична кількість не може бути "
+"змінена, оскільки вона представляє обчислений обсяг замовлень на купівлю та "
+"продаж."
 
 #: ../../inventory/routes/concepts/inter_warehouse.rst:76
 msgid ""
 "Don't forget to validate your inventory once you have recorder the state of "
 "all yours product."
 msgstr ""
+"Не забудьте перевірити свою інвентаризацію, як тільки у вас запишеться етап "
+"всього вашого товару."
 
 #: ../../inventory/routes/concepts/inter_warehouse.rst:80
 msgid "Create an internal transfer"
-msgstr ""
+msgstr "Створіть внутрішнє переміщення"
 
 #: ../../inventory/routes/concepts/inter_warehouse.rst:82
 msgid ""
@@ -6102,12 +6334,17 @@ msgid ""
 " units of a product from your first warehouse to another one in Brussels, "
 "proceed as follows:"
 msgstr ""
+"Останній крок - створення внутрішнього переміщення. Якщо ви хочете "
+"перемістити дві одиниці товару з вашого першого складу на інший, який "
+"знаходиться приміром у Брюсселі, виконайте наступні дії:"
 
 #: ../../inventory/routes/concepts/inter_warehouse.rst:86
 msgid ""
 "From your dashboard, select a internal movement of one of the two "
 "warehouses. To do so, click on :menuselection:`More  --> Transfer`."
 msgstr ""
+"На інформаційній панелі виберіть внутрішнє переміщення одного з двох "
+"складів. Для цього натисніть :menuselection:`Більше --> Переміщення`."
 
 #: ../../inventory/routes/concepts/inter_warehouse.rst:92
 msgid ""
@@ -6115,17 +6352,24 @@ msgid ""
 "zone (in this case our \"old warehouse\") and the destination location zone "
 "(in this case our \"new\" warehouse located in Brussels)."
 msgstr ""
+"Відкриється нове вікно, де ви зможете обрати зону місцезнаходження джерела "
+"(у цьому випадку наш \"старий склад\") та зону місцезнаходження призначення "
+"(в даному випадку наш \"новий склад\" розташований у Брюсселі)."
 
 #: ../../inventory/routes/concepts/inter_warehouse.rst:96
 msgid ""
 "Add the products you want to transfer by clicking on **Add an Item** and "
 "don't forget to **Validate** or **Mark as TODO** once you are done."
 msgstr ""
+"Додайте товари, які ви хочете передати, натиснувши **Додати об'єкт**, і не "
+"забудьте **перевірити** або **позначити як ЗРОБИТИ**, коли ви закінчите."
 
 #: ../../inventory/routes/concepts/inter_warehouse.rst:102
 msgid ""
 "If you select **Validate**, Odoo will process all quantities to transfer."
 msgstr ""
+"Якщо ви виберете **Перевірити**, Odoo буде обробляти всі перелічені "
+"величини."
 
 #: ../../inventory/routes/concepts/inter_warehouse.rst:104
 msgid ""
@@ -6133,18 +6377,23 @@ msgid ""
 "Availability** status. Click on **Reserve** to reserve the amount of "
 "products in your source warehouse."
 msgstr ""
+"Якщо ви виберете **Позначити як ЗРОБИТИ***, Odoo поставить переміщення в "
+"статус **очікування**. Натисніть **Резерв**, щоби зарезервувати кількість "
+"товарів на своєму вихідному складі."
 
 #: ../../inventory/routes/concepts/inter_warehouse.rst:108
 msgid "It is also possible to manually transfer each product:"
-msgstr ""
+msgstr "Можна також вручну перемістити кожний товар:"
 
 #: ../../inventory/routes/concepts/inter_warehouse.rst:110
 msgid "Via your dashboard, select the transfer order in the source location."
 msgstr ""
+"За допомогою інформаційної панелі виберіть замолвння на переміщення в "
+"місцезнаходженні джерела."
 
 #: ../../inventory/routes/concepts/inter_warehouse.rst:115
 msgid "Select the right transfer order"
-msgstr ""
+msgstr "Виберіть правильне замовлення на переміщення"
 
 #: ../../inventory/routes/concepts/inter_warehouse.rst:120
 msgid ""
@@ -6152,6 +6401,9 @@ msgid ""
 "open the operation details window. In this new window you can manually "
 "indicate how much products you process"
 msgstr ""
+"3. Натисніть на маленький логотип олівця в нижньому правому куті, щоби "
+"відкрити вікно деталей операції. У цьому новому вікні ви можете вручну "
+"вказати, скільки товарів ви обробляєте"
 
 #: ../../inventory/routes/concepts/inter_warehouse.rst:129
 msgid ""
@@ -6161,10 +6413,16 @@ msgid ""
 "if you expect to process the remaining products later, do not create a "
 "backorder if you will not supply/receive the remaining products."
 msgstr ""
+"Якщо ви вирішите частково обробляти замовлення на переміщення (наприклад, "
+"частина товарів ще не може бути відправлена через несподівану подію), Odoo "
+"автоматично запитає, чи хочете ви створити **зворотнє замовлення**. Створіть"
+" зворотній логотип, якщо ви хочете пізніше обробити товари, що залишилися, "
+"не створюйте зворотнє замовлення, якщо ви не надаєте/не отримаєте інші "
+"товари."
 
 #: ../../inventory/routes/concepts/procurement_rule.rst:3
 msgid "What is a procurement rule?"
-msgstr ""
+msgstr "Що таке правила закупівлі?"
 
 #: ../../inventory/routes/concepts/procurement_rule.rst:8
 msgid ""
@@ -6178,6 +6436,15 @@ msgid ""
 " the company unable to fulfill the order and contributes to customer "
 "dissatisfaction."
 msgstr ""
+"Система управління закупівель на складі починається із замовлення клієнта. "
+"За допомогою цієї стратегії компанії виготовляють достатньо товарів для "
+"виконання замовлень клієнта. Перевага системи полягає в тому, що не буде "
+"перевищення запасу, який потрібно зберігати, таким чином знижуючи рівень "
+"запасів і вартість транспортування та зберігання товарів. Утім одним із "
+"головних недоліків системи збору даних є те, що дуже важко потрапити в "
+"дилеми замовлення, такі як постачальник, який не в змозі своєчасно "
+"відвантажити товар. Тоді компанія не може виконати замовлення та сприяє "
+"невдоволенню клієнтів."
 
 #: ../../inventory/routes/concepts/procurement_rule.rst:18
 msgid ""
@@ -6187,6 +6454,11 @@ msgid ""
 "by reducing the amount of storage space needed for inventory and the costs "
 "of storing goods."
 msgstr ""
+"Прикладом системи контролю якості складу є макет замовлення. Мета полягає в "
+"тому, щоби зберегти рівень складу на мінімумі, маючи достатньо запасів для "
+"задоволення потреб покупців. Система МТО (під замовлення) усуває витрати, "
+"зменшуючи обсяги запасів, необхідних для складу, та витрат на зберігання "
+"товарів."
 
 #: ../../inventory/routes/concepts/procurement_rule.rst:27
 msgid ""
@@ -6194,83 +6466,95 @@ msgid ""
 "application>Configuration>Settings and tick \"Advance routing of products "
 "using rules\"."
 msgstr ""
+"Правила закупівель є частиною маршрутів. Перейдіть у додаток "
+"Склад>Налаштування>Налаштування та позначте пункт \"Просування маршрутних "
+"товарів з використанням правил\"."
 
 #: ../../inventory/routes/concepts/procurement_rule.rst:35
 msgid "Procurement rules settings"
-msgstr ""
+msgstr "Налаштування правил закупівель"
 
 #: ../../inventory/routes/concepts/procurement_rule.rst:37
 msgid ""
 "The procurement rules are set on the routes. In the inventory application, "
 "go to Configuration > Routes."
 msgstr ""
+"Правила закупівель встановлюються на маршрутах. У програмі Склад перейдіть "
+"до розділу Налаштування> Маршрути."
 
 #: ../../inventory/routes/concepts/procurement_rule.rst:40
 msgid "In the Procurement rules section, click on Add an item."
-msgstr ""
+msgstr "У розділі Правила закупівель натисніть Додати об'єкт."
 
 #: ../../inventory/routes/concepts/procurement_rule.rst:45
 msgid ""
 "Here you can set the conditions of your rule. There are 3 types of action "
 "possibles :"
-msgstr ""
+msgstr "Тут ви можете встановити умови вашого правила. Існує 3 види дій:"
 
 #: ../../inventory/routes/concepts/procurement_rule.rst:48
 msgid "Move from another location rules"
-msgstr ""
+msgstr "Переміщення з іншого правила місцезнаходження."
 
 #: ../../inventory/routes/concepts/procurement_rule.rst:50
 msgid ""
 "Manufacturing rules that will trigger the creation of manufacturing orders."
 msgstr ""
+"Правила виробництва, які спричинять створення замовлень на виробництво."
 
 #: ../../inventory/routes/concepts/procurement_rule.rst:53
 msgid "Buy rules that will trigger the creation of purchase orders."
-msgstr ""
+msgstr "Правила купівлі, які ініціюватимуть створення замовлень на купівлю."
 
 #: ../../inventory/routes/concepts/procurement_rule.rst:56
 msgid ""
 "The Manufacturing application has to be installed in order to trigger "
 "manufacturing rules."
 msgstr ""
+"Додаток Виробництво повинно бути встановлене, щоби запустити правила "
+"виробництва."
 
 #: ../../inventory/routes/concepts/procurement_rule.rst:60
 msgid ""
 "The Purchase application has to be installed in order to trigger **buy** "
 "rules."
 msgstr ""
+"Додаток Закупівлі потрібно встановити, щоб запустити правила **купівлі**."
 
 #: ../../inventory/routes/concepts/procurement_rule.rst:68
 msgid "Try to create a procurement rule in our demo instance."
 msgstr ""
+"Спробуйте створити правило закупівель у нашому демонстраційному прикладі."
 
 #: ../../inventory/routes/concepts/procurement_rule.rst:71
 msgid ""
 "Some Warehouse Configuration creates routes with procurement rules already "
 "defined."
 msgstr ""
+"Деякі налаштування складу створює маршрути із вже визначеними правилами "
+"закупівель."
 
 #: ../../inventory/routes/concepts/procurement_rule.rst:75
 #: ../../inventory/routes/concepts/use_routes.rst:130
 #: ../../inventory/routes/concepts/use_routes.rst:152
 msgid ":doc:`push_rule`"
-msgstr ""
+msgstr ":doc:`push_rule`"
 
 #: ../../inventory/routes/concepts/procurement_rule.rst:76
 #: ../../inventory/routes/concepts/push_rule.rst:84
 #: ../../inventory/routes/concepts/use_routes.rst:153
 msgid ":doc:`inter_warehouse`"
-msgstr ""
+msgstr ":doc:`inter_warehouse`"
 
 #: ../../inventory/routes/concepts/procurement_rule.rst:77
 #: ../../inventory/routes/concepts/push_rule.rst:85
 #: ../../inventory/routes/concepts/use_routes.rst:154
 msgid ":doc:`cross_dock`"
-msgstr ""
+msgstr ":doc:`cross_dock`"
 
 #: ../../inventory/routes/concepts/push_rule.rst:3
 msgid "What is a push rule?"
-msgstr ""
+msgstr "Що таке правило виштовхування?"
 
 #: ../../inventory/routes/concepts/push_rule.rst:8
 msgid ""
@@ -6287,6 +6571,19 @@ msgid ""
 "have enough product on hand to complete customer orders, preventing the "
 "inability to meet customer demand for the product."
 msgstr ""
+"Система виштовхування управління складом включає в себе прогнозування потреб"
+" складу для задоволення попиту клієнтів. Компанії повинні передбачити, які "
+"товари клієнти купуватимуть разом із визначенням кількості товарів, які буде"
+" придбано. Компанія, у свою чергу, виробить достатньо товарів, щоби "
+"задовольнити прогнозний попит та продавати товар споживачеві. Недоліками "
+"системи контролю якості складу є те, що прогнози часто є неточними, оскільки"
+" продажі можуть бути непередбачуваними і відрізнятися з року в рік. Ще "
+"однією проблемою, пов'язаною із системами керування складом, є те, що "
+"занадто багато товару залишається на складі. Це збільшує витрати компанії на"
+" зберігання цих товарів. Перевага системи виштовхування полягає в тому, що "
+"компанія досить впевнена, що вона буде мати достатньо товарів у наявності, "
+"щоби виконати замовлення клієнтів, запобігаючи неможливості задовольнити "
+"потреби покупця на товар."
 
 #: ../../inventory/routes/concepts/push_rule.rst:22
 msgid ""
@@ -6296,6 +6593,11 @@ msgid ""
 "specification (destination location, delay, type of move, journal). It can "
 "be triggered automatically or manually."
 msgstr ""
+"Потік виштовхування показує, як місцезнаходження розташовуються з іншими. Як"
+" тільки певна кількість товарів переміщується у місцезнаходження джерела, "
+"автоматично передбачається рух розташування відповідно до параметрів, "
+"заданих у специфікації потоку (місце призначення, затримка, тип переміщення,"
+" журнал). Це може спрацьовувати автоматично або вручну."
 
 #: ../../inventory/routes/concepts/push_rule.rst:31
 msgid ""
@@ -6303,20 +6605,25 @@ msgid ""
 "--> Configuration --> Settings` and tick **Advance routing of products using"
 " rules**."
 msgstr ""
+"Правила виштовхування є частиною маршрутів. Перейдіть до меню "
+":menuselection:`Склад --> Налаштування --> Налаштування` та позначте пункт "
+"**Попередня маршрутизація товарів із використанням правил**."
 
 #: ../../inventory/routes/concepts/push_rule.rst:39
 msgid "Push rules settings"
-msgstr ""
+msgstr "Налаштування правил виштовхування"
 
 #: ../../inventory/routes/concepts/push_rule.rst:41
 msgid ""
 "The push rules are set on the routes. Go to :menuselection:`Configuration "
 "--> Routes`."
 msgstr ""
+"Правила виштовхування встановлюються на маршрутах. Перейдіть до "
+":menuselection:`Налаштування --> Маршрути`."
 
 #: ../../inventory/routes/concepts/push_rule.rst:44
 msgid "In the push rule section, click on **Add an item**."
-msgstr ""
+msgstr "У розділі правила виштовхування натисніть **Додати об'єкт**."
 
 #: ../../inventory/routes/concepts/push_rule.rst:49
 msgid ""
@@ -6325,19 +6632,26 @@ msgid ""
 "the 3 steps receipts, another push rule will make the goods that are in the "
 "quality control location move to the stock."
 msgstr ""
+"Тут ви можете встановити умови вашого правила. У цьому прикладі, коли товар "
+"знаходиться у **місці прийому**, його потрібно перемістити в контроль "
+"якості. У 3 етапах надходжень, інше правило виштовхування призведе до того, "
+"що товари, які перебувають у місці контролю якості, переміщуються до складу."
 
 #: ../../inventory/routes/concepts/push_rule.rst:59
 msgid "Try to create a push rule in our demo instance."
 msgstr ""
+"Спробуйте створити правило виштовхування в нашому демонстраційному прикладі."
 
 #: ../../inventory/routes/concepts/push_rule.rst:62
 msgid ""
 "Some warehouse configuration creates routes with push rules already defined."
 msgstr ""
+"Деякі налаштування складу створюють маршрути із вже встановленими правилами "
+"виштовхування."
 
 #: ../../inventory/routes/concepts/push_rule.rst:66
 msgid "Stock transfers"
-msgstr ""
+msgstr "Складські переміщення"
 
 #: ../../inventory/routes/concepts/push_rule.rst:68
 msgid ""
@@ -6345,12 +6659,17 @@ msgid ""
 " route, you will see that some transfers might be ready and other are "
 "waiting."
 msgstr ""
+"Правило виштовхування призведе до складського переміщення. Відповідно до "
+"правила, встановленого на вашому маршруті, ви побачите, що деякі переміщення"
+" можуть бути готові, а інші в очікуванні."
 
 #: ../../inventory/routes/concepts/push_rule.rst:72
 msgid ""
 "The push rule that was set above will create moves from **WH/Input** "
 "location to the **WH/Quality Control** location."
 msgstr ""
+"Правило виштовхування, яке було встановлено вище, створить переміщення зі "
+"**складу/місця прийому** до місцезнаходження **складу/контролю якості**."
 
 #: ../../inventory/routes/concepts/push_rule.rst:78
 msgid ""
@@ -6358,41 +6677,51 @@ msgid ""
 "it defines that when the quality control is done, the goods will be moved to"
 " the main stock."
 msgstr ""
+"У цьому прикладі, інше переміщення очікує згідно із другим правилом "
+"виштовхування, воно визначає, що коли контроль якості буде завершено, товари"
+" будуть переміщені на основний склад."
 
 #: ../../inventory/routes/concepts/push_rule.rst:83
 #: ../../inventory/routes/concepts/use_routes.rst:128
 msgid ":doc:`procurement_rule`"
-msgstr ""
+msgstr ":doc:`procurement_rule`"
 
 #: ../../inventory/routes/concepts/use_routes.rst:3
 msgid "How to use routes?"
-msgstr ""
+msgstr "Як використовувати маршрути?"
 
 #: ../../inventory/routes/concepts/use_routes.rst:8
 msgid ""
 "A route is a collection of procurement rules and push rules. Odoo can manage"
 " advanced push/pull routes configuration, for example:"
 msgstr ""
+"Маршрут - це сукупність правил закупівель та правил переміщення. Odoo може "
+"керувати додатковими налаштуваннями маршрутів виштовхування/витягування, "
+"наприклад:"
 
 #: ../../inventory/routes/concepts/use_routes.rst:11
 msgid "Manage product manufacturing chains"
-msgstr ""
+msgstr "Управління ланцюгами виробництва продукції"
 
 #: ../../inventory/routes/concepts/use_routes.rst:13
 msgid "Manage default locations per product"
-msgstr ""
+msgstr "Керування місцезнаходженням за замовчуванням для кожного товару"
 
 #: ../../inventory/routes/concepts/use_routes.rst:15
 msgid ""
 "Define routes within your warehouse according to business needs, such as "
 "quality control, after sales services or supplier returns"
 msgstr ""
+"Визначення маршрутів на вашому складі відповідно до потреб бізнесу, таких як"
+" контроль якості, післяпродажне обслуговування чи повернення постачальникам"
 
 #: ../../inventory/routes/concepts/use_routes.rst:18
 msgid ""
 "Help rental management, by generating automated return moves for rented "
 "products"
 msgstr ""
+"Допомога в управлінні орендою, генеруючи автоматичні зворотні рухи для "
+"орендованих товарів"
 
 #: ../../inventory/routes/concepts/use_routes.rst:24
 msgid ""
@@ -6400,46 +6729,58 @@ msgid ""
 "application, :menuselection:`Configuration --> Settings` and tick **Advance "
 "routing of products using rules**."
 msgstr ""
+"Правила закупівель є частиною маршрутів. Перейдіть до програми **Склад**, "
+":menuselection:`Налаштування --> Налаштування`  і виберіть пункт **Розширені"
+" маршрути товарів, що використовують правила**."
 
 #: ../../inventory/routes/concepts/use_routes.rst:32
 msgid "Pre-configured routes"
-msgstr ""
+msgstr "Попередньо-налаштовані маршрути"
 
 #: ../../inventory/routes/concepts/use_routes.rst:34
 msgid "Odoo has some pre-configured routes for your warehouses."
-msgstr ""
+msgstr "Odoo має деякі попередньо налаштовані маршрути для ваших складів."
 
 #: ../../inventory/routes/concepts/use_routes.rst:36
 msgid ""
 "In the Inventory application, go to :menuselection:`Configuration --> "
 "Warehouses`."
 msgstr ""
+"У програмі Склад перейдіть до :menuselection:`Налаштування --> "
+"Налаштування`."
 
 #: ../../inventory/routes/concepts/use_routes.rst:39
 msgid ""
 "In the **Warehouse Configuration** tab, **Incoming Shipments** and "
 "**Outgoing Shippings** options set some routes according to your choices."
 msgstr ""
+"На вкладці **Налаштування складу** параметри **Вхідні відправлення** та "
+"**Вихідні відправлення** встановлюють деякі маршрути відповідно до вашого "
+"вибору."
 
 #: ../../inventory/routes/concepts/use_routes.rst:46
 msgid "Custom Routes"
-msgstr ""
+msgstr "Налаштування маршрутів"
 
 #: ../../inventory/routes/concepts/use_routes.rst:48
 msgid ""
 "In the **Inventory** application, go to :menuselection:`Configuration --> "
 "Routes`."
 msgstr ""
+"У програмі **Склад** перейдіть до :menuselection:`Налаштування --> "
+"Маршрути`."
 
 #: ../../inventory/routes/concepts/use_routes.rst:54
 msgid ""
 "First, you have to select the places where this route can be selected. You "
 "can combine several choices."
 msgstr ""
+"По-перше, вам слід вибрати місця, де можна вибрати цей маршрут. Ви можете "
+"об'єднати кілька варіантів вибору."
 
 #: ../../inventory/routes/concepts/use_routes.rst:58
 msgid "Routes applied on warehouses"
-msgstr ""
+msgstr "Маршрути застосовуються на складах"
 
 #: ../../inventory/routes/concepts/use_routes.rst:60
 msgid ""
@@ -6447,16 +6788,21 @@ msgid ""
 " applied. The route will be set for all transfer in that warehouse that "
 "would meet the conditions of the procurement and push rules."
 msgstr ""
+"Якщо ви позначите **Склади**, ви повинні вибрати, який склад буде "
+"застосовано. Маршрут буде встановлено для всього переміщення на цьому "
+"складі, який відповідатиме умовам закупівель та правилам переміщення."
 
 #: ../../inventory/routes/concepts/use_routes.rst:68
 msgid "Routes applied on products"
-msgstr ""
+msgstr "Маршрути застосовуються до товарів"
 
 #: ../../inventory/routes/concepts/use_routes.rst:70
 msgid ""
 "If you tick **Products**, you have to manually set on which product it will "
 "be applied."
 msgstr ""
+"Якщо ви позначите **Товари**, вам потрібно вручну встановити, який товар він"
+" буде застосовуватися."
 
 #: ../../inventory/routes/concepts/use_routes.rst:76
 msgid ""
@@ -6464,16 +6810,21 @@ msgid ""
 "(:menuselection:`Inventory --> Control --> Products`). In the Inventory Tab,"
 " select the route(s):"
 msgstr ""
+"Відкрийте продукт, на якому ви бажаєте застосувати маршрути "
+"(:menuselection:`Склад --> Контроль --> Товари`). На вкладці Склад виберіть "
+"маршрути:"
 
 #: ../../inventory/routes/concepts/use_routes.rst:84
 msgid "Routes applied on Product Category"
-msgstr ""
+msgstr "Маршрути, застосовані до категорії товарів"
 
 #: ../../inventory/routes/concepts/use_routes.rst:86
 msgid ""
 "If you tick **Product Categories**, you have to manually set on which "
 "categories it will be applied."
 msgstr ""
+"Якщо ви позначите **Категорії товарів**, вам потрібно вручну встановити, до "
+"яких категорій він буде застосовуватися."
 
 #: ../../inventory/routes/concepts/use_routes.rst:92
 msgid ""
@@ -6481,44 +6832,56 @@ msgid ""
 "(:menuselection:`Configuration --> Product Categories`). Select the route(s)"
 " under the **Logistics** section :"
 msgstr ""
+"Відкрийте товар, на який ви хочете застосувати маршрути "
+"(:menuselection:`Налаштування --> Категорії товару`). Виберіть маршрути в "
+"розділі **Логістики**:"
 
 #: ../../inventory/routes/concepts/use_routes.rst:100
 msgid "Routes applied on Sales Order lines"
-msgstr ""
+msgstr "Маршрути, застосовані до рядків замовлення на продаж"
 
 #: ../../inventory/routes/concepts/use_routes.rst:102
 msgid ""
 "If you tick **Sales order lines**, you have to manually set the route every "
 "time you make a sale order."
 msgstr ""
+"Якщо ви позначите **Рядки замовлення на продаж**, вам доведеться вручну "
+"встановлювати маршрут щоразу, коли ви хочете зробити замовлення на продаж."
 
 #: ../../inventory/routes/concepts/use_routes.rst:108
 msgid ""
 "In order to make it work, you also have to activate the use of the routes on"
 " the sales order."
 msgstr ""
+"Для того, щоб це запрацювало, ви також повинні активувати використання "
+"маршрутів у замовленні клієнта."
 
 #: ../../inventory/routes/concepts/use_routes.rst:111
 msgid ""
 "In the Sales application, go to :menuselection:`Configuration --> Settings` "
 "and tick **Choose specific routes on sales order lines (advanced)**."
 msgstr ""
+"У додатку Продажі перейдіть до :menuselection:`Налаштування --> "
+"Налаштування` та позначте пункт **Вибрати конкретні маршрути по рядках "
+"замовлення на продаж (розширені)**."
 
 #: ../../inventory/routes/concepts/use_routes.rst:118
 msgid "You can now choose the routes for each lines of your sales orders:"
 msgstr ""
+"Тепер ви можете вибрати маршрути для кожного рядка ваших замовлень на "
+"продаж:"
 
 #: ../../inventory/routes/concepts/use_routes.rst:124
 msgid "Procurement and push rules"
-msgstr ""
+msgstr "Закупівлі і правила виштовхування"
 
 #: ../../inventory/routes/concepts/use_routes.rst:126
 msgid "Please refer to the documents:"
-msgstr ""
+msgstr "Будь ласка, зверніться до документації:"
 
 #: ../../inventory/routes/concepts/use_routes.rst:133
 msgid "Procurement configuration"
-msgstr ""
+msgstr "Налаштування закупівель"
 
 #: ../../inventory/routes/concepts/use_routes.rst:135
 msgid ""
@@ -6527,10 +6890,14 @@ msgid ""
 "**Procurement Request**. Choose the route you want to use next to "
 "**Preferred Routes**:"
 msgstr ""
+"Під час запиту на закупівлю ви можете застосувати маршрут, який ви хочете "
+"використовувати. На товарі (:menuselection:`Контроль складу --> Товари`), "
+"натисніть на **Запит на закупівлю**. Виберіть маршрут, який ви хочете "
+"використовувати поруч із **Рекомендованими маршрутами**:"
 
 #: ../../inventory/routes/concepts/use_routes.rst:144
 msgid "Make-to-Order Route"
-msgstr ""
+msgstr "Маршрут на замовлення"
 
 #: ../../inventory/routes/concepts/use_routes.rst:146
 msgid ""
@@ -6539,22 +6906,29 @@ msgid ""
 "**Manufacture** and it will trigger automatically the purchase order or the "
 "Manufacturing Order when your products are out-of-stock."
 msgstr ""
+"Якщо ви працюєте без складу, або з мінімальними правилами закупівлі, краще "
+"скористатись маршрутом **на замовлення**. Поєднайте його з маршрутом "
+"**Купівля** або **Виробництво**, і він автоматично запускає замовлення на "
+"закупівлю або замовлення на виробництво, коли ваші товари недоступні."
 
 #: ../../inventory/routes/costing.rst:3
 msgid "Product Costing"
-msgstr ""
+msgstr "Вартість товару"
 
 #: ../../inventory/routes/costing/landed_costs.rst:3
 msgid "How to integrate landed costs in the cost of the product?"
-msgstr ""
+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"
 msgstr ""
+"Додаткові витрати включають: вартість товару + доставку + розмитнення + "
+"ризик."
 
 #: ../../inventory/routes/costing/landed_costs.rst:12
 msgid ""
@@ -6563,10 +6937,14 @@ msgid ""
 " to identify landed cost to decide sale price of product because it will "
 "impact on company profits."
 msgstr ""
+"Усі ці компоненти можуть бути непридатними для кожної відправки, але "
+"відповідні компоненти повинні розглядатися як частина додаткових витрат. Ми "
+"мусимо визначити додаткові витрати, щоби визначити ціну продажу товару, "
+"оскільки це вплине на прибуток компанії."
 
 #: ../../inventory/routes/costing/landed_costs.rst:21
 msgid "Applications configuration"
-msgstr ""
+msgstr "Налаштування додатків"
 
 #: ../../inventory/routes/costing/landed_costs.rst:23
 msgid ""
@@ -6575,6 +6953,11 @@ msgid ""
 "accounting option **Include landed costs in product costing computation** & "
 "**Perpetual inventory valuation**, then click on **Apply** to save changes."
 msgstr ""
+"По-перше, вам потрібно активізувати використання додаткових витрат. "
+"Перейдіть до :menuselection:`додатку Склад --> Налаштування --> "
+"Налаштування`. Перевірте параметр бухобліку **Включити додаткові витрати на "
+"випадок розрахунку вартості товару** та **Безстрокову складську оцінку**, "
+"після чого натисніть **Застосувати**, щоб зберегти зміни."
 
 #: ../../inventory/routes/costing/landed_costs.rst:32
 msgid ""
@@ -6582,10 +6965,14 @@ msgid ""
 "Setting`. Choose costing method **Use a 'Fixed', 'Real' or 'Average' price "
 "costing method**, then click on **Apply** to save changes."
 msgstr ""
+"Потім перейдіть до програми  :menuselection:`Купівлі --> Налаштування --> "
+"Налаштування`. Виберіть метод визначення вартості **Використовувати метод "
+"«Виправлено», «Реальний» або «Середній»**, потім натисніть **Застосувати**, "
+"щоб зберегти зміни."
 
 #: ../../inventory/routes/costing/landed_costs.rst:40
 msgid "Landed Cost Types"
-msgstr ""
+msgstr "Типи додаткових витрат"
 
 #: ../../inventory/routes/costing/landed_costs.rst:42
 msgid ""
@@ -6593,6 +6980,9 @@ msgid ""
 "Costs**, such as freight, insurance or custom duties. Go to "
 ":menuselection:`Inventory --> Configuration --> Landed Cost types`."
 msgstr ""
+"Почніть зі створення конкретних товарів, щоби вказати додаткові витрати "
+"такі, як вантажні, страхові та митні збори. Перейдіть до "
+":menuselection:`Складу --> Налаштування --> Типи додаткових витрат`."
 
 #: ../../inventory/routes/costing/landed_costs.rst:50
 msgid ""
@@ -6600,22 +6990,29 @@ msgid ""
 "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 ""
+msgstr "Посилання на додаткові витрати на переміщення"
 
 #: ../../inventory/routes/costing/landed_costs.rst:57
 msgid ""
 "To calculate landed costs, go to :menuselection:`Inventory --> Inventory "
 "Control --> Landed Costs`."
 msgstr ""
+"Для розрахунку додаткових витрат, перейдіть до :menuselection:`Складу --> "
+"Контроль складу --> Додаткові витрати`."
 
 #: ../../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 ""
@@ -6623,25 +7020,32 @@ msgid ""
 "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."
 msgstr ""
+"Щоби підтвердити атрибуцію додаткових витрат, натисніть кнопку "
+"**Перевірити**."
 
 #: ../../inventory/routes/strategies.rst:3
 msgid "Putaway & Removal Strategies"
-msgstr ""
+msgstr "Стратегії виправлення та видалення"
 
 #: ../../inventory/routes/strategies/putaway.rst:3
 msgid "What is a putaway strategy?"
-msgstr ""
+msgstr "Що таке стратегія викладки товару?"
 
 #: ../../inventory/routes/strategies/putaway.rst:8
 msgid ""
@@ -6650,6 +7054,9 @@ msgid ""
 "products off the receiving shipment and putting them into the most "
 "appropriate location."
 msgstr ""
+"Хороша реалізація складу гарантує, що товари автоматично перемістяться до "
+"відповідного місця призначення. Викладка - це процес прийому товарів із "
+"отримання доставки та розміщення їх у найбільш відповідному місці."
 
 #: ../../inventory/routes/strategies/putaway.rst:13
 msgid ""
@@ -6657,6 +7064,9 @@ msgid ""
 " make sure that certain products are not stored close to each other because "
 "of a potential chemical reaction."
 msgstr ""
+"Якщо, наприклад, склад містить летючі речовини, важливо переконатися, що "
+"певні товари не зберігаються близько один до одного через потенційну хімічну"
+" реакцію."
 
 #: ../../inventory/routes/strategies/putaway.rst:17
 msgid ""
@@ -6665,6 +7075,10 @@ msgid ""
 "location level (unlike removal strategies which are defined at the product "
 "level)."
 msgstr ""
+"Стратегія викладки застосовується за тим же принципом, що й стратегії "
+"вилучення, але впливає на місце призначення. Стратегії викладки визначаються"
+" на рівні розташування (на відміну від стратегій вилучення, які визначаються"
+" на рівні товару)."
 
 #: ../../inventory/routes/strategies/putaway.rst:25
 msgid ""
@@ -6672,27 +7086,38 @@ msgid ""
 "option **Manage several location per warehouse & Advance routing of products"
 " using rules**, then click on **Apply**."
 msgstr ""
+"Перейдіть до :menuselection:`Складу --> Налаштування --> Налашутвання`  та "
+"позначте **Параметри керування кількома місцезнходженнями на складі та "
+"Попередня маршрутизація товарів за допомогою правил**, а потім натисніть "
+"кнопку **Застосувати**."
 
 #: ../../inventory/routes/strategies/putaway.rst:33
 msgid "Setting up a strategy"
-msgstr ""
+msgstr "Налаштування стратегії"
 
 #: ../../inventory/routes/strategies/putaway.rst:35
 msgid ""
 "Let's take as an example a retail shop where we store vegetables and fruits."
 msgstr ""
+"Давайте розглянемо, наприклад, роздрібний магазин, в якому ми зберігаємо "
+"овочі та фрукти."
 
 #: ../../inventory/routes/strategies/putaway.rst:38
 msgid ""
 "We have to store this type of product in different locations to maintain "
 "product quality."
 msgstr ""
+"Ми повинні зберігати цей тип товару в різних місцях, щоби підтримувати "
+"якість продукції."
 
 #: ../../inventory/routes/strategies/putaway.rst:41
 msgid ""
 "Suppose there is one warehouse location **WH/Stock** and there is sub "
 "location **WH/Stock/Vegetables** & **WH/Stock/Fruits**."
 msgstr ""
+"Припустимо, є одне складське розташування **Вутрішній склад/Склад**, і є "
+"підрозділ **Внутрішній Склад/Склад/Овочі** та **Внутрішній "
+"Склад/Склад/Фрукти**."
 
 #: ../../inventory/routes/strategies/putaway.rst:44
 msgid ""
@@ -6701,6 +7126,10 @@ msgid ""
 "putaway strategy, click on **Edit** and locate the option **Put Away "
 "Strategy**."
 msgstr ""
+"Ви можете створити стратегію викладки зі :menuselection:`Складу --> "
+"Налаштування --> Місцезнаходження`. Відкрийте будь-яке місцезнаходження, де "
+"потрібно встановити стратегію викладки, натисніть **Редагувати** та знайдіть"
+" варіант **Стратегія викладки**."
 
 #: ../../inventory/routes/strategies/putaway.rst:52
 msgid ""
@@ -6708,31 +7137,40 @@ msgid ""
 "form view of put away strategy on which you have to set a name for the "
 "strategy, and set the method and fixed location for each category."
 msgstr ""
+"Відкрийте спадне меню та натисніть **Створити та редагувати**. Це дозволить "
+"відкрити форму перегляду стратегії викладки, на якій потрібно вказати назву "
+"стратегії, і встановити метод і фіксоване місцезнаходження для кожної "
+"категорії."
 
 #: ../../inventory/routes/strategies/putaway.rst:59
 msgid ""
 "When you have entered all the necessary information, click on **Save**."
 msgstr ""
+"Коли ви введете всю необхідну інформацію, натисніть кнопку **Зберегти**."
 
 #: ../../inventory/routes/strategies/putaway.rst:61
 msgid ""
 "Now, when you purchase products with those categories, they will "
 "automatically be transferred to the correct location."
 msgstr ""
+"Тепер, коли ви купуєте товари з цими категоріями, вони будуть автоматично "
+"переведені у правильне місцезнаходження."
 
 #: ../../inventory/routes/strategies/putaway.rst:64
 msgid ""
 "To check current inventory, Go to :menuselection:`Inventory --> Inventory "
 "Control --> Current Inventory`"
 msgstr ""
+"Щоби перевірити поточний склад, перейдіть до  :menuselection:`Складу --> "
+"Контроль складу --> Поточний склад`"
 
 #: ../../inventory/routes/strategies/putaway.rst:67
 msgid "There you can see current inventory by location."
-msgstr ""
+msgstr "Тут ви можете побачити поточний склад за місцезнаходженням."
 
 #: ../../inventory/routes/strategies/removal.rst:3
 msgid "What is a removal strategy (FIFO, LIFO, and FEFO)?"
-msgstr ""
+msgstr "Що таке стратегія вилучення (FIFO, LIFO та FEFO)?"
 
 #: ../../inventory/routes/strategies/removal.rst:8
 msgid ""
@@ -6740,6 +7178,9 @@ msgid ""
 "products in order to optimize the distance for the worker, for quality "
 "control purpose or due to reason of product expiration."
 msgstr ""
+"Стратегії вилучення, як правило, полягають у комплектуванні найкращих "
+"товарів для оптимізації відстані для працівника, для цілей контролю якості "
+"або через причину закінчення терміну дії продукції."
 
 #: ../../inventory/routes/strategies/removal.rst:12
 msgid ""
@@ -6748,12 +7189,18 @@ msgid ""
 "on the **removal strategy** that is defined on the **product category** or "
 "on the **location**."
 msgstr ""
+"Коли треба зробити переміщення товару, Odoo знайде доступні товари, які "
+"можуть бути призначені для доставки. Те, як Odoo призначає ці товари, "
+"залежить від **стратегії вилучення**, яка визначена у **категорії товару** "
+"або в **місцезнаходженні**."
 
 #: ../../inventory/routes/strategies/removal.rst:20
 msgid ""
 "In the **Inventory** application, go to :menuselection:`Configuration --> "
 "Settings`:"
 msgstr ""
+"У програмі **Склад** перейдіть до :menuselection:`Налаштування --> "
+"Налаштування`:"
 
 #: ../../inventory/routes/strategies/removal.rst:29
 msgid ""
@@ -6761,20 +7208,26 @@ msgid ""
 "warehouse** and **Advanced routing of products using rules**, then click on "
 "**Apply**."
 msgstr ""
+"Перевірте **Відстежувати партії або серійні номери**, **Керувати кількома "
+"місцезнаходженнми на складі** та **Розширені маршрутизації товарів за "
+"правилами**, а потім натисніть кнопку **Застосувати**."
 
 #: ../../inventory/routes/strategies/removal.rst:33
 msgid ""
 "Then, open :menuselection:`Configuration --> Locations` and open the "
 "location on which you want to apply a removal strategy."
 msgstr ""
+"Потім відкрийте :menuselection:`Налаштування --> Місцезнаходження` та "
+"відкрийте місцезнаходження, на якому ви хочете застосувати стратегію "
+"вилучення."
 
 #: ../../inventory/routes/strategies/removal.rst:40
 msgid "Types of removal strategy"
-msgstr ""
+msgstr "Види стратегії видалення"
 
 #: ../../inventory/routes/strategies/removal.rst:43
 msgid "FIFO ( First In First Out )"
-msgstr ""
+msgstr "FIFO (First In First Out)"
 
 #: ../../inventory/routes/strategies/removal.rst:45
 msgid ""
@@ -6784,41 +7237,55 @@ msgid ""
 "short demand cycles, such as clothes, also may have to pick FIFO to ensure "
 "they are not stuck with outdated styles in inventory."
 msgstr ""
+"Стратегія **FIFO** передбачає, що товари, які спочатку були запаковані, "
+"спершу перенесуть. Компанії повинні використовувати метод FIFO, якщо вони "
+"продають швидкопсувні товари. Компанії, що продають товари із відносно "
+"коротким циклом попиту, такими як одяг, також можуть вибрати FIFO, щоби вони"
+" не застрягли із застарілими стилями на складі."
 
 #: ../../inventory/routes/strategies/removal.rst:51
 msgid ""
 "Go to :menuselection:`Inventory --> Configuration --> Locations`, open the "
 "stock location and set **FIFO** removal strategy."
 msgstr ""
+"Перейдіть до :menuselection:`Складу --> Налаштування --> Місцезнаходженя`, "
+"відкрийте місцезнаходження складу та встановіть стратегію вилучення "
+"**FIFO**."
 
 #: ../../inventory/routes/strategies/removal.rst:54
 msgid "Let's take one example of FIFO removal strategy."
-msgstr ""
+msgstr "Давайте розглянемо один з прикладів стратегії вилучення FIFO. "
 
 #: ../../inventory/routes/strategies/removal.rst:56
 msgid ""
 "In your warehouse stock (``WH/Stock``) location, there are ``3`` lots of "
 "``iPod 32 Gb`` available."
 msgstr ""
+"На вашому складі (``WH/Stock``) є в наявності ``3`` штуки ``iPod 32 Гб``."
 
 #: ../../inventory/routes/strategies/removal.rst:59
 msgid ""
 "You can find details of available inventory in inventory valuation report."
-msgstr ""
+msgstr "Ви можете знайти деталі доступних запасів у звіті про товарну оцінку."
 
 #: ../../inventory/routes/strategies/removal.rst:65
 msgid "Create one sales order ``25`` unit of ``iPod 32 GB`` and confirm it."
 msgstr ""
+"Створіть одне замовлення на продаж ``25`` одиниць ``iPod 32 Гб`` і "
+"підтвердіть його."
 
 #: ../../inventory/routes/strategies/removal.rst:67
 msgid ""
 "You can see in the outgoing shipment product that the ``Ipod 32 Gb`` are "
 "assigned with the **oldest** lots, using the FIFO removal strategy."
 msgstr ""
+"Ви можете бачити у вихідному товарі відвантаження, що ``Ipod 32 Гб`` "
+"призначено з **найстарішої** партії, використовуючи стратегію вилучення "
+"FIFO."
 
 #: ../../inventory/routes/strategies/removal.rst:75
 msgid "LIFO (Last In First Out)"
-msgstr ""
+msgstr "LIFO (Last In First Out)"
 
 #: ../../inventory/routes/strategies/removal.rst:77
 msgid ""
@@ -6826,38 +7293,50 @@ msgid ""
 "moves out the first. LIFO is used in case of products which do not have a "
 "shelf life."
 msgstr ""
+"У цьому управлінні складом, товари, які вносяться в останню чергу, рухаються"
+" першими. LIFO використовується у випадку товарів, які не мають терміну "
+"зберігання."
 
 #: ../../inventory/routes/strategies/removal.rst:81
 msgid ""
 "Go to :menuselection:`Inventory --> Configuration --> Locations`, open the "
 "stock location and set **LIFO** removal strategy."
 msgstr ""
+"Перейдіть до :menuselection:`Складу --> Налаштування --> Місцезнаходження`, "
+"відкрийте місцезнаходження складу та встановіть стратегію вилучення "
+"**LIFO**."
 
 #: ../../inventory/routes/strategies/removal.rst:84
 msgid ""
 "In our example, let's check the current available stock of ``Ipod 32 Gb`` on"
 " ``WH/Stock`` location."
 msgstr ""
+"У нашому прикладі, давайте перевіримо поточний доступний запас ``Ipod 32 "
+"Гб`` на місцезнаходженні ``WH/Stock``."
 
 #: ../../inventory/routes/strategies/removal.rst:90
 msgid "Create a sale order with ``10`` units of ``Ipod 32 Gb``."
-msgstr ""
+msgstr "Створіть замовлення на продаж з ``10`` одиниць ``Ipod 32 Гб``."
 
 #: ../../inventory/routes/strategies/removal.rst:92
 msgid ""
 "You can see in the outgoing shipment product that the ``Ipod 32 Gb`` are "
 "assigned with the **newest** lots, using the LIFO removal strategy."
 msgstr ""
+"У вихідному товарі відвантаження ви можете побачити, що ``Ipod 32 Гб`` "
+"призначено **новим** партіям, використовуючи стратегію вилучення LIFO."
 
 #: ../../inventory/routes/strategies/removal.rst:100
 msgid "FEFO ( First Expiry First Out )"
-msgstr ""
+msgstr "FEFO ( First Expiry First Out )"
 
 #: ../../inventory/routes/strategies/removal.rst:102
 msgid ""
 "In FEFO warehouse management, the products are dispatched from the warehouse"
 " according to their expiration date."
 msgstr ""
+"В управлінні складом FEFO товари відправляються зі складу відповідно до їх "
+"терміну придатності."
 
 #: ../../inventory/routes/strategies/removal.rst:105
 msgid ""
@@ -6865,6 +7344,9 @@ msgid ""
 "option **Define Expiration date on serial numbers**. Then click on **Apply**"
 " to save changes."
 msgstr ""
+"Перейдіть до :menuselection:`Cкладу --> Налаштування --> Налаштування`. "
+"Перевірте опцію **Визначити дату закінчення на серійних номерах**. Потім "
+"натисніть **Застосувати**, щоби зберегти зміни."
 
 #: ../../inventory/routes/strategies/removal.rst:112
 msgid ""
@@ -6873,18 +7355,26 @@ msgid ""
 "**removal date**. These dates can be set from :menuselection:`Inventory "
 "Control --> Serial Numbers/Lots`."
 msgstr ""
+"Це дозволить вам встановити чотири терміни закінчення для кожної партії чи "
+"серійного номера: **найкраще до дати закінчення**, **дати закінчення "
+"терміну**, **дати попередження** та **дати вилучення**. Ці дати можуть бути "
+"встановлені з :menuselection:`Контроль складу --> Серійні номери/Партії`."
 
 #: ../../inventory/routes/strategies/removal.rst:119
 msgid ""
 "**Best Before Date**: This is the date on which the goods with this "
 "serial/lot number start deteriorating, without being dangerous yet."
 msgstr ""
+"**Найкраще до дати закінчення**: це дата, коли товари з цим серійним "
+"номером/партією починають псуватися, але ще не є небезпечним."
 
 #: ../../inventory/routes/strategies/removal.rst:122
 msgid ""
 "**End of Life Date:** This is the date on which the goods with this "
 "serial/lot number may become dangerous and must not be consumed."
 msgstr ""
+"**Дата закінчення терміну придатності**: це дата, коли товари з цим серійним"
+" номером/партією можуть стати небезпечними і не повинні споживатися."
 
 #: ../../inventory/routes/strategies/removal.rst:125
 msgid ""
@@ -6892,12 +7382,17 @@ msgid ""
 "number should be removed from the stock. Using the FEFO removal strategym "
 "goods are picked for delivery orders using this date."
 msgstr ""
+"**Дата вилучення**: це дата, коли товари з цим серійним номером/партією "
+"повинні бути вилучені зі складу. Використовуючи товари стратегії вилучення "
+"FEFO, вибираються замовлення на доставку за цією датою."
 
 #: ../../inventory/routes/strategies/removal.rst:129
 msgid ""
 "**Alert Date:** This is the date on which an alert should be sent about the "
 "goods with this serial/lot number."
 msgstr ""
+"**Дата сповіщення**: це дата, коли слід надсилати сповіщення про товари з "
+"цим серійним номером/партією."
 
 #: ../../inventory/routes/strategies/removal.rst:132
 msgid ""
@@ -6905,6 +7400,9 @@ msgid ""
 "latest. Lots without a removal date defined will be picked after lots with "
 "removal dates."
 msgstr ""
+"Партії будуть комплектуватися на основі **дати їх вилучення**, починаючи з "
+"самого початку. Партії без дати вилучення, будуть скомплектовані після "
+"партій з датами вилучення."
 
 #: ../../inventory/routes/strategies/removal.rst:136
 msgid ""
@@ -6913,6 +7411,11 @@ msgid ""
 "may still be picked for delivery orders, and no alerts will be sent when "
 "lots pass their **alert date**."
 msgstr ""
+"Усі дати, крім **дати вилучення**, призначені лише для інформаційних цілей "
+"та звітності. Партії, в яких минули будь-які або всі вказані терміни дії, "
+"можуть все ще бути скомплектовані для замовлень на доставку, і жодні "
+"сповіщення не надсилатимуться, коли партії передаватимуть **дату "
+"сповіщення**."
 
 #: ../../inventory/routes/strategies/removal.rst:140
 msgid ""
@@ -6927,34 +7430,48 @@ msgid ""
 "zero, then the expiration date of a lot/serial must be defined manually "
 "after the lot has been created."
 msgstr ""
+"Дати закінчення терміну дії партій також можуть бути встановлені "
+"автоматично, коли товари надходять на склад. Після введення дат закінчення "
+"терміну дії серійних номерів на вкладці складської форми товару стануть "
+"доступні чотири нових поля: **термін дії товару**, **час використання "
+"товару**, **час вилучення товару** та **час сповіщення товару**. Коли ціле "
+"число вводиться в одне з цих полів, дата закінчення партії/серійного номеру "
+"відповідного товару буде встановлена ​​на дату створення партії/серійного "
+"номеру плюс кількість днів, вказаних у полі збільшення часу. Якщо поле "
+"збільшення часу встановлено на нуль, то дата закінчення партії/серійного "
+"номеру повинна бути визначена вручну після створення партії."
 
 #: ../../inventory/routes/strategies/removal.rst:149
 msgid ""
 "Each of these time increment fields is used to generate one of the lot "
 "expiration date fields as follows:"
 msgstr ""
+"Кожне з цих полів збільшення часу використовується для створення одного з "
+"полів закінчення терміну дії партій наступним чином:"
 
 #: ../../inventory/routes/strategies/removal.rst:151
 msgid "Product Use Time --> Best Before Date"
-msgstr ""
+msgstr "Час використання товару --> найкраще до дати"
 
 #: ../../inventory/routes/strategies/removal.rst:153
 msgid "Product Removal Time --> Removal Date"
-msgstr ""
+msgstr "Час вилучення товару --> Дата вилучення"
 
 #: ../../inventory/routes/strategies/removal.rst:155
 msgid "Product Life Time --> End of Life Date"
-msgstr ""
+msgstr "Час дії товару --> Дата закінчення терміну придатності"
 
 #: ../../inventory/routes/strategies/removal.rst:157
 msgid "Product Alert Time --> Alert Date"
-msgstr ""
+msgstr "Час сповіщення про товар --> Дата сповіщення"
 
 #: ../../inventory/routes/strategies/removal.rst:159
 msgid ""
 "To set the removal strategy on location, go to :menuselection:`Configuration"
 " --> Locations` and choose FEFO."
 msgstr ""
+"Щоби встановити стратегію вилучення за місцем знаходження, перейдіть до "
+"розділу :menuselection:`Налаштування --> Місцезнаходження` та оберіть FEFO."
 
 #: ../../inventory/routes/strategies/removal.rst:165
 msgid ""
@@ -6962,18 +7479,20 @@ msgid ""
 "``WH/Stock`` location: ``LOT0001``, ``LOT0002``, ``LOT0003`` with different "
 "expiration date."
 msgstr ""
+"Приведемо приклад: на складі ``WH/Stock`` доступні ``3`` партії "
+"``морозива``: ``LOT0001``, ``LOT0002``, ``LOT0003`` з різним терміном дії."
 
 #: ../../inventory/routes/strategies/removal.rst:170
 msgid "**Lot / Serial No**"
-msgstr ""
+msgstr "**Партія / Серійний номер**"
 
 #: ../../inventory/routes/strategies/removal.rst:170
 msgid "**Product**"
-msgstr ""
+msgstr "**Товар**"
 
 #: ../../inventory/routes/strategies/removal.rst:170
 msgid "**Expiration Date**"
-msgstr ""
+msgstr "**Термін придатності**"
 
 #: ../../inventory/routes/strategies/removal.rst:172
 msgid "LOT0001"
@@ -6983,7 +7502,7 @@ msgstr "LOT0001"
 #: ../../inventory/routes/strategies/removal.rst:174
 #: ../../inventory/routes/strategies/removal.rst:176
 msgid "Ice Cream"
-msgstr ""
+msgstr "Морозиво"
 
 #: ../../inventory/routes/strategies/removal.rst:172
 msgid "08/20/2015"
@@ -7009,34 +7528,40 @@ msgstr "08/15/2015"
 msgid ""
 "We will create a sale order with ``15kg`` of ``ice cream`` and confirm it."
 msgstr ""
+"Ми створимо замовлення на продаж з ``15 кг`` ``морозива`` та підтвердимо "
+"його."
 
 #: ../../inventory/routes/strategies/removal.rst:181
 msgid ""
 "The outgoing shipment related to sale order will make the move based on "
 "removal strategy **FEFO**."
 msgstr ""
+"Вихідне відвантаження, пов'язане із замовленням на продаж, зробить перехід "
+"на основі стратегії вилучення **FEFO**."
 
 #: ../../inventory/routes/strategies/removal.rst:184
 msgid ""
 "It will take ``10kg`` from ``LOT0002`` and ``5kg`` from ``LOT0003`` based on"
 " the removal dates."
 msgstr ""
+"З ``LOT0002`` буде потрібно ``10 кг``, а ``LOT0003`` - ``5 кг`` на основі "
+"дат вилучення."
 
 #: ../../inventory/routes/strategies/removal.rst:192
 msgid ":doc:`../../management/reporting/valuation_methods_continental`"
-msgstr ""
+msgstr ":doc:`../../management/reporting/valuation_methods_continental`"
 
 #: ../../inventory/routes/strategies/removal.rst:193
 msgid ":doc:`../../management/reporting/valuation_methods_anglo_saxon`"
-msgstr ""
+msgstr ":doc:`../../management/reporting/valuation_methods_anglo_saxon`"
 
 #: ../../inventory/settings.rst:3
 msgid "Settings"
-msgstr ""
+msgstr "Налаштування"
 
 #: ../../inventory/settings/products.rst:3
 msgid "Products"
-msgstr ""
+msgstr "Товари"
 
 #: ../../inventory/settings/products/strategies.rst:3
 msgid "How to select the right replenishment strategy"
@@ -7442,15 +7967,11 @@ msgstr ""
 
 #: ../../inventory/settings/products/usage.rst:70
 msgid ":doc:`../../overview/start/setup`"
-msgstr ""
+msgstr ":doc:`../../overview/start/setup`"
 
 #: ../../inventory/settings/products/usage.rst:71
 msgid ":doc:`uom`"
-msgstr ""
-
-#: ../../inventory/settings/products/usage.rst:72
-msgid ":doc:`packages`"
-msgstr ""
+msgstr ":doc:`uom`"
 
 #: ../../inventory/settings/products/variants.rst:3
 msgid "Using product variants"
@@ -7940,12 +8461,12 @@ msgstr ""
 #: ../../inventory/settings/warehouses/difference_warehouse_location.rst:37
 #: ../../inventory/settings/warehouses/location_creation.rst:44
 msgid ":doc:`warehouse_creation`"
-msgstr ""
+msgstr ":doc:`warehouse_creation`"
 
 #: ../../inventory/settings/warehouses/difference_warehouse_location.rst:38
 #: ../../inventory/settings/warehouses/warehouse_creation.rst:48
 msgid ":doc:`location_creation`"
-msgstr ""
+msgstr ":doc:`location_creation`"
 
 #: ../../inventory/settings/warehouses/location_creation.rst:3
 msgid "How to create a new location?"
@@ -8016,7 +8537,7 @@ msgstr ""
 #: ../../inventory/settings/warehouses/location_creation.rst:43
 #: ../../inventory/settings/warehouses/warehouse_creation.rst:47
 msgid ":doc:`difference_warehouse_location`"
-msgstr ""
+msgstr ":doc:`difference_warehouse_location`"
 
 #: ../../inventory/settings/warehouses/warehouse_creation.rst:3
 msgid "How to create a new warehouse?"
@@ -8091,37 +8612,43 @@ msgstr ""
 
 #: ../../inventory/shipping/operation.rst:3
 msgid "Shipping Operations"
-msgstr ""
+msgstr "Операції доставки"
 
 #: ../../inventory/shipping/operation/cancel.rst:3
 msgid "How to cancel a shipping request to a shipper?"
-msgstr ""
+msgstr "Як скасувати запит на доставку перевізнику?"
 
 #: ../../inventory/shipping/operation/cancel.rst:8
 msgid ""
 "Odoo can handle various delivery methods, including third party shippers. "
 "Odoo will be linked with the transportation company tracking system."
 msgstr ""
+"Odoo може обробляти різні способи доставки, включаючи сторонніх превізників."
+" Odoo буде пов'язана із системою відстеження транспортної компанії."
 
 #: ../../inventory/shipping/operation/cancel.rst:12
 msgid ""
 "It will allow you to manage the transport company, the real prices and the "
 "destination."
 msgstr ""
+"Це дозволить вам керувати транспортною компанією, реальними цінами та "
+"призначенням."
 
 #: ../../inventory/shipping/operation/cancel.rst:15
 msgid "You can easily cancel the request made to the carrier system."
-msgstr ""
+msgstr "Ви можете легко скасувати запит, надісланий до системи перевізника."
 
 #: ../../inventory/shipping/operation/cancel.rst:18
 msgid "How to cancel a shipping request?"
-msgstr ""
+msgstr "Як скасувати запит на доставку?"
 
 #: ../../inventory/shipping/operation/cancel.rst:20
 msgid ""
 "If the delivery order is not **Validated**, then the request hasn't been "
 "made. You can choose to cancel the delivery or to change the carrier."
 msgstr ""
+"Якщо замовлення на доставку не **Підтверджено**, запит не було зроблено. Ви "
+"можете скасувати доставку або змінити перевізника."
 
 #: ../../inventory/shipping/operation/cancel.rst:24
 msgid ""
@@ -8130,18 +8657,22 @@ msgid ""
 " the request. Simply click on the **Cancel** button next to the **Carrier "
 "Tracking Ref**:"
 msgstr ""
+"Якщо ви натиснули кнопку **Підтвердити**, запит було зроблено, і вам "
+"потрібно було отримати номер відстеження та мітку. Ви все ще можете "
+"скасувати запит. Просто натисніть кнопку **Скасувати** поруч із кнопкою "
+"**Відстеження перевізника**:"
 
 #: ../../inventory/shipping/operation/cancel.rst:32
 msgid "You will now see that the shipment has been cancelled."
-msgstr ""
+msgstr "Тепер ви побачите, що доставка була скасована."
 
 #: ../../inventory/shipping/operation/cancel.rst:37
 msgid "You can now change the carrier if you wish."
-msgstr ""
+msgstr "Тепер ви можете змінити перевізника, якщо хочете."
 
 #: ../../inventory/shipping/operation/cancel.rst:40
 msgid "How to send a shipping request after cancelling one?"
-msgstr ""
+msgstr "Як відправити запит на доставку після скасування його?"
 
 #: ../../inventory/shipping/operation/cancel.rst:42
 msgid ""
@@ -8149,33 +8680,36 @@ msgid ""
 "to use. Confirm it by clicking on the **Send to shipper** button. You will "
 "get a new tracking number and a new label."
 msgstr ""
+"Після скасування запиту на доставку ви можете змінити перевізника, якого "
+"хочете використовувати. Підтвердіть це, натиснувши кнопку **Надіслати "
+"відправнику**. Ви отримаєте новий номер відстеження та нову мітку."
 
 #: ../../inventory/shipping/operation/cancel.rst:50
 #: ../../inventory/shipping/operation/labels.rst:115
 #: ../../inventory/shipping/operation/multipack.rst:83
 msgid ":doc:`invoicing`"
-msgstr ""
+msgstr ":doc:`invoicing`"
 
 #: ../../inventory/shipping/operation/cancel.rst:51
 #: ../../inventory/shipping/operation/labels.rst:116
 msgid ":doc:`multipack`"
-msgstr ""
+msgstr ":doc:`multipack`"
 
 #: ../../inventory/shipping/operation/invoicing.rst:3
 msgid "How to invoice the shipping cost to the customer?"
-msgstr ""
+msgstr "Як зарахувати вартість доставки клієнту?"
 
 #: ../../inventory/shipping/operation/invoicing.rst:8
 msgid "There are two ways to invoice the shipping costs:"
-msgstr ""
+msgstr "Існує два способи виставлення рахунку за доставку:"
 
 #: ../../inventory/shipping/operation/invoicing.rst:10
 msgid "Agree with the customer over a cost and seal it down in the sale order"
-msgstr ""
+msgstr "Погодьте з клієнтом витрати та закріпіть їх в замовленні на продаж."
 
 #: ../../inventory/shipping/operation/invoicing.rst:13
 msgid "Invoice the real cost of the shipping."
-msgstr ""
+msgstr "Виставлення рахунку за фактичну вартість доставки"
 
 #: ../../inventory/shipping/operation/invoicing.rst:18
 msgid ""
@@ -8183,26 +8717,33 @@ msgid ""
 "app, click on :menuselection:`Configuration --> Delivery --> Delivery "
 "Methods`."
 msgstr ""
+"Щоб налаштувати ціну ваших методів доставки, перейдіть до додатку **Склад**,"
+" натисніть на :menuselection:`Налаштування --> Доставка --> Методи "
+"доставки`."
 
 #: ../../inventory/shipping/operation/invoicing.rst:21
 msgid ""
 "You can manually set a price for the shipping: It can be fixed or based on "
 "rules."
 msgstr ""
+"Ви можете вручну встановити ціну на доставку: вона може бути виправлена або "
+"заснована на правилах."
 
 #: ../../inventory/shipping/operation/invoicing.rst:24
 msgid ""
 "Or you can use the transportation company computation system. Read the "
 "document :doc:`../setup/third_party_shipper`"
 msgstr ""
+"Або ви можете використовувати систему обчислення транспортування компанії. "
+"Прочитайте документацію :doc:`../setup/third_party_shipper`"
 
 #: ../../inventory/shipping/operation/invoicing.rst:28
 msgid "How to invoice the shipping costs to the customer?"
-msgstr ""
+msgstr "Як нарахувати витрати за доставку клієнту?"
 
 #: ../../inventory/shipping/operation/invoicing.rst:31
 msgid "Invoice the price set on the sale order"
-msgstr ""
+msgstr "Встановлення ціни рахунку-фактури на замовлення на продаж"
 
 #: ../../inventory/shipping/operation/invoicing.rst:33
 #: ../../inventory/shipping/operation/invoicing.rst:55
@@ -8210,6 +8751,8 @@ msgid ""
 "On your sale order, choose the carrier that will be used. Click on "
 "**Delivery Method** to choose the right one."
 msgstr ""
+"У своєму замовленні на продаж виберіть постачальника, який буде "
+"використовуватися. Натисніть на **Метод доставки**, щоб вибрати правильний."
 
 #: ../../inventory/shipping/operation/invoicing.rst:39
 #: ../../inventory/shipping/operation/multipack.rst:36
@@ -8217,6 +8760,8 @@ msgid ""
 "The price is computed when you **save** the sale order or when you click on "
 "**Set price**."
 msgstr ""
+"Ціна обчислюється, коли ви **зберігаєте** замовлення на продаж чи натискаєте"
+" **Встановити ціну**."
 
 #: ../../inventory/shipping/operation/invoicing.rst:42
 msgid ""
@@ -8224,55 +8769,68 @@ msgid ""
 "**Set price**, it will add a line with the name of the delivery method as a "
 "product. It may vary from the real price."
 msgstr ""
+"Щоб зарахувати вартість доставки у замовленні на продаж, натисніть "
+"**Встановити ціну**, це додасть рядок з назвою методу доставки як товар. Він"
+" може відрізнятися від реальної ціни."
 
 #: ../../inventory/shipping/operation/invoicing.rst:46
 msgid ""
 "When you create the invoice, it will take the price set on the sale order."
 msgstr ""
+"Під час створення рахунку-фактури ціна встановлюється в замовленні на "
+"продаж."
 
 #: ../../inventory/shipping/operation/invoicing.rst:53
 msgid "Invoice the real shipping costs"
-msgstr ""
+msgstr "Виставлення рахунку з реальними витрати на доставку"
 
 #: ../../inventory/shipping/operation/invoicing.rst:61
 msgid ""
 "The price is computed when you **save** the sale order. Confirm the sale "
 "order and proceed to deliver the product."
 msgstr ""
+"Ціна обчислюється, коли ви **зберігаєте** замовлення на продаж. Підтвердіть "
+"замовлення на продаж і продовжуйте доставляти товар. "
 
 #: ../../inventory/shipping/operation/invoicing.rst:64
 msgid ""
 "The real shipping cost are computed when the delivery order is validated."
 msgstr ""
+"Реальна вартість доставки обчислюється, коли замовлення доставки "
+"перевіряється."
 
 #: ../../inventory/shipping/operation/invoicing.rst:70
 msgid ""
 "Go back to the sale order, the real cost is now added to the sale order."
 msgstr ""
+"Поверніться до замовлення на продаж, тепер реальні витрати додаються до "
+"замовлення на продаж."
 
 #: ../../inventory/shipping/operation/invoicing.rst:76
 msgid ""
 "When you create the invoice, it will take the price computed by the carrier."
-msgstr ""
+msgstr "Під час створення рахунку-фактури ціна обчислюється перевізником."
 
 #: ../../inventory/shipping/operation/invoicing.rst:83
 msgid ""
 "If you split the delivery and make several ones, each delivery order will "
 "add a line to the sale order."
 msgstr ""
+"Якщо ви розділили доставку та зробили декілька, кожне замовлення на доставку"
+" додасть рядок до замовлення на продаж."
 
 #: ../../inventory/shipping/operation/invoicing.rst:87
 msgid ":doc:`../setup/third_party_shipper`"
-msgstr ""
+msgstr ":doc:`../setup/third_party_shipper`"
 
 #: ../../inventory/shipping/operation/invoicing.rst:88
 #: ../../inventory/shipping/operation/multipack.rst:84
 msgid ":doc:`labels`"
-msgstr ""
+msgstr ":doc:`labels`"
 
 #: ../../inventory/shipping/operation/labels.rst:3
 msgid "How to print shipping labels?"
-msgstr ""
+msgstr "Як роздрукувати накладну?"
 
 #: ../../inventory/shipping/operation/labels.rst:8
 msgid ""
@@ -8281,6 +8839,10 @@ msgid ""
 "manage the transport company, the real prices and the destination. And "
 "finally, you will be able to print the shipping labels directly from Odoo."
 msgstr ""
+"Odoo може обробляти різні способи доставки, включаючи сторонніх "
+"постачальників, пов'язаних із системою відстеження транспортної компанії. Це"
+" дозволяє вам керувати транспортною компанією, реальними цінами та "
+"призначенням. І, нарешті, ви зможете надрукувати накладні прямо з Odoo."
 
 #: ../../inventory/shipping/operation/labels.rst:18
 #: ../../inventory/shipping/setup/third_party_shipper.rst:17
@@ -8293,6 +8855,9 @@ msgid ""
 "Settings`. Under **Shipping Connectors**, flag the transportation companies "
 "you want to integrate :"
 msgstr ""
+"У модулі Склад натисніть :menuselection:`Налаштування --> Налаштування`. У "
+"розділі **Інтеграція з перевізником** позначте транспортні компанії, які ви "
+"хочете інтегрувати:"
 
 #: ../../inventory/shipping/operation/labels.rst:30
 #: ../../inventory/shipping/setup/delivery_method.rst:34
@@ -8314,17 +8879,19 @@ msgstr ""
 msgid ""
 "The delivery methods for the chosen shippers have been automatically "
 "created."
-msgstr ""
+msgstr "Методи доставки вибраних перевізників були автоматично створені."
 
 #: ../../inventory/shipping/operation/labels.rst:41
 msgid ""
 "In the **Pricing** tab, the name of the provider means that the delivery "
 "will be handled and computed by the shipper system."
 msgstr ""
+"На вкладці **Ціни** назва постачальника означає, що доставка буде "
+"оброблятися та обчислюватися системою відправника."
 
 #: ../../inventory/shipping/operation/labels.rst:44
 msgid "The configuration of the shipper is split into two columns :"
-msgstr ""
+msgstr "Налаштування відправника розділені на дві колонки:"
 
 #: ../../inventory/shipping/operation/labels.rst:46
 msgid ""
@@ -8394,22 +8961,29 @@ msgid ""
 "Go the **Sales** module, click on :menuselection:`Sales --> Products`. Open "
 "the products you want to ship and set a weight on it."
 msgstr ""
+"Зайдіть до модуля **Продажі**, натисніть на  :menuselection:`Продажі --> "
+"Товари`. Відкрийте товари, які ви хочете відправити, і встановіть вагу на "
+"ньому."
 
 #: ../../inventory/shipping/operation/labels.rst:80
 msgid ""
 "The weight on the product form is expressed in kilograms. Don't forget to do"
 " the conversion if you are used to the imperial measurement system."
 msgstr ""
+"Вага на формі товару виражається у кілограмах. Не забувайте робити "
+"перетворення, якщо ви звикли до імперичної вимірювальної системи."
 
 #: ../../inventory/shipping/operation/labels.rst:85
 msgid "How to print shipping labels ?"
-msgstr ""
+msgstr "Як надрукувати накладні?"
 
 #: ../../inventory/shipping/operation/labels.rst:87
 msgid ""
 "The delivery order created from the sale order will take the shipping "
 "information from it, but you can change the carrier if you want to."
 msgstr ""
+"Замовлення на доставку, створене із замовлення на продаж, прийме інформацію "
+"про доставку, але ви можете змінити перевізника, якщо хочете."
 
 #: ../../inventory/shipping/operation/labels.rst:90
 #: ../../inventory/shipping/setup/third_party_shipper.rst:135
@@ -8424,6 +8998,8 @@ msgstr ""
 msgid ""
 "Click on **Validate** to receive the tracking number and **the label(s)**."
 msgstr ""
+"Натисніть **Підтвердити**, щоб отримати номер відстеження та "
+"**накладну(і)**."
 
 #: ../../inventory/shipping/operation/labels.rst:98
 #: ../../inventory/shipping/setup/third_party_shipper.rst:151
@@ -8433,17 +9009,20 @@ msgstr "Наклейка на упаковці доступна в історі
 
 #: ../../inventory/shipping/operation/labels.rst:104
 msgid "Click on it to open the document and print it :"
-msgstr ""
+msgstr "Натисніть на неї, щоб відкрити документ і роздрукувати його:"
 
 #: ../../inventory/shipping/operation/labels.rst:110
 msgid ""
 "If you are doing multi-packages shippings, most of the time, there will be "
 "one label per package. Each label will appear in the delivery history."
 msgstr ""
+"Якщо ви здійснюєте переміщення кількох пакунків, у більшості випадків на "
+"кожному пакунку буде одна мітка. Кожна мітка відображатиметься в історії "
+"доставки."
 
 #: ../../inventory/shipping/operation/multipack.rst:3
 msgid "How to manage multiple packs for the same delivery order?"
-msgstr ""
+msgstr "Як керувати кількома пакунками для одного замовлення на доставку?"
 
 #: ../../inventory/shipping/operation/multipack.rst:8
 msgid ""
@@ -8451,6 +9030,9 @@ msgid ""
 "But you can easily ship your deliveries with more than one package. It is "
 "fully integrated with the third-party shippers."
 msgstr ""
+"За замовчуванням Odoo вважає, що ваша доставка складається з одного пакунку."
+" Але ви можете легко доставити свої поставки більше ніж на один пакунок. Він"
+" повністю інтегрований зі сторонніми постачальниками."
 
 #: ../../inventory/shipping/operation/multipack.rst:15
 msgid ""
@@ -8458,10 +9040,14 @@ msgid ""
 "--> Configuration --> Settings`. Locate the **Packages** section and tick "
 "**Record packages used on packing: pallets, boxes,...**"
 msgstr ""
+"Щоб налаштувати використання пакунків, перейдіть до меню  "
+":menuselection:`Склад --> Налаштування --> Налаштування`. Знайдіть розділ "
+"**Упаковка** і позначте **Записати пакунки, які використовуються на "
+"упаковці: піддони, коробки,...**"
 
 #: ../../inventory/shipping/operation/multipack.rst:23
 msgid "Click on **Apply** when you are done."
-msgstr ""
+msgstr "Натисніть **Застосувати**, коли ви закінчите."
 
 #: ../../inventory/shipping/operation/multipack.rst:29
 #: ../../inventory/shipping/setup/delivery_method.rst:77
@@ -8471,43 +9057,46 @@ msgstr "Замовлення на продаж"
 
 #: ../../inventory/shipping/operation/multipack.rst:34
 msgid "Click on a **Delivery Method** to choose the right one."
-msgstr ""
+msgstr "Натисніть на **Метод доставки**, щоб вибрати правильний."
 
 #: ../../inventory/shipping/operation/multipack.rst:40
 msgid "Multi-packages Delivery"
-msgstr ""
+msgstr "Доставка декількох пакунків"
 
 #: ../../inventory/shipping/operation/multipack.rst:42
 msgid ""
 "The delivery created from the sale order will take the shipping information "
 "from it."
 msgstr ""
+"Доставка, створена за замовленням на продаж, прийме інформацію про доставку."
 
 #: ../../inventory/shipping/operation/multipack.rst:48
 msgid "From here, you can split your delivery into multiple packages."
-msgstr ""
+msgstr "Звідси ви можете розділити вашу доставку на кілька пакунків."
 
 #: ../../inventory/shipping/operation/multipack.rst:50
 msgid ""
 "Choose the quantity you want to put in the first pack in the **Done** "
 "column, then click on the link **Put in Pack**."
 msgstr ""
+"Виберіть кількість, яку ви хочете розмістити в першому пакунку в стовпці "
+"**Готово**, після чого натисніть посилання **Запакувати**."
 
 #: ../../inventory/shipping/operation/multipack.rst:56
 msgid "It will automatically create a pack with the requested quantity."
-msgstr ""
+msgstr "Це автоматично створить пакет із запитуваною кількістю."
 
 #: ../../inventory/shipping/operation/multipack.rst:58
 msgid "Do the same steps for the other pieces you want to pack in."
-msgstr ""
+msgstr "Зробіть ті самі кроки для інших позицій, які ви хочете запакувати."
 
 #: ../../inventory/shipping/operation/multipack.rst:63
 msgid "Click on **Validate** when you are done."
-msgstr ""
+msgstr "Натисніть **Підтвердити**, коли ви закінчите."
 
 #: ../../inventory/shipping/operation/multipack.rst:66
 msgid "Multi-packages with a 3rd party-shipper"
-msgstr ""
+msgstr "Кілька пакунків зі стороннім перевізником"
 
 #: ../../inventory/shipping/operation/multipack.rst:68
 msgid ""
@@ -8515,16 +9104,21 @@ msgid ""
 "The **carrier Tracking ref** field will automatically be filled. Click on "
 "the **Tracking** button to check your delivery on the provider website."
 msgstr ""
+"Після того, як замовлення на доставку буде підтверджено, ви отримаєте номер "
+"відстеження. Поле **відстеження перевізника** автоматично заповнюється. "
+"Натисніть кнопку **Відстеження**, щоби перевірити свою доставку на веб-сайті"
+" постачальника."
 
 #: ../../inventory/shipping/operation/multipack.rst:76
 msgid ""
 "The **labels** to stick on your packages are available in the history "
 "underneath:"
 msgstr ""
+"**Мітки**, яких слід дотримуватися у ваших пакунках, доступні в історії:"
 
 #: ../../inventory/shipping/setup.rst:3
 msgid "Shipping Setup"
-msgstr ""
+msgstr "Налаштування доставки"
 
 #: ../../inventory/shipping/setup/delivery_method.rst:3
 msgid "How to setup a delivery method?"
@@ -8656,72 +9250,82 @@ msgstr ""
 
 #: ../../inventory/shipping/setup/delivery_method.rst:99
 msgid ":doc:`third_party_shipper`"
-msgstr ""
+msgstr ":doc:`third_party_shipper`"
 
 #: ../../inventory/shipping/setup/delivery_method.rst:100
 #: ../../inventory/shipping/setup/third_party_shipper.rst:158
 msgid ":doc:`../operation/invoicing`"
-msgstr ""
+msgstr ":doc:`../operation/invoicing`"
 
 #: ../../inventory/shipping/setup/dhl_credentials.rst:3
 msgid "How to get DHL credentials for integration with Odoo?"
-msgstr ""
+msgstr "Як отримати облікові дані DHL для інтеграції з Odoo?"
 
 #: ../../inventory/shipping/setup/dhl_credentials.rst:5
 msgid "In order to use the Odoo DHL API, you will need:"
-msgstr ""
+msgstr "Щоб користуватися API Odoo DHL, вам буде потрібно:"
 
 #: ../../inventory/shipping/setup/dhl_credentials.rst:7
 msgid "A DHL.com SiteID"
-msgstr ""
+msgstr "DHL.com SiteID"
 
 #: ../../inventory/shipping/setup/dhl_credentials.rst:9
 msgid "A DHL Password"
-msgstr ""
+msgstr "Пароль DHL"
 
 #: ../../inventory/shipping/setup/dhl_credentials.rst:11
 msgid "A DHL Account Number"
-msgstr ""
+msgstr "Обліковий номер DHL"
 
 #: ../../inventory/shipping/setup/dhl_credentials.rst:15
 msgid ""
 "Getting SiteID and password for countries other than United States (UK and "
 "Rest of the world)"
 msgstr ""
+"Отримання SiteID та пароль для інших країн, окрім США (Великобританія та "
+"решта країн світу)."
 
 #: ../../inventory/shipping/setup/dhl_credentials.rst:17
 msgid ""
 "You should contact DHL account manager and request integration for XML "
 "Express API. The presales should provide you live credentials."
 msgstr ""
+"Ви повинні зв'язатися з менеджером облікового запису DHL та попросити "
+"інтеграцію до API XML Express. Попередні номери повинні надати вам дійсні "
+"облікові дані."
 
 #: ../../inventory/shipping/setup/dhl_credentials.rst:20
 msgid "Getting SiteID and Password for  United States"
-msgstr ""
+msgstr "Отримання SiteID та паролю для Сполучених Штатів"
 
 #: ../../inventory/shipping/setup/dhl_credentials.rst:22
 msgid ""
 "You need to write to xmlrequests@dhl.com along with your full Account "
 "details like account number, region, address, etc. to get API Access."
 msgstr ""
+"Щоб отримати API-доступ, потрібно написати на адресу xmlrequests@dhl.com "
+"разом із повними даними облікового запису, як-от номер обліку, регіон, "
+"адресу тощо."
 
 #: ../../inventory/shipping/setup/dhl_credentials.rst:24
 msgid ""
 "In meantime, for testing the solution, you can use the tests credentials as "
 "given in the demo data:"
 msgstr ""
+"Тим часом, для тестування рішення ви можете використовувати тести облікових "
+"даних, як вказано в демонстраційних даних:"
 
 #: ../../inventory/shipping/setup/dhl_credentials.rst:26
 msgid "**SiteID**: CustomerTest"
-msgstr ""
+msgstr "**SiteID**: CustomerTest"
 
 #: ../../inventory/shipping/setup/dhl_credentials.rst:28
 msgid "**Password**: alkd89nBV"
-msgstr ""
+msgstr "**Пароль**: alkd89nBV"
 
 #: ../../inventory/shipping/setup/dhl_credentials.rst:30
 msgid "**DHL Account Number**: 803921577"
-msgstr ""
+msgstr "**Обліковий номер DHL**: 803921577"
 
 #: ../../inventory/shipping/setup/third_party_shipper.rst:3
 msgid "How to integrate a third party shipper?"
@@ -8893,37 +9497,39 @@ msgstr ""
 
 #: ../../inventory/shipping/setup/third_party_shipper.rst:159
 msgid ":doc:`../operation/labels`"
-msgstr ""
+msgstr ":doc:`../operation/labels`"
 
 #: ../../inventory/shipping/setup/ups_credentials.rst:3
 msgid "How to get UPS credentials for integration with Odoo?"
-msgstr ""
+msgstr "Як отримати облікові дані UPS для інтеграції з Odoo?"
 
 #: ../../inventory/shipping/setup/ups_credentials.rst:5
 msgid "In order to use the Odoo UPS API, you will need:"
-msgstr ""
+msgstr "Для того, щоб скористатися API UPS для Odoo, вам знадобиться:"
 
 #: ../../inventory/shipping/setup/ups_credentials.rst:7
 msgid "A UPS.com user ID and password"
-msgstr ""
+msgstr " ID користувача UPS.com та пароль"
 
 #: ../../inventory/shipping/setup/ups_credentials.rst:9
 msgid "A UPS account number"
-msgstr ""
+msgstr "Обліковий номер UPS "
 
 #: ../../inventory/shipping/setup/ups_credentials.rst:11
 msgid "An Access Key"
-msgstr ""
+msgstr "Ключ доступу"
 
 #: ../../inventory/shipping/setup/ups_credentials.rst:13
 msgid ""
 "An Access Key is a 16 character alpha-numeric code that allows access to the"
 " UPS Developer Kit API Development and Production servers."
 msgstr ""
+"Ключ доступу - це 16-значний літеро-цифровий код, що дозволяє отримати "
+"доступ до серверів розробки API розробника UPS."
 
 #: ../../inventory/shipping/setup/ups_credentials.rst:17
 msgid "Create a UPS Account"
-msgstr ""
+msgstr "Створіть облік UPS"
 
 #: ../../inventory/shipping/setup/ups_credentials.rst:19
 msgid ""
@@ -8931,6 +9537,9 @@ msgid ""
 " you are located outside the US, you will need to contact UPS Customer "
 "Service in order to to open an account."
 msgstr ""
+"Зверніть увагу, що лише клієнти, розташовані в США, можуть відкрити "
+"обліковий запис UPS онлайн. Якщо ви знаходитесь за межами США, вам "
+"доведеться звернутися до служби підтримки UPS, щоб відкрити облік."
 
 #: ../../inventory/shipping/setup/ups_credentials.rst:23
 msgid ""
@@ -8938,50 +9547,66 @@ msgid ""
 " website, on the page, `How to Open a UPS Account Online "
 "<https://www.ups.com/content/us/en/resources/sri/openaccountonline.html?srch_pos=2&srch_phr=open+ups+account>`_"
 msgstr ""
+"Ви можете ознайомитися з додатковою інформацією про відкриття обліку UPS на "
+"своєму веб-сайті на сторінці `Як відкрити обліковий запис UPS онлайн "
+"<https://www.ups.com/content/us/en/resources/sri/openaccountonline.html?srch_pos=2&srch_phr=open+ups+account>`_"
 
 #: ../../inventory/shipping/setup/ups_credentials.rst:27
 msgid ""
 "If you don't already have a UPS account, you can create one along with your "
 "online profile by following these steps:"
 msgstr ""
+"Якщо у вас ще немає облікового запису UPS, ви можете створити його разом із "
+"вашим онлайновим профілем, виконавши вказані нижче дії."
 
 #: ../../inventory/shipping/setup/ups_credentials.rst:30
 msgid ""
 "1. Access the UPS.com web site at `www.ups.com <http://www.ups.com/>`__, and"
 " click the **New User** link at the top of the page."
 msgstr ""
+"1. Отримайте доступ до веб-сайту UPS.com на `www.ups.com "
+"<http://www.ups.com/>`__, і натисніть посилання **Новий користувач** зверху "
+"сторінки."
 
 #: ../../inventory/shipping/setup/ups_credentials.rst:34
 msgid ""
 "2. Click the **Register for MyUPS** button, and follow the prompts to "
 "complete the registration process."
 msgstr ""
+"2. Натисніть кнопку **Реєстрація для MyUPS**, і дотримуйтесь підказок, щоб "
+"завершити процес реєстрації."
 
 #: ../../inventory/shipping/setup/ups_credentials.rst:37
 msgid ""
 "If you already have a UPS account, you can add it to your online profile as "
 "follows:"
 msgstr ""
+"Якщо у вас вже є обліковий запис UPS, ви можете додати його до свого онлайн-"
+"профілю таким чином:"
 
 #: ../../inventory/shipping/setup/ups_credentials.rst:39
 msgid ""
 "1. Log in to the UPS.com site (`http://www.ups.com <http://www.ups.com/>`__)"
 " using your UPS.com User ID and Password."
 msgstr ""
+"1. Зайдіть на сайт UPS.com (`http://www.ups.com <http://www.ups.com/>`__) "
+"використовуючи ваш ID UPS.com та пароль."
 
 #: ../../inventory/shipping/setup/ups_credentials.rst:43
 msgid "Click the **My UPS** tab."
-msgstr ""
+msgstr "Натисніть вкладку **Мій UPS**."
 
 #: ../../inventory/shipping/setup/ups_credentials.rst:45
 msgid "Click the **Account Summary** link."
-msgstr ""
+msgstr "Натисніть посилання **Резюме облікового запису**."
 
 #: ../../inventory/shipping/setup/ups_credentials.rst:47
 msgid ""
 "4. Click the **Add an Existing UPS Account** link in the **UPS Account "
 "Details** section of the page."
 msgstr ""
+"4. Натисніть посилання **Додати існуючий обліковий запис UPS ** у розділі "
+"сторінки **Інформація про обліковий запис UPS**."
 
 #: ../../inventory/shipping/setup/ups_credentials.rst:50
 msgid ""
@@ -8989,20 +9614,26 @@ msgid ""
 "**Account Name**, and **Postal Code** fields. The country defaults to United"
 " States.q"
 msgstr ""
+"5. На екрані **Додати новий обліковий запис** введіть **Номер облікового "
+"запису **, **Назву облікового запису**, а також **Поштовий код**. Країна за "
+"замовчуванням стоїть як Сполучені Штати."
 
 #: ../../inventory/shipping/setup/ups_credentials.rst:54
 msgid "Click the **Next** button to continue."
-msgstr ""
+msgstr "Натисніть кнопку **Далі**, щоби продовжити."
 
 #: ../../inventory/shipping/setup/ups_credentials.rst:57
 msgid "Get an Access Key"
-msgstr ""
+msgstr "Отримайте ключ доступу"
 
 #: ../../inventory/shipping/setup/ups_credentials.rst:59
 msgid ""
 "After you have added your UPS account number to your user profile you can "
 "request an Access Key from UPS using the steps below:"
 msgstr ""
+"Після того, як ви додали свій номер облікового запису UPS у свій профіль "
+"користувача, ви можете замовити ключ доступу з UPS, скориставшись наведеними"
+" нижче інструкціями."
 
 #: ../../inventory/shipping/setup/ups_credentials.rst:62
 msgid ""
@@ -9010,22 +9641,25 @@ msgid ""
 "`https://www.ups.com/upsdeveloperkit?loc=en\\_US "
 "<https://www.ups.com/upsdeveloperkit?loc=en_US>`__"
 msgstr ""
+"1. Перейдіть до веб-сторінки **UPS Developer Kit**  "
+"`https://www.ups.com/upsdeveloperkit?loc=en\\_US "
+"<https://www.ups.com/upsdeveloperkit?loc=en_US>`__"
 
 #: ../../inventory/shipping/setup/ups_credentials.rst:65
 msgid "Log into UPS.com with your user ID and password"
-msgstr ""
+msgstr "Увійдіть на UPS.com з вашим ID та паролем"
 
 #: ../../inventory/shipping/setup/ups_credentials.rst:67
 msgid "Click on the link **Request an access key**."
-msgstr ""
+msgstr "Натисніть на посилання **Запит на ключ доступу**."
 
 #: ../../inventory/shipping/setup/ups_credentials.rst:69
 msgid "Verify your contact information"
-msgstr ""
+msgstr "Перевірте свою контактну інформацію"
 
 #: ../../inventory/shipping/setup/ups_credentials.rst:71
 msgid "Click the **Request Access Key** button."
-msgstr ""
+msgstr "Натисніть на кнопку **Запит на ключ доступу**."
 
 #: ../../inventory/shipping/setup/ups_credentials.rst:73
 msgid ""
@@ -9033,3 +9667,6 @@ msgid ""
 "with the Access Key will be sent to the email address of the primary "
 "contact."
 msgstr ""
+"**Ключ доступу** буде надано вам на веб-сторінці, а електронний лист із "
+"ключом доступу буде надіслано на адресу електронної пошти основного "
+"контакту."
diff --git a/locale/uk/LC_MESSAGES/iot.po b/locale/uk/LC_MESSAGES/iot.po
new file mode 100644
index 000000000..048de74a4
--- /dev/null
+++ b/locale/uk/LC_MESSAGES/iot.po
@@ -0,0 +1,388 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2015-TODAY, Odoo S.A.
+# This file is distributed under the same license as the Odoo package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo 11.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018\n"
+"Language-Team: Ukrainian (https://www.transifex.com/odoo/teams/41243/uk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
+"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n"
+
+#: ../../iot.rst:5
+msgid "Internet of Things (IoT)"
+msgstr ""
+
+#: ../../iot/connect.rst:3
+msgid "Connect an IoT Box to your database"
+msgstr ""
+
+#: ../../iot/connect.rst:5
+msgid "Install the Internet of Things (IoT) App on your Odoo Database."
+msgstr ""
+
+#: ../../iot/connect.rst:10
+msgid "Go in the IoT App and click on Connect on the IoT Boxes page."
+msgstr ""
+
+#: ../../iot/connect.rst:15
+msgid "Follow the steps to connect your IoT Box."
+msgstr ""
+
+#: ../../iot/connect.rst:21
+msgid "Ethernet Connection"
+msgstr ""
+
+#: ../../iot/connect.rst:23
+msgid ""
+"Connect to the IoT Box all the devices that have to be connected with cables"
+" (ethernet, usb devices, etc.)."
+msgstr ""
+
+#: ../../iot/connect.rst:26
+msgid "Power on the IoT Box."
+msgstr ""
+
+#: ../../iot/connect.rst:28
+msgid "Then click on the Scan button."
+msgstr ""
+
+#: ../../iot/connect.rst:34
+msgid "WiFi Connection"
+msgstr ""
+
+#: ../../iot/connect.rst:36
+msgid "Power on the IoT Box"
+msgstr ""
+
+#: ../../iot/connect.rst:38
+msgid "Copy the token"
+msgstr ""
+
+#: ../../iot/connect.rst:43
+msgid ""
+"Connect to the IoT Box WiFi Network (make sure there is no ethernet cable "
+"plugged in your computer)."
+msgstr ""
+
+#: ../../iot/connect.rst:49
+msgid ""
+"You will be redirected to the IoT Box Homepage (if it doesn't work, connect "
+"to the IP address of the box). Give a name to your IoT Box (not required) "
+"and paste the token, then click on next."
+msgstr ""
+
+#: ../../iot/connect.rst:57
+msgid ""
+"If you are on Runbot, do not forget to add the -all or -base in the token "
+"(e.g. this token **http://375228-saas-11-5-iot-"
+"f3f920.runbot16.odoo.com\\|4957098401** should become "
+"**http://375228-saas-11-5-iot-f3f920-all.runbot16.odoo.com\\|4957098401**)."
+msgstr ""
+
+#: ../../iot/connect.rst:63
+msgid ""
+"Choose the WiFi network you want to connect with (enter the password if "
+"there is one) and click on Submit. Wait a few seconds before being "
+"redirected to your database."
+msgstr ""
+
+#: ../../iot/connect.rst:70
+msgid "You should now see the IoT Box."
+msgstr ""
+
+#: ../../iot/connect.rst:76
+msgid "IoT Box Schema"
+msgstr ""
+
+#: ../../iot/pos.rst:3
+msgid "Use the IoT Box for the PoS"
+msgstr ""
+
+#: ../../iot/pos.rst:9
+msgid "Prerequisites"
+msgstr "Передумови"
+
+#: ../../iot/pos.rst:11
+msgid "Before starting, make sure you have the following:"
+msgstr ""
+
+#: ../../iot/pos.rst:13
+msgid "An IoT Box"
+msgstr ""
+
+#: ../../iot/pos.rst:15
+msgid "A 2A Power adapter with pi 3 b+ 2.5 A"
+msgstr ""
+
+#: ../../iot/pos.rst:17
+msgid "A computer or tablet with an up-to-date web browser"
+msgstr "Комп'ютер або планшет із сучасним веб-браузером"
+
+#: ../../iot/pos.rst:19
+msgid ""
+"A running SaaS or Odoo instance with the Point of Sale and IoT apps "
+"installed"
+msgstr ""
+
+#: ../../iot/pos.rst:22
+msgid "A local network setup with DHCP (this is the default setting)"
+msgstr ""
+
+#: ../../iot/pos.rst:24
+msgid ""
+"An Epson USB TM-T20 Printer or another ESC/POS compatible printer "
+"(officially supported printers are listed at the `POS Hardware page "
+"<https://www.odoo.com/page/pos-ipad-android-hardware>`__)"
+msgstr ""
+
+#: ../../iot/pos.rst:28
+msgid "A Honeywell Eclipse USB Barcode Scanner or another compatible scanner"
+msgstr "Сканер штрих-коду Honeywell Eclipse USB або інший сумісний сканер"
+
+#: ../../iot/pos.rst:30
+msgid "An Epson compatible cash drawer"
+msgstr "Epson-сумісний ящик для готівки"
+
+#: ../../iot/pos.rst:32
+msgid "An RJ45 Ethernet Cable (optional, WiFi is built in)"
+msgstr ""
+
+#: ../../iot/pos.rst:35
+msgid "Set Up"
+msgstr "Встановіть"
+
+#: ../../iot/pos.rst:37
+msgid ""
+"To connect hardware to the PoS, the first step is to connect an IoT Box to "
+"your database. For this, follow this `documentation "
+"<https://docs.google.com/document/d/1vhWrSSlSdJcRYe4tjPpXKYVMTD47lVK3ysyYc7tJDlA/edit#>`__."
+msgstr ""
+
+#: ../../iot/pos.rst:44
+msgid "Then, you have to connect the peripheral devices to your IoT Box."
+msgstr ""
+
+#: ../../iot/pos.rst:46
+msgid ""
+"Officially supported hardware is listed on `the POS Hardware page "
+"<https://www.odoo.com/page/pos-ipad-android-hardware>`__, but other hardware"
+" might work as well."
+msgstr ""
+
+#: ../../iot/pos.rst:50
+msgid "**Printer**: Connect an ESC/POS printer to a USB port and power it on."
+msgstr ""
+"**Принтер**: підключіть ESC/POS-принтер до USB-порту та увімкніть його."
+
+#: ../../iot/pos.rst:53
+msgid ""
+"**Cash drawer**: The cash drawer should be connected to the printer with an "
+"RJ25 cable."
+msgstr ""
+"**Ящик для готівки**: грошовий ящик повинен бути підключений до принтера за "
+"допомогою кабелю RJ25."
+
+#: ../../iot/pos.rst:56
+msgid ""
+"**Barcode scanner**: Connect your barcode scanner. In order for your barcode"
+" scanner to be compatible it must behave as a keyboard and must be "
+"configured in **US QWERTY**. It also must end barcodes with an Enter "
+"character (keycode 28). This is most likely the default configuration of "
+"your barcode scanner."
+msgstr ""
+"**Сканер штрих-коду**: підключіть сканер штрих-коду. Для того, щоби ваш "
+"сканер штрих-коду був сумісний, він повинен вести себе як клавіатура, і його"
+" потрібно налаштувати в **US QWERTY**. Він також повинен закінчувати штрих-"
+"коди з символом Enter (кодовий ключ 28). Це, швидше за все, є стандартною "
+"конфігурацією вашого сканера штрих-коду."
+
+#: ../../iot/pos.rst:62
+msgid "**Scale**: Connect your scale and power it on."
+msgstr "**Ваги**: підключіть ваги і включіть їх."
+
+#: ../../iot/pos.rst:64
+msgid ""
+"**Ethernet**: If you do not wish to use Wi-Fi, plug in the Ethernet cable. "
+"Make sure this will connect the IoT Box to the same network as your POS "
+"device."
+msgstr ""
+
+#: ../../iot/pos.rst:68
+msgid ""
+"**Wi-Fi**: The current version of the IoT Box has Wi-Fi built in. Make sure "
+"not to plug in an Ethernet cable when booting, because all Wi-Fi "
+"functionality will be bypassed when a wired network connection is available "
+"on boot."
+msgstr ""
+
+#: ../../iot/pos.rst:73
+msgid ""
+"Once it's done, you can connect the IoT Box to your PoS. For this, go in "
+"Point of Sale > Configuration > PoS, tick the box \"IoT Box\" and select the"
+" IoT Box you want to connect with. Save the changes."
+msgstr ""
+
+#: ../../iot/pos.rst:77
+msgid "Set up is done, you can launch a new PoS Session."
+msgstr ""
+
+#: ../../iot/pos.rst:80
+msgid "Troubleshoot"
+msgstr "Усунення несправностей"
+
+#: ../../iot/pos.rst:83
+msgid "The PoS cannot connect to the IoT Box"
+msgstr ""
+
+#: ../../iot/pos.rst:85
+msgid ""
+"The easiest way to make sure the IoT Box is properly set-up is to turn it on"
+" with the printer plugged in as it will print a receipt indicating any error"
+" if encountered or the IoT Box's IP address in case of success. If no "
+"receipt is printed, check the following steps:"
+msgstr ""
+
+#: ../../iot/pos.rst:91
+msgid ""
+"Make sure the IoT Box is powered on, indicated by a brightly lit red status "
+"LED."
+msgstr ""
+
+#: ../../iot/pos.rst:94
+msgid ""
+"Make sure the IoT Box is ready, this is indicated by a brightly lit green "
+"status LED just next to the red power status LED. The IoT Box should be "
+"ready ~2 minutes after it is started."
+msgstr ""
+
+#: ../../iot/pos.rst:98
+msgid ""
+"Make sure the IoT Box is connected to the same network as your POS device. "
+"Both the device and the IoT Box should be visible in the list of connected "
+"devices on your network router."
+msgstr ""
+
+#: ../../iot/pos.rst:102
+msgid ""
+"If you specified the IoT Box's IP address in the configuration, make sure it"
+" corresponds to the ip address printed on the IoT Box's status receipt."
+msgstr ""
+
+#: ../../iot/pos.rst:106
+msgid "Make sure that the POS is not loaded over HTTPS."
+msgstr "Переконайтеся, що POS не завантажено через HTTPS."
+
+#: ../../iot/pos.rst:108
+msgid ""
+"A bug in Firefox's HTTP implementation might prevent the autodiscovery from "
+"working reliably. You could also manually set up the IoT Box's IP address in"
+" the POS configuration."
+msgstr ""
+
+#: ../../iot/pos.rst:113
+msgid "The Barcode Scanner is not working"
+msgstr "Сканер штрих-коду не працює"
+
+#: ../../iot/pos.rst:115
+msgid ""
+"The barcode scanner must be configured in US QWERTY and emit an Enter after "
+"each barcode. This is the default configuration of most barcode readers. "
+"Refer to the barcode reader documentation for more information."
+msgstr ""
+"Сканер штрих-коду повинен бути налаштований в US QWERTY і видати Enter після"
+" кожного штрих-коду. Це налаштовано за замовчуванням більшості сканерів "
+"штрих-кодів. Для отримання додаткової інформації зверніться до документації "
+"для сканування штрих-кодів."
+
+#: ../../iot/pos.rst:120
+msgid ""
+"The IoT Box needs a 2A power supply to work with some barcode scanners. If "
+"you are not using the provided power supply, make sure the one you use has "
+"enough power."
+msgstr ""
+
+#: ../../iot/pos.rst:124
+msgid ""
+"Some barcode scanners will need more than 2A and will not work, or will work"
+" unreliably, even with the provided power supply. In those case you can plug"
+" the barcode scanner in a self-powered USB hub."
+msgstr ""
+"Деякі сканери штрих-кодів потребують більше 2A, і вони не працюватимуть або "
+"працюватимуть неналежним чином, навіть за умови наявності джерела живлення. "
+"У такому випадку ви можете підключити сканер штрих-коду до автономного USB-"
+"концентратора."
+
+#: ../../iot/pos.rst:129
+msgid ""
+"Some poorly built barcode scanners do not advertise themselves as barcode "
+"scanners but as a usb keyboard instead, and will not be recognized by the "
+"IoT Box."
+msgstr ""
+
+#: ../../iot/pos.rst:134
+msgid "The Barcode Scanner is not working reliably"
+msgstr "Сканер штрих-коду не працює надійно"
+
+#: ../../iot/pos.rst:136
+msgid ""
+"Make sure that no more than one device with 'Scan via Proxy'/'Barcode "
+"Scanner' enabled are connected to the IoT Box at the same time."
+msgstr ""
+
+#: ../../iot/pos.rst:140
+msgid "Printing the receipt takes too much time"
+msgstr "Друк квитанції займає надто багато часу"
+
+#: ../../iot/pos.rst:142
+msgid ""
+"A small delay before the first print is expected, as the IoT Box will do "
+"some preprocessing to speed up the next printings. If you suffer delays "
+"afterwards it is most likely due to poor network connection between the POS "
+"and the IoT Box."
+msgstr ""
+
+#: ../../iot/pos.rst:148
+msgid "Some characters are not correctly printed on the receipt"
+msgstr "Деякі символи не надруковані на квитанції"
+
+#: ../../iot/pos.rst:150
+msgid ""
+"The IoT Box does not support all languages and characters. It currently "
+"supports Latin and Cyrillic based scripts, with basic Japanese support."
+msgstr ""
+
+#: ../../iot/pos.rst:155
+msgid "The printer is offline"
+msgstr "Принтер офлайн"
+
+#: ../../iot/pos.rst:157
+msgid ""
+"Make sure the printer is connected, powered, has enough paper and has its "
+"lid closed, and is not reporting an error. If the error persists, please "
+"contact support."
+msgstr ""
+"Переконайтесь, що принтер підключений, живиться, має достатню кількість "
+"паперу, кришка закрита та не повідомляється про помилку. Якщо помилка не "
+"зникає, зверніться до служби підтримки."
+
+#: ../../iot/pos.rst:162
+msgid "The cashdrawer does not open"
+msgstr "Готівковий рахунок не відкривається"
+
+#: ../../iot/pos.rst:164
+msgid ""
+"The cashdrawer should be connected to the printer and should be activated in"
+" the POS configuration."
+msgstr ""
+"Каса повинна бути підключена до принтера і повинна активуватися в "
+"налаштуваннях точки продажу."
diff --git a/locale/uk/LC_MESSAGES/livechat.po b/locale/uk/LC_MESSAGES/livechat.po
index 5d7d099d5..0b10d5e1c 100644
--- a/locale/uk/LC_MESSAGES/livechat.po
+++ b/locale/uk/LC_MESSAGES/livechat.po
@@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-07-23 12:10+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Alina Semeniuk <alinasemeniuk1@gmail.com>, 2018\n"
+"Last-Translator: Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018\n"
 "Language-Team: Ukrainian (https://www.transifex.com/odoo/teams/41243/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,11 +20,11 @@ msgstr ""
 
 #: ../../livechat/livechat.rst:5
 msgid "Live Chat"
-msgstr ""
+msgstr "Онлайн-чат"
 
 #: ../../livechat/livechat.rst:8
 msgid "Chat in live with website visitors"
-msgstr ""
+msgstr "Живе спілкування з відвідувачами веб-сайту"
 
 #: ../../livechat/livechat.rst:10
 msgid ""
@@ -35,6 +35,12 @@ msgid ""
 "will also be able to provide assistance to your customers. Overall, this is "
 "the perfect tool to improve customer satisfaction."
 msgstr ""
+"З Онлайн-чатом Odoo ви можете встановити прямий контакт із відвідувачами "
+"вашого веб-сайту. Просте діалогове вікно з'явиться на екрані та дозволить їм"
+" зв'язатися з одним із ваших торгових представників. Таким чином, ви можете "
+"легко перетворити ліди у нагоди. Ви також зможете надавати допомогу своїм "
+"клієнтам. Загалом, це ідеальний інструмент для покращення задоволеності "
+"клієнтів."
 
 #: ../../livechat/livechat.rst:19
 msgid "Configuration"
@@ -45,16 +51,20 @@ msgid ""
 "To get the Live Chat feature, open the Apps module, search for \"Live Chat\""
 " and then click on install."
 msgstr ""
+"Щоб отримати функцію Онлайн-чату, відкрийте модуль Додатки, знайдіть "
+"\"Онлайн-чат\", а потім натисніть кнопку Встановити."
 
 #: ../../livechat/livechat.rst:27
 msgid ""
 "The Live Chat module provides you a direct access to your channels. There, "
 "operators can easily join and leave the chat."
 msgstr ""
+"Модуль Онлайн-чату надає прямий доступ до ваших каналів. Там оператори "
+"можуть легко приєднатися та виходити з чату."
 
 #: ../../livechat/livechat.rst:34
 msgid "Add the live chat to an Odoo website"
-msgstr ""
+msgstr "Додайте онлайн-чат на веб-сайт Odoo"
 
 #: ../../livechat/livechat.rst:36
 msgid ""
@@ -63,10 +73,14 @@ msgid ""
 " Configuration --> Settings` to select the channel to be linked to the "
 "website."
 msgstr ""
+"Якщо ваш веб-сайт був створений за допомогою Odoo, то автоматично буде "
+"доданий онлайн-чат. Все, що потрібно зробити, це перейти на :menuselection"
+":`Веб-сайт --> Налаштування --> Налаштування`, щоби вибрати канал, який буде"
+" пов'язаний з веб-сайтом."
 
 #: ../../livechat/livechat.rst:45
 msgid "Add the live chat to an external website"
-msgstr ""
+msgstr "Додайте онлайн-чат на зовнішній веб-сайт"
 
 #: ../../livechat/livechat.rst:47
 msgid ""
@@ -75,10 +89,15 @@ msgid ""
 "code available into your website. A specific url you can send to customers "
 "or suppliers for them to access the live chat is also provided."
 msgstr ""
+"Якщо ваш веб-сайт не був створений за допомогою Odoo, перейдіть до модуля "
+"Онлайн-чат, а потім виберіть канал, який потрібно прив'язати. Там ви можете "
+"просто скопіювати доступний код на свій веб-сайт. Також надається конкретна "
+"URL-адреса, яку ви можете надіслати клієнтам або постачальникам для доступу "
+"до чату."
 
 #: ../../livechat/livechat.rst:54
 msgid "Hide / display the live chat according to rules"
-msgstr ""
+msgstr "Сховайте/покажіть онлайн-чат відповідно до правил"
 
 #: ../../livechat/livechat.rst:56
 msgid ""
@@ -88,10 +107,15 @@ msgid ""
 " does not sell in. If you select *Auto popup*, you can also set the length "
 "of time it takes for the chat to appear."
 msgstr ""
+"Правила онлайн-чату можна визначити за формою каналу. Наприклад, ви можете "
+"вибрати показ чату в країнах, в яких ви володієте мовою. Навпаки, ви можете "
+"приховати чат у країнах, де ваша компанія не веде діяльність. Якщо ви "
+"виберете *Автоматичне спливаюче вікно*, ви також можете встановити, скільки "
+"часу потрібно для показу чату."
 
 #: ../../livechat/livechat.rst:66
 msgid "Prepare automatic messages"
-msgstr ""
+msgstr "Підготуйте автоматичні повідомлення"
 
 #: ../../livechat/livechat.rst:68
 msgid ""
@@ -99,10 +123,13 @@ msgid ""
 " to appear automatically on the chat. This will entice visitors to reach you"
 " through the live chat."
 msgstr ""
+"У формі каналу, у розділі *Параметри*, кілька повідомлень можуть бути "
+"набрані, щоби з'являтися автоматично у чаті. Це спонукає відвідувачів "
+"звернутися до вас через онлайн-чат."
 
 #: ../../livechat/livechat.rst:76
 msgid "Start chatting with customers"
-msgstr ""
+msgstr "Почніть спілкуватися з клієнтами"
 
 #: ../../livechat/livechat.rst:78
 msgid ""
@@ -111,12 +138,19 @@ msgid ""
 "the top right corner of the channel form to toggle the *Published* setting. "
 "Then, the live chat can begin once an operator has joined the channel."
 msgstr ""
+"Щоб розпочати спілкування з клієнтами, спершу переконайтеся, що канал "
+"публікується на вашому веб-сайті. Щоби зробити це, виберіть *Неопубліковано "
+"на Веб-сайті* у верхньому правому куті форми каналу, щоби переключити "
+"параметр *Опубліковано*. Потім можна розпочати чат, коли оператор "
+"приєднається до каналу."
 
 #: ../../livechat/livechat.rst:88
 msgid ""
 "If no operator is available and/or if the channel is unpublished on the "
 "website, then the live chat button will not appear to visitors."
 msgstr ""
+"Якщо жоден оператор не доступний або якщо канал не опубліковано на веб-"
+"сайті, кнопка онлайн-чату не відображатиметься відвідувачам."
 
 #: ../../livechat/livechat.rst:92
 msgid ""
@@ -124,16 +158,21 @@ msgid ""
 "Discuss module and will also pop up as a direct message. Therefore, "
 "inquiries can be answered wherever you are in Odoo."
 msgstr ""
+"На практиці розмови, ініційовані відвідувачами, з'являться в модулі "
+"Обговорення і з'являться також як пряме повідомлення. Тому на запити можна "
+"відповісти скрізь, де ви знаходитесь в Odoo."
 
 #: ../../livechat/livechat.rst:96
 msgid ""
 "If there several operators in charge of a channel, the system will dispatch "
 "sessions randomly between them."
 msgstr ""
+"Якщо є кілька операторів, що відповідають за канал, система розподілятиме "
+"сеанс випадково між ними."
 
 #: ../../livechat/livechat.rst:100
 msgid "Use commands"
-msgstr ""
+msgstr "Використовуйте команди"
 
 #: ../../livechat/livechat.rst:102
 msgid ""
@@ -141,30 +180,33 @@ msgid ""
 "information you might need. To use this feature, simply type the commands "
 "into the chat. The following actions are available :"
 msgstr ""
+"Команди є корисними для виконання певних дій або доступу до інформації, яка "
+"вам може знадобитися. Щоби використовувати цю функцію, просто введіть "
+"команди в чат. Доступні наступні дії:"
 
 #: ../../livechat/livechat.rst:106
 msgid "**/help** : show a helper message."
-msgstr ""
+msgstr "**/help** : показати допоміжне повідомлення."
 
 #: ../../livechat/livechat.rst:108
 msgid "**/helpdesk** : create a helpdesk ticket."
-msgstr ""
+msgstr "**/helpdesk** : створити заявку служби підтримки."
 
 #: ../../livechat/livechat.rst:110
 msgid "**/helpdesk\\_search** : search for a helpdesk ticket."
-msgstr ""
+msgstr "**/helpdesk\\_search** : шукати заявку для служби підтримки."
 
 #: ../../livechat/livechat.rst:112
 msgid "**/history** : see 15 last visited pages."
-msgstr ""
+msgstr "**/history** : дивитись 15 останніх відвіданих сторінок."
 
 #: ../../livechat/livechat.rst:114
 msgid "**/lead** : create a new lead."
-msgstr ""
+msgstr "**/lead** : створити новий лід."
 
 #: ../../livechat/livechat.rst:116
 msgid "**/leave** : leave the channel."
-msgstr ""
+msgstr "**/leave** : залишити канал."
 
 #: ../../livechat/livechat.rst:119
 msgid ""
@@ -172,10 +214,13 @@ msgid ""
 "generated from will automatically appear as the description of the ticket. "
 "The same goes for the creation of a lead."
 msgstr ""
+"Якщо з чату створено заявку служби підтримки, тоді розмова, з якої вона була"
+" згенерована, автоматично відображатиметься як опис заявки. Те ж саме "
+"стосується і створення ліда."
 
 #: ../../livechat/livechat.rst:124
 msgid "Send canned responses"
-msgstr ""
+msgstr "Надсилайте фіксовані відповіді"
 
 #: ../../livechat/livechat.rst:126
 msgid ""
@@ -186,9 +231,17 @@ msgid ""
 " to use them during a chat, simply type \":\" followed by the shortcut you "
 "assigned."
 msgstr ""
+"Фіксовані відповіді дозволяють створювати замінники загальних речень, які ви"
+" часто використовуєте. Введіть слово замість кількох, це заощадить вам "
+"багато часу. Щоб додати фіксовані відповіді, перейдіть до :menuselection"
+":`ОНЛАЙН-ЧАТ --> Налаштування --> Фіксовані відповіді` та створіть стільки "
+"відповідей, скільки потрібно. Щоби використовувати їх під час чату, просто "
+"введіть \":\" до ярлика, який ви призначили."
 
 #: ../../livechat/livechat.rst:136
 msgid ""
 "You now have all of the tools needed to chat in live with your website "
 "visitors, enjoy !"
 msgstr ""
+"Тепер у вас є всі інструменти, необхідні для спілкування в онлайн з "
+"відвідувачами вашого сайту. Насолоджуйтеся!"
diff --git a/locale/uk/LC_MESSAGES/manufacturing.po b/locale/uk/LC_MESSAGES/manufacturing.po
index 3a0cb5f62..63caead26 100644
--- a/locale/uk/LC_MESSAGES/manufacturing.po
+++ b/locale/uk/LC_MESSAGES/manufacturing.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2015-TODAY, Odoo S.A.
-# This file is distributed under the same license as the Odoo Business package.
+# This file is distributed under the same license as the Odoo package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 10.0\n"
+"Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-22 15:27+0100\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Alina Semeniuk <alinasemeniuk1@gmail.com>, 2018\n"
+"Last-Translator: Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018\n"
 "Language-Team: Ukrainian (https://www.transifex.com/odoo/teams/41243/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -57,17 +57,12 @@ msgstr "Налаштування базової специфікації"
 #: ../../manufacturing/management/bill_configuration.rst:16
 msgid ""
 "If you choose to manage your manufacturing operations using manufacturing "
-"orders only, you will define basic bills of materials without routings. For "
-"more information about which method of management to use, review the "
-"**Getting Started** section of the *Manufacturing* chapter of the "
-"documentation."
+"orders only, you will define basic bills of materials without routings."
 msgstr ""
 "Якщо ви вирішите керувати своїми виробничими операціями лише за допомогою "
-"виробничих замовлень, ви визначите основні специфікації без маршрутів. Щоб "
-"отримати додаткові відомості про те, який метод управління використовувати, "
-"перегляньте документацію **Початок роботи** розділу **Виробництво**."
+"замовлень на виробництво, ви визначите основні специфікації без маршрутів."
 
-#: ../../manufacturing/management/bill_configuration.rst:22
+#: ../../manufacturing/management/bill_configuration.rst:19
 msgid ""
 "Before creating your first bill of materials, you will need to create a "
 "product and at least one component (components are considered products in "
@@ -89,7 +84,7 @@ msgstr ""
 "допомогою :menuselection:`Основні дані --> Специфікація`, або за допомогою "
 "кнопки у верхній частині форми продукту."
 
-#: ../../manufacturing/management/bill_configuration.rst:32
+#: ../../manufacturing/management/bill_configuration.rst:29
 msgid ""
 "Under the **Miscellaneous** tab, you can fill additional fields. "
 "**Sequence** defines the order in which your BoMs will be selected for "
@@ -101,11 +96,11 @@ msgstr ""
 "причому нижчі номери мають більш високий пріоритет. **Версія** дозволяє вам "
 "відстежувати зміни у вашій специфікації з плином часу."
 
-#: ../../manufacturing/management/bill_configuration.rst:38
+#: ../../manufacturing/management/bill_configuration.rst:35
 msgid "Adding a Routing to a BoM"
 msgstr "Додавання маршрутизації до BoM"
 
-#: ../../manufacturing/management/bill_configuration.rst:40
+#: ../../manufacturing/management/bill_configuration.rst:37
 msgid ""
 "A routing defines a series of operations required to manufacture a product "
 "and the work center at which each operation is performed. A routing may be "
@@ -118,7 +113,7 @@ msgstr ""
 "маршрутизацію. Щоб отримати додаткові відомості про налаштування маршрутів, "
 "перегляньте розділ про маршрути."
 
-#: ../../manufacturing/management/bill_configuration.rst:46
+#: ../../manufacturing/management/bill_configuration.rst:43
 msgid ""
 "After enabling routings from :menuselection:`Configuration --> Settings`, "
 "you will be able to add a routing to a bill of materials by selecting a "
@@ -128,7 +123,7 @@ msgstr ""
 " ви зможете додавати маршрутизацію до специфікації, вибравши маршрут з "
 "випадаючого списку або створивши його на льоту."
 
-#: ../../manufacturing/management/bill_configuration.rst:50
+#: ../../manufacturing/management/bill_configuration.rst:47
 msgid ""
 "You may define the work operation or step in which each component is "
 "consumed using the field, **Consumed in Operation** under the **Components**"
@@ -145,11 +140,11 @@ msgstr ""
 "будуть споживатися/виготовлятися під час остаточної операції в "
 "маршрутизації."
 
-#: ../../manufacturing/management/bill_configuration.rst:61
+#: ../../manufacturing/management/bill_configuration.rst:58
 msgid "Adding Byproducts to a BoM"
 msgstr "Додавання побічних товарів до специфікації"
 
-#: ../../manufacturing/management/bill_configuration.rst:63
+#: ../../manufacturing/management/bill_configuration.rst:60
 msgid ""
 "In Odoo, a byproduct is any product produced by a BoM in addition to the "
 "primary product."
@@ -157,7 +152,7 @@ msgstr ""
 "В Odoo побічним продуктом є будь-який товар, вироблений BoM, на додаток до "
 "основного продукту."
 
-#: ../../manufacturing/management/bill_configuration.rst:66
+#: ../../manufacturing/management/bill_configuration.rst:63
 msgid ""
 "To add byproducts to a BoM, you will first need to enable them from "
 ":menuselection:`Configuration --> Settings`."
@@ -165,7 +160,7 @@ msgstr ""
 "Щоб додати побічні продукти до BoM, вам спочатку потрібно буде ввімкнути їх "
 "у  :menuselection:`Налаштування --> Налаштування`."
 
-#: ../../manufacturing/management/bill_configuration.rst:72
+#: ../../manufacturing/management/bill_configuration.rst:69
 msgid ""
 "Once byproducts are enabled, you can add them to your bills of materials "
 "under the **Byproducts** tab of the bill of materials. You can add any "
@@ -177,11 +172,11 @@ msgstr ""
 "додати будь-який продукт або продукти як побічні продукти. Похідні продукти "
 "виробляються на одному етапі маршрутизації як основний продукт BoM."
 
-#: ../../manufacturing/management/bill_configuration.rst:81
+#: ../../manufacturing/management/bill_configuration.rst:78
 msgid "Setting up a BoM for a Product With Sub-Assemblies"
 msgstr "Налаштування BoM для продукту з напівфабрикату"
 
-#: ../../manufacturing/management/bill_configuration.rst:83
+#: ../../manufacturing/management/bill_configuration.rst:80
 #: ../../manufacturing/management/sub_assemblies.rst:5
 msgid ""
 "A subassembly is a manufactured product which is intended to be used as a "
@@ -197,7 +192,7 @@ msgstr ""
 "декількох специфікаціях. BoM, який використовує підрозділи, часто називають "
 "багаторівневою специфікацією."
 
-#: ../../manufacturing/management/bill_configuration.rst:90
+#: ../../manufacturing/management/bill_configuration.rst:87
 #: ../../manufacturing/management/sub_assemblies.rst:12
 msgid ""
 "Multi-level bills of materials in Odoo are accomplished by creating a top-"
@@ -212,11 +207,11 @@ msgstr ""
 "створюється замовлення на виробництво для продукту найвищого рівня, "
 "створюється також замовлення на виробництво для кожного підрозділу."
 
-#: ../../manufacturing/management/bill_configuration.rst:97
+#: ../../manufacturing/management/bill_configuration.rst:94
 msgid "Configure the Top-Level Product BoM"
 msgstr "Налаштування специфікації продукту найвищого рівня"
 
-#: ../../manufacturing/management/bill_configuration.rst:99
+#: ../../manufacturing/management/bill_configuration.rst:96
 #: ../../manufacturing/management/sub_assemblies.rst:21
 msgid ""
 "To configure a multi-level BoM, create the top-level product and its BoM. "
@@ -227,12 +222,12 @@ msgstr ""
 " та його специфікацію. Включіть будь-які підрозділи в список компонентів. "
 "Створіть BoM для кожного напівфабрикату, як і для будь-якого продукту."
 
-#: ../../manufacturing/management/bill_configuration.rst:107
+#: ../../manufacturing/management/bill_configuration.rst:104
 #: ../../manufacturing/management/sub_assemblies.rst:29
 msgid "Configure the Subassembly Product Data"
 msgstr "Налаштування даних напівфабрикату"
 
-#: ../../manufacturing/management/bill_configuration.rst:109
+#: ../../manufacturing/management/bill_configuration.rst:106
 #: ../../manufacturing/management/sub_assemblies.rst:31
 msgid ""
 "On the product form of the subassembly, you must select the routes "
@@ -244,7 +239,7 @@ msgstr ""
 "та **Виготовлення під замовлення**. Маршрут **Виробництво** має пріоритет "
 "над маршрутом **Купити**, тому вибір останніх не матиме ефекту."
 
-#: ../../manufacturing/management/bill_configuration.rst:117
+#: ../../manufacturing/management/bill_configuration.rst:114
 #: ../../manufacturing/management/sub_assemblies.rst:39
 msgid ""
 "If you would like to be able to purchase the subassembly in addition to "
@@ -255,13 +250,13 @@ msgstr ""
 "виготовлення, виберіть **Можна придбати**. Всі інші поля у формі "
 "напівфабрикату можуть бути налаштовані відповідно до ваших уподобань."
 
-#: ../../manufacturing/management/bill_configuration.rst:123
+#: ../../manufacturing/management/bill_configuration.rst:120
 msgid "Using a Single BoM to Describe Several Variants of a Single Product"
 msgstr ""
 "Використання окремої специфікації для опису декількох варіантів окремого "
 "товару"
 
-#: ../../manufacturing/management/bill_configuration.rst:125
+#: ../../manufacturing/management/bill_configuration.rst:122
 #: ../../manufacturing/management/product_variants.rst:5
 msgid ""
 "Odoo allows you to use one bill of materials for multiple variants of the "
@@ -272,7 +267,7 @@ msgstr ""
 " ж продукту. Просто ввімкніть варіанти з :menuselection:`Налаштування --> "
 "Налаштування`."
 
-#: ../../manufacturing/management/bill_configuration.rst:132
+#: ../../manufacturing/management/bill_configuration.rst:129
 #: ../../manufacturing/management/product_variants.rst:12
 msgid ""
 "You will then be able to specify which component lines are to be used in the"
@@ -285,7 +280,7 @@ msgstr ""
 "вказати кілька варіантів для кожного рядка. Якщо не вказано жодного "
 "варіанта, рядок буде використовуватися для всіх варіантів."
 
-#: ../../manufacturing/management/bill_configuration.rst:137
+#: ../../manufacturing/management/bill_configuration.rst:134
 #: ../../manufacturing/management/product_variants.rst:17
 msgid ""
 "When defining variant BoMs on a line-item-basis, the **Product Variant** "
@@ -553,6 +548,112 @@ msgstr "Як керувати напівфабрикатами"
 msgid "Configure the Top -Level Product BoM"
 msgstr "Налаштування специфікації товару найвищого рівня"
 
+#: ../../manufacturing/management/unbuild.rst:3
+msgid "Unbuild a product"
+msgstr ""
+
+#: ../../manufacturing/management/unbuild.rst:5
+msgid ""
+"In Odoo Manufacturing App, you can *Unbuild* products. Two use cases can be "
+"managed: (1) you can unbuild products you have built yourself or (2) you can"
+" unbuild products you have received."
+msgstr ""
+
+#: ../../manufacturing/management/unbuild.rst:9
+msgid ""
+"Let's take the first case, you are manufacturing products yourself. If one "
+"of your product presents some defect, you might want to unbuild it instead "
+"of scrapping it completely, allowing you to reuse some components of the "
+"product."
+msgstr ""
+
+#: ../../manufacturing/management/unbuild.rst:14
+msgid ""
+"In the second case, you are buying products for the sole purpose of "
+"unbuilding them and recycling them."
+msgstr ""
+
+#: ../../manufacturing/management/unbuild.rst:18
+msgid "Unbuild Order"
+msgstr "Замовлення на розбирання"
+
+#: ../../manufacturing/management/unbuild.rst:20
+msgid ""
+"While in the Manufacturing App, under the *Operations* tab you will find the"
+" menu *Unbuild Orders*."
+msgstr ""
+
+#: ../../manufacturing/management/unbuild.rst:26
+msgid ""
+"When creating a new one, you can either select a MO if you are unbuilding "
+"something you manufactured or only select a product if you are unbuilding "
+"something you received."
+msgstr ""
+
+#: ../../manufacturing/management/unbuild.rst:33
+msgid "When you are done, just click unbuild and the process will be over."
+msgstr ""
+
+#: ../../manufacturing/management/unbuild.rst:35
+msgid ""
+"If you unbuild a product that you manufactured before, you will get the "
+"components from the MO back in stock."
+msgstr ""
+
+#: ../../manufacturing/management/unbuild.rst:38
+msgid ""
+"If you unbuild a product you bought, you will get the components from the "
+"BoM back in stock."
+msgstr ""
+
 #: ../../manufacturing/overview.rst:5
 msgid "Overview"
 msgstr "Загальний огляд"
+
+#: ../../manufacturing/repair.rst:5
+msgid "Repair Management"
+msgstr ""
+
+#: ../../manufacturing/repair/repair.rst:3
+msgid "Repair products"
+msgstr ""
+
+#: ../../manufacturing/repair/repair.rst:5
+msgid ""
+"The Odoo *Repair* app allows you to manage a complete after sales process "
+"but also to simply repair products you have manufactured, if they present a "
+"defect."
+msgstr ""
+
+#: ../../manufacturing/repair/repair.rst:10
+msgid "Create a Repair Order"
+msgstr ""
+
+#: ../../manufacturing/repair/repair.rst:12
+msgid ""
+"Once in the app, you can access your existing *Repair Orders* and create a "
+"new one."
+msgstr ""
+
+#: ../../manufacturing/repair/repair.rst:19
+msgid "Manage a repair"
+msgstr ""
+
+#: ../../manufacturing/repair/repair.rst:21
+msgid ""
+"When a customer sends you a product for repair, create a new *Repair Order*."
+" Fill it in with all the information you may need such as the product, the "
+"customer, if it has to be invoiced after or before the repair, the parts you"
+" might need, etc."
+msgstr ""
+
+#: ../../manufacturing/repair/repair.rst:29
+msgid ""
+"Once everything is done, you can then send the repair quotation to your "
+"customer. If it is approved, you can confirm the repair. You will then be "
+"able to start & end the repair when it is completed."
+msgstr ""
+
+#: ../../manufacturing/repair/repair.rst:36
+msgid "You can now invoice the repair."
+msgstr ""
diff --git a/locale/uk/LC_MESSAGES/mobile.po b/locale/uk/LC_MESSAGES/mobile.po
new file mode 100644
index 000000000..5c6776091
--- /dev/null
+++ b/locale/uk/LC_MESSAGES/mobile.po
@@ -0,0 +1,135 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2015-TODAY, Odoo S.A.
+# This file is distributed under the same license as the Odoo package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo 11.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018\n"
+"Language-Team: Ukrainian (https://www.transifex.com/odoo/teams/41243/uk/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: uk\n"
+"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n"
+
+#: ../../mobile/firebase.rst:5
+msgid "Mobile"
+msgstr "Мобільний додаток"
+
+#: ../../mobile/firebase.rst:8
+msgid "Setup your Firebase Cloud Messaging"
+msgstr "Налаштуйте Firebase Cloud Messaging"
+
+#: ../../mobile/firebase.rst:10
+msgid ""
+"In order to have mobile notifications in our Android app, you need an API "
+"key."
+msgstr ""
+"Щоби мати мобільні сповіщення в нашому додатку для Android, вам потрібен "
+"ключ API."
+
+#: ../../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 ""
+"Якщо він не налаштований автоматично (наприклад, для On-premise або "
+"Odoo.sh), виконайте наведені нижче дії, щоби отримати ключ API для додатка "
+"Android."
+
+#: ../../mobile/firebase.rst:18
+msgid ""
+"The iOS app doesn't support mobile notifications for Odoo versions < 12."
+msgstr "Додаток iOS не підтримує мобільні сповіщення для версій Odoo 12."
+
+#: ../../mobile/firebase.rst:22
+msgid "Firebase Settings"
+msgstr "Параметри Firebase"
+
+#: ../../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 "
+"<https://console.firebase.google.com/>`__ and create a new project."
+msgstr ""
+"Спочатку переконайтеся, що ви увійшли у свій обліковий запис Google. Потім "
+"перейдіть на сторінку `https://console.firebase.google.com "
+"<https://console.firebase.google.com/>`__ і створіть новий проект."
+
+#: ../../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 "На перегляді сторінки натисніть значок Android."
+
+#: ../../mobile/firebase.rst:50
+msgid ""
+"You must use \"com.odoo.com\" as Android package name. Otherwise, it will "
+"not work."
+msgstr ""
+"Ви повинні використовувати \"com.odoo.com\" як назву пакета Android. Інакше "
+"це не спрацює."
+
+#: ../../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 "Отримайте згенерований ключ API"
+
+#: ../../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 ""
+"У **Cloud Messaging** ви побачите **ключ API** та **ID відправника**, які "
+"потрібно встановити в Загальних налаштуваннях Odoo."
+
+#: ../../mobile/firebase.rst:74
+msgid "Settings in Odoo"
+msgstr "Налаштування в Odoo"
+
+#: ../../mobile/firebase.rst:76
+msgid "Simply paste the API key and the Sender ID from Cloud Messaging."
+msgstr "Просто вставте ключ API та ID відправника з Cloud Messaging."
diff --git a/locale/uk/LC_MESSAGES/point_of_sale.po b/locale/uk/LC_MESSAGES/point_of_sale.po
index b31539156..6d32456b5 100644
--- a/locale/uk/LC_MESSAGES/point_of_sale.po
+++ b/locale/uk/LC_MESSAGES/point_of_sale.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-26 12:01+0200\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Alina Semeniuk <alinasemeniuk1@gmail.com>, 2018\n"
+"Last-Translator: Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018\n"
 "Language-Team: Ukrainian (https://www.transifex.com/odoo/teams/41243/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: ../../point_of_sale.rst:5
 msgid "Point of Sale"
-msgstr "Точка продажу"
+msgstr "Касовий термінал"
 
 #: ../../point_of_sale/advanced.rst:3
 msgid "Advanced topics"
@@ -60,11 +60,9 @@ msgstr ""
 
 #: ../../point_of_sale/advanced/barcode.rst:14
 msgid ""
-"Under the PosBox / Hardware category, you will find *Barcode Scanner* select"
-" it."
+"Under the IoT Box / Hardware category, you will find *Barcode Scanner* "
+"select it."
 msgstr ""
-"За категорією Точка продажу/Обладнання ви знайдете *сканер штрих-кодів*, "
-"який ви хочете вибрати."
 
 #: ../../point_of_sale/advanced/barcode.rst:21
 msgid "You can find more about Barcode Nomenclature here (ADD HYPERLINK)"
@@ -132,7 +130,7 @@ msgstr ""
 
 #: ../../point_of_sale/advanced/discount_tags.rst:15
 msgid "Barcode Nomenclature"
-msgstr "Номенклатура штрих-кодів"
+msgstr "Номенклатура штрихкодів"
 
 #: ../../point_of_sale/advanced/discount_tags.rst:17
 msgid "To use discounts tags, we need to learn about barcode nomenclature."
@@ -664,32 +662,26 @@ msgstr ""
 "(`приклад<http://trendnet.com/products/proddetail.asp?prod=265_TU-S9>`__)"
 
 #: ../../point_of_sale/belgian_fdm/setup.rst:32
-msgid "A registered POSBox per POS configuration"
-msgstr "Зареєстрований POSBox для POS-конфігурації"
+msgid "A registered IoT Box per POS configuration"
+msgstr ""
 
 #: ../../point_of_sale/belgian_fdm/setup.rst:35
 msgid "Setup"
-msgstr "Налаштування"
+msgstr "Встановіть"
 
 #: ../../point_of_sale/belgian_fdm/setup.rst:38
-msgid "POSBox"
-msgstr "POSBox"
+msgid "IoT Box"
+msgstr ""
 
 #: ../../point_of_sale/belgian_fdm/setup.rst:40
 msgid ""
-"In order to use a Fiscal Data Module, you will need a registered POSBox. "
-"These POSBoxes are similar to the regular POSBoxes we sell, but they are "
+"In order to use a Fiscal Data Module, you will need a registered IoT Box. "
+"These IoT Boxes are similar to the regular IoT Boxes we sell, but they are "
 "registered with the Belgian government. This is required by law. Attempting "
-"to use a Fiscal Data Module on a non-registered POSBox will not work. You "
-"can verify that the Fiscal Data Module is recognized by the POSBox by going "
-"to the *Hardware status page* via the POSBox homepage."
+"to use a Fiscal Data Module on a non-registered IoT Box will not work. You "
+"can verify that the Fiscal Data Module is recognized by the IoT Box by going"
+" to the *Hardware status page* via the IoT Box homepage."
 msgstr ""
-"Для використання модуля податкових даних вам знадобиться зареєстрований "
-"POSBox. Ці POSBoxи схожі на звичайні POSboxи, які ми продаємо, але вони "
-"зареєстровані урядом Бельгії. Це вимагається законом. Спроба використовувати"
-" модуль податкових даних для незареєстрованого POSBox не буде працювати. Ви "
-"можете перевірити, що модуль податкових даних визнаний POSBox, перейшовши на"
-" *Сторінка статусу обладнання* через домашню сторінку POSBox."
 
 #: ../../point_of_sale/belgian_fdm/setup.rst:52
 msgid "Odoo"
@@ -701,23 +693,13 @@ msgid ""
 "**Belgian Registered Cash Register** app (technical name: "
 "``pos_blackbox_be``). Because of government restrictions imposed on us, this"
 " installation cannot be undone. After this, you will have to ensure that "
-"each POS configuration has a unique registered POSBox associated with it "
+"each POS configuration has a unique registered IoT Box associated with it "
 "(:menuselection:`Point of Sale --> Configuration --> Point of Sale` and "
-"ensure Hardware Proxy / POSBox and the serial number of your POSBox is set)."
-" The first time you open the Point of Sale and attempt to do a transaction, "
-"you will be asked to input the PIN that you received with your VAT signing "
-"card."
+"ensure Hardware Proxy / IoT Box and the serial number of your IoT Box is "
+"set). The first time you open the Point of Sale and attempt to do a "
+"transaction, you will be asked to input the PIN that you received with your "
+"VAT signing card."
 msgstr ""
-"Додаток Точка продажу Odoo може отримати сертифіковані POS-можливості, "
-"встановивши приклад **Бельгійський зареєстрований касовий апарат** (технічне"
-" ім'я: `` pos_blackbox_be``). Внаслідок державних обмежень, накладеного на "
-"нас, цю установку не можна скасувати. Після цього вам доведеться "
-"забезпечити, щоб кожна POS-конфігурація мала унікальний зареєстрований "
-"POSBox, пов'язаний з ним (:menuselection:`Точка продажу --> Налаштування -->"
-" Точка продажу` і забезпечте апаратний проксі/POSBox і встановіть серійний "
-"номер вашого POSBox). Коли ви вперше відкриєте точку продажу та спробуєте "
-"здійснити транзакцію, вам буде запропоновано ввести PIN-код, який ви "
-"отримали за допомогою вашої ПДВ картки підпису."
 
 #: ../../point_of_sale/belgian_fdm/setup.rst:69
 msgid "Certification & On-premise"
@@ -771,12 +753,12 @@ msgid "Selling products without a valid tax"
 msgstr "Продаж продукції без дійсного податку"
 
 #: ../../point_of_sale/belgian_fdm/setup.rst:90
-msgid "Multiple Odoo POS configurations per POSBox are not allowed"
-msgstr "Кілька конфігурацій точки продажу Odoo для POSBox не допускаються"
+msgid "Multiple Odoo POS configurations per IoT Box are not allowed"
+msgstr ""
 
 #: ../../point_of_sale/belgian_fdm/setup.rst:91
-msgid "Using the POS without a connection to the POSBox (and thus FDM)"
-msgstr "Використання POS без підключення до POSBox (і, таким чином, FDM)"
+msgid "Using the POS without a connection to the IoT Box (and thus FDM)"
+msgstr ""
 
 #: ../../point_of_sale/belgian_fdm/setup.rst:92
 msgid "Blacklisted modules: pos_discount, pos_reprint, pos_loyalty"
@@ -827,1103 +809,6 @@ msgstr ""
 "Коли ви закінчите, скористайтеся кнопкою збереження. Потім ви можете вибрати"
 " цього клієнта в будь-яких майбутніх операціях."
 
-#: ../../point_of_sale/overview/setup.rst:3
-msgid "Point of Sale Hardware Setup"
-msgstr "Налаштування обладнання точки продажу"
-
-#: ../../point_of_sale/overview/setup.rst:6
-msgid "POSBox Setup Guide"
-msgstr "Посібник зі встановлення POSBox"
-
-#: ../../point_of_sale/overview/setup.rst:11
-#: ../../point_of_sale/overview/setup.rst:205
-msgid "Prerequisites"
-msgstr "Передумови"
-
-#: ../../point_of_sale/overview/setup.rst:13
-msgid ""
-"Before you start setting up your POSBox make sure you have everything. You "
-"will need :"
-msgstr ""
-"Перш ніж почати встановлювати свій POSBox, переконайтеся, що у вас все є. Ви"
-" будете потребувати:"
-
-#: ../../point_of_sale/overview/setup.rst:16
-msgid "The POSBox"
-msgstr "POSBox"
-
-#: ../../point_of_sale/overview/setup.rst:17
-msgid "A 2A Power adapter"
-msgstr "Адаптер живлення 2A"
-
-#: ../../point_of_sale/overview/setup.rst:18
-msgid "A computer or tablet with an up-to-date web browser"
-msgstr "Комп'ютер або планшет із сучасним веб-браузером"
-
-#: ../../point_of_sale/overview/setup.rst:19
-msgid "A running SaaS or Odoo database with the Point of Sale installed"
-msgstr "Запущена база даних SaaS або Odoo з точкою продажу"
-
-#: ../../point_of_sale/overview/setup.rst:20
-msgid "A local network set up with DHCP (this is the default setting)"
-msgstr ""
-"Локальна мережа, налаштована за допомогою DHCP (це налаштування за "
-"замовчуванням)"
-
-#: ../../point_of_sale/overview/setup.rst:21
-msgid ""
-"An Epson USB TM-T20 Printer or another ESC/POS compatible printer "
-"(officially supported printers are listed at the `POS Hardware page "
-"<https://www.odoo.com/page/pos-ipad-android-hardware>`_)"
-msgstr ""
-"Принтер Epson USB TM-T20 або інший ESC/POS-сумісний принтер (офіційно "
-"підтримуються принтери наведені на сторінці POS обладнання "
-"<https://www.odoo.com/page/pos-ipad-android-hardware>`_)"
-
-#: ../../point_of_sale/overview/setup.rst:24
-msgid "A Honeywell Eclipse USB Barcode Scanner or another compatible scanner"
-msgstr "Сканер штрих-коду Honeywell Eclipse USB або інший сумісний сканер"
-
-#: ../../point_of_sale/overview/setup.rst:25
-msgid "An Epson compatible cash drawer"
-msgstr "Epson-сумісний ящик для готівки"
-
-#: ../../point_of_sale/overview/setup.rst:26
-msgid "An RJ45 Ethernet Cable (optional, Wi-Fi is built in)"
-msgstr "RJ45 Інтернет-кабель (додатково, вбудований Wi-Fi)"
-
-#: ../../point_of_sale/overview/setup.rst:29
-#: ../../point_of_sale/overview/setup.rst:213
-msgid "Step By Step Setup Guide"
-msgstr "Інструкція по встановленню крок за кроком"
-
-#: ../../point_of_sale/overview/setup.rst:32
-msgid "Current version of the POSBox (since 2015)"
-msgstr "Поточна версія POSBox (з 2015 року)"
-
-#: ../../point_of_sale/overview/setup.rst:36
-msgid "Connect peripheral devices"
-msgstr "Підключіть периферійні пристрої "
-
-#: ../../point_of_sale/overview/setup.rst:38
-msgid ""
-"Officially supported hardware is listed on `the POS Hardware page "
-"<https://www.odoo.com/page/pos-ipad-android-hardware>`_, but other hardware "
-"might work as well."
-msgstr ""
-"Офіційно підтримуване апаратне забезпечення наведене на сторінці POS "
-"обладнання <https://www.odoo.com/page/pos-ipad-android-hardware>`_, але може"
-" також працювати інше обладнання."
-
-#: ../../point_of_sale/overview/setup.rst:42
-msgid "**Printer**: Connect an ESC/POS printer to a USB port and power it on."
-msgstr ""
-"**Принтер**: підключіть ESC/POS-принтер до USB-порту та увімкніть його."
-
-#: ../../point_of_sale/overview/setup.rst:45
-msgid ""
-"**Cash drawer**: The cash drawer should be connected to the printer with an "
-"RJ25 cable."
-msgstr ""
-"**Ящик для готівки**: грошовий ящик повинен бути підключений до принтера за "
-"допомогою кабелю RJ25."
-
-#: ../../point_of_sale/overview/setup.rst:48
-msgid ""
-"**Barcode scanner**: Connect your barcode scanner. In order for your barcode"
-" scanner to be compatible it must behave as a keyboard and must be "
-"configured in **US QWERTY**. It also must end barcodes with an Enter "
-"character (keycode 28). This is most likely the default configuration of "
-"your barcode scanner."
-msgstr ""
-"**Сканер штрих-коду**: підключіть сканер штрих-коду. Для того, щоби ваш "
-"сканер штрих-коду був сумісний, він повинен вести себе як клавіатура, і його"
-" потрібно налаштувати в **US QWERTY**. Він також повинен закінчувати штрих-"
-"коди з символом Enter (кодовий ключ 28). Це, швидше за все, є стандартною "
-"конфігурацією вашого сканера штрих-коду."
-
-#: ../../point_of_sale/overview/setup.rst:54
-msgid "**Scale**: Connect your scale and power it on."
-msgstr "**Ваги**: підключіть ваги і включіть їх."
-
-#: ../../point_of_sale/overview/setup.rst:56
-msgid ""
-"**Ethernet**: If you do not wish to use Wi-Fi, plug in the Ethernet cable. "
-"Make sure this will connect the POSBox to the same network as your POS "
-"device."
-msgstr ""
-"**Інтернет**: якщо ви не хочете використовувати Wi-Fi, підключіть кабель "
-"Інтенренту. Переконайтеся, що він з'єднує POSBox з тією ж мережею, що й ваш "
-"пристрій точки продажу."
-
-#: ../../point_of_sale/overview/setup.rst:60
-msgid ""
-"**Wi-Fi**: The current version of the POSBox has Wi-Fi built in. Make sure "
-"not to plug in an Ethernet cable, because all Wi-Fi functionality will be "
-"bypassed when a wired network connection is available."
-msgstr ""
-"**Wi-Fi**: поточна версія точки продажу має вбудований Wi-Fi. Переконайтеся,"
-" що кабель Інтернету не підключений, оскільки всі можливості Wi-Fi будуть "
-"обходитися, коли доступна дротова мережа."
-
-#: ../../point_of_sale/overview/setup.rst:66
-msgid "Power the POSBox"
-msgstr "Потужність POSBox"
-
-#: ../../point_of_sale/overview/setup.rst:68
-msgid ""
-"Plug the power adapter into the POSBox, a bright red status led should light"
-" up."
-msgstr ""
-"Підключіть адаптер живлення до POSBox, світло-червоний статус повинен "
-"запалюватися."
-
-#: ../../point_of_sale/overview/setup.rst:72
-msgid "Make sure the POSBox is ready"
-msgstr "Переконайтеся, що POSBox готовий"
-
-#: ../../point_of_sale/overview/setup.rst:74
-msgid ""
-"Once powered, The POSBox needs a while to boot. Once the POSBox is ready, it"
-" should print a status receipt with its IP address. Also the status LED, "
-"just next to the red power LED, should be permanently lit green."
-msgstr ""
-"Після включення, POSBox потребує деякий час для завантаження. Після того, як"
-" він буде готовий, точка продажу повинна надрукувати квитанцію про статус із"
-" її IP-адресою. Також світлодіодний індикатор стану, поруч із червоним "
-"індикатором живлення, повинен бути постійно зеленим."
-
-#: ../../point_of_sale/overview/setup.rst:80
-#: ../../point_of_sale/overview/setup.rst:292
-msgid "Setup the Point of Sale"
-msgstr "Налаштуйте точку продажу"
-
-#: ../../point_of_sale/overview/setup.rst:82
-msgid ""
-"To setup the POSBox in the Point of Sale go to :menuselection:`Point of Sale"
-" --> Configuration --> Point of Sale` and select your Point of Sale. Scroll "
-"down to the ``PoSBox / Hardware Proxy`` section and activate the options for"
-" the hardware you want to use through the POSBox. Specifying the IP of the "
-"POSBox is recommended (it is printed on the receipt that gets printed after "
-"booting up the POSBox). When the IP is not specified the Point of Sale will "
-"attempt to find it on the local network."
-msgstr ""
-"Щоб налаштувати точку продажу, перейдіть до :menuselection:`Точки продажу "
-"--> Налаштування --> Точка продажу` та виберіть свою точку продажу. "
-"Прокрутіть униз до розділу Точка продажу/Апаратний проксі та активізуйте "
-"параметри обладнання, яке ви хочете використовувати через точку продажу. "
-"Рекомендується вказати IP-адресу точки продажу (вона друкується на "
-"квитанції, яка надсилається після завантаження точки продажу). Якщо IP не "
-"вказано, POSBox буде намагатися знайти її в локальній мережі."
-
-#: ../../point_of_sale/overview/setup.rst:91
-msgid ""
-"If you are running multiple Point of Sale on the same POSBox, make sure that"
-" only one of them has Remote Scanning/Barcode Scanner activated."
-msgstr ""
-"Якщо у вас працює декілька POSBox на точку продажу, переконайтеся, що лише "
-"один з них активує сканер віддаленого сканування/сканер штрих-коду."
-
-#: ../../point_of_sale/overview/setup.rst:94
-msgid ""
-"It might be a good idea to make sure the POSBox IP never changes in your "
-"network. Refer to your router documentation on how to achieve this."
-msgstr ""
-"Можливо, непогано було би переконатися, що IP-адреса POSBox ніколи не "
-"змінюється у вашій мережі. Зверніться до документації маршрутизації про те, "
-"як цього досягти."
-
-#: ../../point_of_sale/overview/setup.rst:99
-msgid "Launch the Point of Sale"
-msgstr "Запустіть точку продажу"
-
-#: ../../point_of_sale/overview/setup.rst:101
-msgid ""
-"If you didn't specify the POSBox's IP address in the configuration, the POS "
-"will need some time to perform a network scan to find the POSBox. This is "
-"only done once."
-msgstr ""
-"Якщо ви не вказали IP-адресу точки продажу в налаштуваннях, для сканування "
-"точки продажу необхідно деякий час, щоби знайти POSBox. Це робиться лише "
-"один раз."
-
-#: ../../point_of_sale/overview/setup.rst:105
-msgid ""
-"The Point of Sale is now connected to the POSBox and your hardware should be"
-" ready to use."
-msgstr ""
-"Точка продажу зараз підключена до POSBox, а ваше обладнання має бути готовим"
-" до використання."
-
-#: ../../point_of_sale/overview/setup.rst:109
-msgid "Wi-Fi configuration"
-msgstr "Налаштування Wi-Fi"
-
-#: ../../point_of_sale/overview/setup.rst:111
-msgid ""
-"The most recent version of the POSBox has Wi-Fi built in. If you're using an"
-" older version you'll need a Linux compatible USB Wi-Fi adapter. Most "
-"commercially available Wi-Fi adapters are Linux compatible. Officially "
-"supported are Wi-Fi adapters with a Ralink 5370 chipset."
-msgstr ""
-"Найновіша версія POSBox має вбудований Wi-Fi. Якщо ви використовуєте стару "
-"версію, вам буде потрібен адаптер Wi-Fi, сумісний з Linux. Більшість "
-"комерційно доступних адаптерів Wi-Fi сумісні з Linux. Офіційно підтримуються"
-" адаптери Wi-Fi з чіпсетом Ralink 5370."
-
-#: ../../point_of_sale/overview/setup.rst:117
-msgid ""
-"Make sure not to plug in an Ethernet cable, as all Wi-Fi related "
-"functionality will be disabled when a wired network connection is available."
-msgstr ""
-"Переконайтеся, що не підключений кабель Інтернету, оскільки всі функції, "
-"пов'язані з Wi-Fi, будуть вимкнені, якщо доступна дротова мережа."
-
-#: ../../point_of_sale/overview/setup.rst:121
-msgid ""
-"When the POSBox boots with a Wi-Fi adapter it will start its own Wi-Fi "
-"Access Point called \"Posbox\" you can connect to. The receipt that gets "
-"printed when the POSBox starts will reflect this. In order to make the "
-"POSBox connect to an already existing Wi-Fi network, go to the homepage of "
-"the POSBox (indicated on the receipt) and go to the Wi-Fi configuration "
-"page. On there you can choose a network to connect to. Note that we only "
-"support open and WPA(2)-PSK networks. When connecting to a WPA-secured "
-"network, fill in the password field. The POSBox will attempt to connect to "
-"the specified network and will print a new POSBox status receipt after it "
-"has connected."
-msgstr ""
-"Коли POSBox завантажується з адаптером Wi-Fi, він почне власну точку доступу"
-" Wi-Fi під назвою \"Posbox\", з якої можна підключитися. Квитанція, яка "
-"надсилається під час запуску POSBox, відображає це. Щоби POSBox підключився "
-"до вже існуючої мережі Wi-Fi, перейдіть на домашню сторінку POSBox "
-"(зазначену на квитанції) і перейдіть на сторінку налаштувань Wi-Fi. Тут ви "
-"можете вибрати мережу, до якої потрібно підключитися. Зауважте, що ми "
-"підтримуємо лише відкриті та WPA (2) -PSK мережі. Підключившись до WPA-"
-"захищеної мережі, заповніть поле пароля. POSBox намагатиметься підключитися "
-"до вказаної мережі та надсилати нову квитанцію про стан POSBox після його "
-"підключення."
-
-#: ../../point_of_sale/overview/setup.rst:132
-msgid ""
-"If you plan on permanently setting up the POSBox with Wi-Fi, you can use the"
-" \"persistent\" checkbox on the Wi-Fi configuration page when connecting to "
-"a network. This will make the network choice persist across reboots. This "
-"means that instead of starting up its own \"Posbox\" network it will always "
-"attempt to connect to the specified network after it boots."
-msgstr ""
-"Якщо ви плануєте назавжди налаштувати POSBox за допомогою Wi-Fi, під час "
-"підключення до мережі можна встановити прапорець \"постійний\" на сторінці "
-"налаштування Wi-Fi. Це дозволить зробити вибір мережі постійним через "
-"перезавантаження. Це означає, що замість того, аби запустити власну мережу "
-"\"Posbox\", він завжди намагатиметься підключитися до вказаної мережі після "
-"завантаження."
-
-#: ../../point_of_sale/overview/setup.rst:139
-msgid ""
-"When the POSBox fails to connect to a network it will fall back to starting "
-"it's own \"Posbox\" Access Point. If connection is lost with a Wi-Fi network"
-" after connecting to it, the POSBox will attempt to re-establish connection "
-"automatically."
-msgstr ""
-"Коли POSBox не зможе підключитися до мережі, він повернеться до запуску "
-"власної точки доступу \"Posbox\". Якщо підключення до мережі з'єднання буде "
-"втрачено через мережу Wi-Fi, POSBox намагатиметься відновити з'єднання "
-"автоматично."
-
-#: ../../point_of_sale/overview/setup.rst:145
-msgid "Multi-POS Configuration"
-msgstr "Налаштування кількох точок продажу"
-
-#: ../../point_of_sale/overview/setup.rst:147
-msgid ""
-"The advised way to setup a multi Point of Sale shop is to have one POSBox "
-"per Point of Sale. In this case it is mandatory to manually specify the IP "
-"address of each POSBox in each Point of Sale. You must also configure your "
-"network to make sure the POSBox's IP addresses don't change. Please refer to"
-" your router documentation."
-msgstr ""
-"Рекомендований спосіб налаштування магазину з кількома точками продажу - "
-"мати один POSBox. У цьому випадку обов'язково вручну вказати IP-адресу "
-"кожного POSBox у кожній точці продажу. Ви також повинні налаштувати свою "
-"мережу, аби переконатися, що IP-адреси POSBox не змінюються. Будь ласка, "
-"зверніться до документації маршрутизації."
-
-#: ../../point_of_sale/overview/setup.rst:154
-msgid "POSBoxless Guide (advanced)"
-msgstr "Посібник із POSBoxless (розширений)"
-
-#: ../../point_of_sale/overview/setup.rst:158
-msgid ""
-"If you are running your Point of Sale on a Debian-based Linux distribution, "
-"you do not need the POSBox as you can run its software locally. However the "
-"installation process is not foolproof. You'll need at least to know how to "
-"install and run Odoo. You may also run into issues specific to your "
-"distribution or to your particular setup and hardware configuration."
-msgstr ""
-"Якщо ви використовуєте свою точку продажу на дистрибутиві бази Debian, то "
-"вам не потрібен POSBox, оскільки ви можете запустити його програмне "
-"забезпечення локально. Однак процес встановлення не є надійним. Вам потрібно"
-" буде хоча би знати, як встановити та запустити Odoo. Ви також можете "
-"поставити проблеми, пов'язані з вашим дистрибутивом або з вашою конкретною "
-"конфігурацією та обладнанням."
-
-#: ../../point_of_sale/overview/setup.rst:165
-msgid ""
-"Drivers for the various types of supported hardware are provided as Odoo "
-"modules. In fact, the POSBox runs an instance of Odoo that the Point of Sale"
-" communicates with. The instance of Odoo running on the POSBox is very "
-"different from a 'real' Odoo instance however. It does not handle *any* "
-"business data (eg. POS orders), but only serves as a gateway between the "
-"Point of Sale and the hardware."
-msgstr ""
-"Драйвера для різних типів підтримуваного апаратного забезпечення надається "
-"як модулі Odoo. Фактично, POSBox запускає версію Odoo, з якою зв'язується "
-"точка продажу. Версія Odoo, що працює на POSBox, сильно відрізняється від "
-"\"реальної\" версії Odoo. Вона не обробляє *будь-які* бізнес-дані "
-"(наприклад, POS-замовлення), але служить лише шлюзом між точкою продажу та "
-"обладнанням."
-
-#: ../../point_of_sale/overview/setup.rst:172
-msgid ""
-"The goal of this section will be to set up a local Odoo instance that "
-"behaves like the Odoo instance running on the POSBox."
-msgstr ""
-"Мета цього розділу полягає у створенні локальної версії Odoo, яка веде себе "
-"як версія Odoo, що працює на POSBox."
-
-#: ../../point_of_sale/overview/setup.rst:176
-msgid "Image building process"
-msgstr "Процес створення зображень"
-
-#: ../../point_of_sale/overview/setup.rst:178
-msgid ""
-"We generate the official POSBox images using the scripts in "
-"https://github.com/odoo/odoo/tree/11.0/addons/point_of_sale/tools/posbox. "
-"More specifically, we run `posbox_create_image.sh "
-"<https://github.com/odoo/odoo/blob/11.0/addons/point_of_sale/tools/posbox/posbox_create_image.sh>`_."
-" This builds an image called ``posbox.img``, which we zip and upload to "
-"`nightly.odoo.com <https://nightly.odoo.com>`_ for users to download."
-msgstr ""
-"Ми створюємо офіційні зображення POSBox за допомогою сценаріїв за адресою "
-"https://github.com/odoo/odoo/tree/11.0/addons/point_of_sale/tools/posbox. "
-"Якщо конкретно, ми запускаємо posbox_create_image.sh. "
-"<https://github.com/odoo/odoo/blob/11.0/addons/point_of_sale/tools/posbox/posbox_create_image.sh>`_."
-" Це створює зображення, яке називається posbox.img, яке ми завантажуємо в "
-"zip і завантажуємо на <https://nightly.odoo.com>`_ для користувачі."
-
-#: ../../point_of_sale/overview/setup.rst:186
-msgid ""
-"The scripts in this directory might be useful as a reference if you get "
-"stuck or want more detail about something."
-msgstr ""
-"Скрипти у цьому каталозі можуть бути корисними як посилання, якщо ви "
-"застрягли або хочете докладніше про щось дізнатися."
-
-#: ../../point_of_sale/overview/setup.rst:190
-msgid "Summary of the image creation process"
-msgstr "Підсумок процесу створення зображення"
-
-#: ../../point_of_sale/overview/setup.rst:192
-msgid ""
-"The image creation process starts by downloading the latest `Raspbian "
-"<https://www.raspbian.org/>`_ image. It then locally mounts this Raspbian "
-"image and copies over some files and scripts that will make the Raspbian "
-"image turn itself into a POSBox when it boots. These scripts will update "
-"Raspbian, remove non-essential packages and install required packages. In "
-"order to boot Raspbian we use qemu, which is capable of providing ARM "
-"emulation. After this, the emulated Raspbian OS will shut itself down. We "
-"then once again locally mount the image, remove the scripts that were used "
-"to initialize the image at boot and we copy over some extra configuration "
-"files. The resulting image is then ready to be tested and used."
-msgstr ""
-"Процес створення зображення починається із завантаження останнього "
-"зображення `Raspbian <https://www.raspbian.org/>`_. Потім він локально "
-"монтує це зображення Raspbian та копіює над деякими файлами та скриптами, "
-"які змушують образ Raspbian перетворюватися на POSBox під час завантаження. "
-"Ці скрипти будуть оновлювати Raspbian, видаляти несуттєві пакунки та "
-"встановлювати необхідні. Для завантаження Raspbian ми використовуємо qemu, "
-"яка здатна забезпечити емуляцію ARM. Після цього імітована ОС \"Raspbian\" "
-"закриється. Ми потім знову локально монтуємо зображення, видаляємо скрипти, "
-"які використовувались для ініціалізації зображення під час завантаження, і "
-"копіюємо деякі додаткові файли конфігурації. Отримане зображення готово для "
-"тестування та використання."
-
-#: ../../point_of_sale/overview/setup.rst:207
-msgid "A Debian-based Linux distribution (Debian, Ubuntu, Mint, etc.)"
-msgstr "Розподіл Linux на основі Debian (Debian, Ubuntu, Mint та ін.)"
-
-#: ../../point_of_sale/overview/setup.rst:208
-msgid "A running Odoo instance you connect to load the Point of Sale"
-msgstr ""
-"Запущена версія Odoo, яку ви підключаєте, щоб завантажити точку продажу"
-
-#: ../../point_of_sale/overview/setup.rst:209
-msgid ""
-"You must uninstall any ESC/POS printer driver as it will conflict with "
-"Odoo's built-in driver"
-msgstr ""
-"Ви повинні видалити будь-який драйвер принтера ESC/POS, оскільки він "
-"конфліктує з вбудованим драйвером Odoo"
-
-#: ../../point_of_sale/overview/setup.rst:216
-msgid "Extra dependencies"
-msgstr "Додаткові залежності"
-
-#: ../../point_of_sale/overview/setup.rst:218
-msgid ""
-"Because Odoo runs on Python 2, you need to check which version of pip you "
-"need to use."
-msgstr ""
-"Через те, що Odoo працює на Python 2, потрібно перевірити версію pip, яку "
-"потрібно використовувати."
-
-#: ../../point_of_sale/overview/setup.rst:221
-msgid "``# pip --version``"
-msgstr "``# pip --version``"
-
-#: ../../point_of_sale/overview/setup.rst:223
-#: ../../point_of_sale/overview/setup.rst:229
-msgid "If it returns something like::"
-msgstr "Якщо вона повертає щось на зразок::"
-
-#: ../../point_of_sale/overview/setup.rst:227
-msgid "You need to try pip2 instead."
-msgstr "Потрібно спробувати pip2."
-
-#: ../../point_of_sale/overview/setup.rst:233
-msgid "You can use pip."
-msgstr "Ви можете використовувати рір."
-
-#: ../../point_of_sale/overview/setup.rst:235
-msgid "The driver modules requires the installation of new python modules:"
-msgstr "Модулі драйверів вимагають встановлення нових модулів python:"
-
-#: ../../point_of_sale/overview/setup.rst:237
-msgid "``# pip install pyserial``"
-msgstr "``# pip install pyserial``"
-
-#: ../../point_of_sale/overview/setup.rst:239
-msgid "``# pip install pyusb==1.0.0b1``"
-msgstr "``# pip install pyusb==1.0.0b1``"
-
-#: ../../point_of_sale/overview/setup.rst:241
-msgid "``# pip install qrcode``"
-msgstr "``# pip install qrcode``"
-
-#: ../../point_of_sale/overview/setup.rst:244
-msgid "Access Rights"
-msgstr "Права доступу"
-
-#: ../../point_of_sale/overview/setup.rst:246
-msgid ""
-"The drivers need raw access to the printer and barcode scanner devices. "
-"Doing so requires a bit system administration. First we are going to create "
-"a group that has access to USB devices"
-msgstr ""
-"Для драйверів потрібен вихідний доступ до принтерів та пристроїв для "
-"сканування штрих-кодів. Для цього потрібне системне адміністрування. "
-"Спочатку ми збираємося створити групу, яка має доступ до USB-пристроїв"
-
-#: ../../point_of_sale/overview/setup.rst:250
-msgid "``# groupadd usbusers``"
-msgstr "``# groupadd usbusers``"
-
-#: ../../point_of_sale/overview/setup.rst:252
-msgid "Then we add the user who will run the OpenERP server to ``usbusers``"
-msgstr ""
-"Тоді ми додаємо користувача, який запускатиме OpenERP сервер для "
-"``usbusers``"
-
-#: ../../point_of_sale/overview/setup.rst:254
-msgid "``# usermod -a -G usbusers USERNAME``"
-msgstr "``# usermod -a -G usbusers USERNAME``"
-
-#: ../../point_of_sale/overview/setup.rst:256
-msgid ""
-"Then we need to create a udev rule that will automatically allow members of "
-"``usbusers`` to access raw USB devices. To do so create a file called "
-"``99-usbusers.rules`` in the ``/etc/udev/rules.d/`` directory with the "
-"following content::"
-msgstr ""
-"Потім нам потрібно створити правило udev, яке автоматично дозволить членам "
-"``usbusers`` отримати доступ до сировинних USB-пристроїв. Для цього створіть"
-" файл з назвою ``99-usbusers.rules`` у каталозі ``/etc/udev/rules.d/`` з "
-"наступним вмістом::"
-
-#: ../../point_of_sale/overview/setup.rst:264
-msgid "Then you need to reboot your machine."
-msgstr "Потрібно перезавантажити комп'ютер."
-
-#: ../../point_of_sale/overview/setup.rst:267
-msgid "Start the local Odoo instance"
-msgstr "Запустіть локальний екземпляр Odoo"
-
-#: ../../point_of_sale/overview/setup.rst:269
-msgid "We must launch the Odoo server with the correct settings"
-msgstr "Ми повинні запустити сервер Odoo з правильними налаштуваннями"
-
-#: ../../point_of_sale/overview/setup.rst:271
-msgid ""
-"``$ ./odoo.py "
-"--load=web,hw_proxy,hw_posbox_homepage,hw_posbox_upgrade,hw_scale,hw_scanner,hw_escpos``"
-msgstr ""
-"``$ ./odoo.py "
-"--load=web,hw_proxy,hw_posbox_homepage,hw_posbox_upgrade,hw_scale,hw_scanner,hw_escpos``"
-
-#: ../../point_of_sale/overview/setup.rst:274
-msgid "Test the instance"
-msgstr "Перевірте версію"
-
-#: ../../point_of_sale/overview/setup.rst:276
-msgid ""
-"Plug all your hardware to your machine's USB ports, and go to "
-"``http://localhost:8069/hw_proxy/status`` refresh the page a few times and "
-"see if all your devices are indicated as *Connected*. Possible source of "
-"errors are: The paths on the distribution differ from the paths expected by "
-"the drivers, another process has grabbed exclusive access to the devices, "
-"the udev rules do not apply or a superseded by others."
-msgstr ""
-"Підключіть все своє обладнання до USB-портів вашого комп'ютера і перейдіть "
-"на ``http://localhost:8069/hw_proxy/status`` оновіть сторінку декілька разів"
-" і перевірте, чи всі ваші пристрої позначені як підключені. Можливим "
-"джерелом помилок є: шляхи в розподілі відрізняються від шляхів, очікуваних "
-"драйверами, інший процес захопив ексклюзивний доступ до пристроїв, правила "
-"udev не застосовуються або замінюються іншими."
-
-#: ../../point_of_sale/overview/setup.rst:284
-msgid "Automatically start Odoo"
-msgstr "Автоматично запустіть Odoo"
-
-#: ../../point_of_sale/overview/setup.rst:286
-msgid ""
-"You must now make sure that this Odoo install is automatically started after"
-" boot. There are various ways to do so, and how to do it depends on your "
-"particular setup. Using the init system provided by your distribution is "
-"probably the easiest way to accomplish this."
-msgstr ""
-"Тепер ви повинні переконатися, що це встановлення Odoo автоматично "
-"запускається після завантаження. Існують різні способи зробити це, і як це "
-"зробити, залежить від конкретного налаштування. Використання системи init, "
-"що надається вашим дистрибутивом, ймовірно, є найпростішим способом "
-"здійснити це."
-
-#: ../../point_of_sale/overview/setup.rst:294
-msgid ""
-"The IP address field in the POS configuration must be either ``127.0.0.1`` "
-"or ``localhost`` if you're running the created Odoo server on the machine "
-"that you'll use as the Point of Sale device. You can also leave it empty."
-msgstr ""
-"Поле IP-адреси в налаштуваннях точки продажу має бути ``127.0.0.1`` вбо "
-"``localhost`` якщо ви використовуєте створений сервер Odoo на апараті, який "
-"ви будете використовувати як пристрій точки продажу. Ви також можете "
-"залишити це порожнім."
-
-#: ../../point_of_sale/overview/setup.rst:300
-msgid "POSBox Technical Documentation"
-msgstr "Технічна документація POSBox"
-
-#: ../../point_of_sale/overview/setup.rst:303
-msgid "Technical Overview"
-msgstr "Технічний огляд"
-
-#: ../../point_of_sale/overview/setup.rst:306
-msgid "The POSBox Hardware"
-msgstr "Обладнання POSBox"
-
-#: ../../point_of_sale/overview/setup.rst:308
-msgid ""
-"The POSBox's Hardware is based on a `Raspberry Pi 2 "
-"<https://www.raspberrypi.org/products/raspberry-pi-2-model-b/>`_, a popular "
-"single-board computer. The Raspberry Pi 2 is powered with a 2A micro-usb "
-"power adapter. 2A is needed to give enough power to the barcode scanners. "
-"The Software is installed on a 8Gb Class 10 or Higher SD Card. All this "
-"hardware is easily available worldwide from independent vendors."
-msgstr ""
-"Апаратне забезпечення POSBox.  <https://www.raspberrypi.org/products"
-"/raspberry-pi-2-model-b/>`_, засноване на популярній одноплатовій машині "
-"Raspberry Pi 2. Raspberry Pi 2 оснащений 2A мікро-USB-адаптером живлення. 2A"
-" необхідний для забезпечення достатньої потужності сканерів штрих-кодів. "
-"Програмне забезпечення встановлено на картці 8Gb Class 10 або вище SD. Все "
-"це обладнання легко доступне у всьому світі від незалежних постачальників."
-
-#: ../../point_of_sale/overview/setup.rst:317
-msgid "Compatible Peripherals"
-msgstr "Сумісні периферійні пристрої"
-
-#: ../../point_of_sale/overview/setup.rst:319
-msgid ""
-"Officially supported hardware is listed on the `POS Hardware page "
-"<https://www.odoo.com/page/pos-ipad-android-hardware>`_."
-msgstr ""
-"Офіційно підтримуване обладнання наведено на 'сторінці обладнання точки "
-"продажу. <https://www.odoo.com/page/pos-ipad-android-hardware>`_."
-
-#: ../../point_of_sale/overview/setup.rst:323
-msgid "The POSBox Software"
-msgstr "POSBox Software"
-
-#: ../../point_of_sale/overview/setup.rst:325
-msgid ""
-"The POSBox runs a heavily modified Raspbian Linux installation, a Debian "
-"derivative for the Raspberry Pi. It also runs a barebones installation of "
-"Odoo which provides the webserver and the drivers. The hardware drivers are "
-"implemented as Odoo modules. Those modules are all prefixed with ``hw_*`` "
-"and they are the only modules that are running on the POSBox. Odoo is only "
-"used for the framework it provides. No business data is processed or stored "
-"on the POSBox. The Odoo instance is a shallow git clone of the ``8.0`` "
-"branch."
-msgstr ""
-"POSBox запускає сильно модифіковану версію Raspbian Linux, похідну Debian "
-"для Raspberry Pi. Вона також запускає встановлення Barebones Odoo, що "
-"забезпечує веб-сервер та драйвери. Апаратні драйвери реалізовані як модулі "
-"Odoo. Всі ці модулі мають prefixed з ``hw_*`` і вони є єдиними модулями, що "
-"працюють на POSBox. Odoo використовується лише для тієї системи, яку вона "
-"надає. Немає бізнес-даних, які обробляються або зберігаються на POSBox. "
-"Версія Odoo - це невеликий клон гіт гілки ``8.0``."
-
-#: ../../point_of_sale/overview/setup.rst:334
-msgid ""
-"The root partition on the POSBox is mounted read-only, ensuring that we "
-"don't wear out the SD card by writing to it too much. It also ensures that "
-"the filesystem cannot be corrupted by cutting the power to the POSBox. Linux"
-" applications expect to be able to write to certain directories though. So "
-"we provide a ramdisk for /etc and /var (Raspbian automatically provides one "
-"for /tmp). These ramdisks are setup by ``setup_ramdisks.sh``, which we run "
-"before all other init scripts by running it in ``/etc/init.d/rcS``. The "
-"ramdisks are named /etc_ram and /var_ram respectively. Most data from /etc "
-"and /var is copied to these tmpfs ramdisks. In order to restrict the size of"
-" the ramdisks, we do not copy over certain things to them (eg. apt related "
-"data). We then bind mount them over the original directories. So when an "
-"application writes to /etc/foo/bar it's actually writing to "
-"/etc_ram/foo/bar. We also bind mount / to /root_bypass_ramdisks to be able "
-"to get to the real /etc and /var during development."
-msgstr ""
-"Кореневий розділ на POSBox монтується лише для читання, гарантуючи, що ми не"
-" зношуємо SD-карту, пишучи їй надто багато. Це також гарантує, що файлова "
-"система не може бути пошкоджена шляхом скорочення потужності POSBox. "
-"Програми Linux, як очікується, зможуть писати в деяких каталогах. Таким "
-"чином ми надаємо ramdisk для /etc та /var (Raspbian автоматично забезпечує "
-"один для /tmp). Ці діапазони встановлюються за допомогою "
-"``setup_ramdisks.sh``, які ми запускаємо перед усіма іншими скриптами init, "
-"запустивши їх у ``/etc/init.d/rcS``. Ramdiscs названі /etc_ram та /var_ram "
-"відповідно. Більшість даних з файлів /etc та /var копіюються на ці ramdiscs "
-"tmpfs. Щоб обмежити розмір ramdiscs, ми не копіюємо над ними певні речі "
-"(наприклад, відповідні дані). Потім ми зв'язуємо їх з монзами в оригінальні "
-"каталоги. Тому, коли програма пише до /etc/foo/bar, вона насправді пишеться "
-"до /etc_ram/foo/bar. Ми також встановлюємо кріплення "
-"mount/to/root_bypass_ramdisks для того, аби бути в змозі дістатися до "
-"реальних /etc та /var під час розробки."
-
-#: ../../point_of_sale/overview/setup.rst:350
-msgid "Logs of the running Odoo server can be found at:"
-msgstr "Журнали поточного сервера Odoo можна знайти за адресою:"
-
-#: ../../point_of_sale/overview/setup.rst:352
-msgid "``/var/log/odoo/odoo.log``"
-msgstr "``/var/log/odoo/odoo.log``"
-
-#: ../../point_of_sale/overview/setup.rst:354
-msgid ""
-"Various POSBox related scripts (eg. wifi-related scripts) running on the "
-"POSBox will log to /var/log/syslog and those messages are tagged with "
-"``posbox_*``."
-msgstr ""
-"Різні скрипти, пов'язані з POSBox (наприклад, скрипти, пов'язані з Wi-Fi), "
-"запущені на POSBox, будуть вноситися до /var/log/syslog, і ці повідомлення "
-"позначаються з ``posbox_*``."
-
-#: ../../point_of_sale/overview/setup.rst:359
-msgid "Accessing the POSBox"
-msgstr "Доступ до POSBox"
-
-#: ../../point_of_sale/overview/setup.rst:362
-msgid "Local Access"
-msgstr "Локальний доступ"
-
-#: ../../point_of_sale/overview/setup.rst:364
-msgid ""
-"If you plug a QWERTY USB keyboard into one of the POSBox's USB ports, and if"
-" you connect a computer monitor to the *HDMI* port of the POSBox, you can "
-"use it as a small GNU/Linux computer and perform various administration "
-"tasks, like viewing some logs."
-msgstr ""
-"Якщо ви підключите QWERTY USB-клавіатуру до одного з USB-портів POSBox, і "
-"якщо ви підключите монітор комп'ютера до порту HDMI POSBox, ви можете "
-"використовувати його як невеликий комп'ютер GNU/Linux і виконувати різні "
-"завдання адміністрування, наприклад переглядати деякі журнали."
-
-#: ../../point_of_sale/overview/setup.rst:369
-msgid "The POSBox will automatically log in as root on the default tty."
-msgstr "POSBox буде автоматично входити як root за замовчуванням tty."
-
-#: ../../point_of_sale/overview/setup.rst:372
-msgid "Remote Access"
-msgstr "Віддалений доступ"
-
-#: ../../point_of_sale/overview/setup.rst:374
-msgid ""
-"If you have the POSBox's IP address and an SSH client you can access the "
-"POSBox's system remotely. The login credentials are ``pi``/``raspberry``."
-msgstr ""
-"Якщо у вас є IP-адреса POSBox та клієнт SSH, ви можете мати доступ до "
-"системи POSBox віддалено. Вхідні дані є ``pi``/``raspberry``."
-
-#: ../../point_of_sale/overview/setup.rst:379
-msgid "Updating The POSBox Software"
-msgstr "Оновлення програмного забезпечення POSBox"
-
-#: ../../point_of_sale/overview/setup.rst:381
-msgid ""
-"Only upgrade the POSBox if you experience problems or want to use newly "
-"implemented features."
-msgstr ""
-"Тільки оновіть POSBox, якщо ви зіткнулися з проблемами або хочете "
-"використовувати нові функції."
-
-#: ../../point_of_sale/overview/setup.rst:384
-msgid ""
-"The best way to update the POSBox software is to download a new version of "
-"the image and flash the SD-Card with it. This operation is described in "
-"detail in `this tutorial <http://elinux.org/RPi_Easy_SD_Card_Setup>`_, just "
-"replace the standard Raspberry Pi image with the latest one found at `the "
-"official POSBox image page <http://nightly.odoo.com/master/posbox/>`_. This "
-"method of upgrading will ensure that you're running the latest version of "
-"the POSBox software."
-msgstr ""
-"Найкращий спосіб оновлення програмного забезпечення POSBox - завантажити "
-"нову версію зображення та вставити в неї SD-карту. Ця операція детально "
-"описана в `в цьому уроці <http://elinux.org/RPi_Easy_SD_Card_Setup>`_, "
-"просто замініть стандартне зображення Raspberry Pi найновішим на офіційній "
-"`сторінці зображення POSBox <http://nightly.odoo.com/master/posbox/>`_. Цей "
-"спосіб оновлення забезпечить, аби ви використовували найновішу версію "
-"POSbox."
-
-#: ../../point_of_sale/overview/setup.rst:393
-msgid ""
-"The second way of upgrading is through the built in upgrade interface that "
-"can be reached through the POSBox homepage. The nice thing about upgrading "
-"like this is that you don't have to flash a new image. This upgrade method "
-"is limited to what it can do however. It can not eg. update installed "
-"configuration files (like eg. /etc/hostapd.conf). It can only upgrade:"
-msgstr ""
-"Другий спосіб оновлення - це вбудований інтерфейс оновлення, який можна "
-"отримати через домашню сторінку POSBox. Гарна річ щодо оновлення полягає в "
-"тому, що вам не потрібно завантажувати нове зображення. Цей метод оновлення "
-"обмежується тим, що він може зробити. Він не може, наприклад, оновлювати "
-"встановлені налаштування файлів (наприклад, /etc/hostapd.conf). Метод може "
-"оновити лише:"
-
-#: ../../point_of_sale/overview/setup.rst:400
-msgid "The internal Odoo application"
-msgstr "Внутрішню програма Odoo"
-
-#: ../../point_of_sale/overview/setup.rst:401
-msgid ""
-"Scripts in the folder "
-"``odoo/addons/point_of_sale/tools/posbox/configuration/``"
-msgstr ""
-"Скрипти в папці ``odoo/addons/point_of_sale/tools/posbox/configuration/``"
-
-#: ../../point_of_sale/overview/setup.rst:403
-msgid "When in doubt, always use the first method of upgrading."
-msgstr "Якщо ви сумніваєтесь, завжди використовуйте перший спосіб оновлення."
-
-#: ../../point_of_sale/overview/setup.rst:406
-msgid "Troubleshoot"
-msgstr "Усунення несправностей"
-
-#: ../../point_of_sale/overview/setup.rst:409
-msgid "The POS cannot connect to the POSBox"
-msgstr "Точка продажу не може підключитися до POSBox"
-
-#: ../../point_of_sale/overview/setup.rst:411
-msgid ""
-"The easiest way to make sure the POSBox is properly set-up is to turn it on "
-"with the printer plugged in as it will print a receipt indicating any error "
-"if encountered or the POSBox's IP address in case of success. If no receipt "
-"is printed, check the following steps:"
-msgstr ""
-"Найпростіший спосіб переконатися, що POSBox належним чином налаштований - це"
-" ввімкнути його, якщо принтер підключений, він надрукує квитанцію, яка "
-"вказує на будь-яку помилку, коли виникає проблема, або IP-адресу POSBox у "
-"випадку успіху. Якщо не надруковано квитанцію, перевірте наступні кроки:"
-
-#: ../../point_of_sale/overview/setup.rst:415
-msgid ""
-"Make sure the POSBox is powered on, indicated by a brightly lit red status "
-"LED."
-msgstr ""
-"Переконайтеся, що POSBox включений, позначений яскраво освітленим червоним "
-"індикатором стану."
-
-#: ../../point_of_sale/overview/setup.rst:417
-msgid ""
-"Make sure the POSBox is ready, this is indicated by a brightly lit green "
-"status LED just next to the red power status LED. The POSBox should be ready"
-" ~2 minutes after it is started."
-msgstr ""
-"Переконайтеся, що POSBox готовий, про це свідчить яскраво освітлений зелений"
-" індикатор стану поряд із червоним індикатором живлення. POSBox повинен бути"
-" готовий ~ через 2 хвилини після його запуску."
-
-#: ../../point_of_sale/overview/setup.rst:420
-msgid ""
-"Make sure the POSBox is connected to the same network as your POS device. "
-"Both the device and the POSBox should be visible in the list of connected "
-"devices on your network router."
-msgstr ""
-"Переконайтеся, що POSBox підключено до тієї ж мережі, що і ваш пристрій "
-"точки продажу. І пристрій, і POSBox повинні бути видимими в списку "
-"підключених пристроїв вашого мережевого маршрутизатора."
-
-#: ../../point_of_sale/overview/setup.rst:423
-msgid ""
-"Make sure that your LAN is set up with DHCP, and gives IP addresses in the "
-"range 192.168.0.X, 192.168.1.X, 10.0.0.X. If you cannot setup your LAN that "
-"way, you must manually set up your POSBox's IP address."
-msgstr ""
-"Переконайтеся, що ваша локальна мережа налаштована за допомогою DHCP та дає "
-"IP-адреси в діапазоні 192.168.0.X, 192.168.1.X, 10.0.0.X. Якщо ви не можете "
-"налаштувати вашу локальну мережу таким чином, потрібно вручну встановити IP-"
-"адресу вашого POSBox."
-
-#: ../../point_of_sale/overview/setup.rst:427
-msgid ""
-"If you have specified the POSBox's IP address in the configuration, make "
-"sure it correspond to the printed on the POSBox's status receipt."
-msgstr ""
-"Якщо ви вказали IP-адресу POSBox в налаштуваннях, переконайтеся, що вона "
-"відповідає інформації, роздрукованій на квитанції про статус POSBox."
-
-#: ../../point_of_sale/overview/setup.rst:430
-msgid "Make sure that the POS is not loaded over HTTPS."
-msgstr "Переконайтеся, що POS не завантажено через HTTPS."
-
-#: ../../point_of_sale/overview/setup.rst:431
-msgid ""
-"A bug in Firefox's HTTP implementation prevents the autodiscovery from "
-"working reliably. When using Firefox you should manually set up the POSBox's"
-" IP address in the POS configuration."
-msgstr ""
-"Помилка в реалізації HTTP-протоколу Firefox перешкоджає надійному "
-"функціонуванню автообстеження. При використанні Firefox ви повинні вручну "
-"налаштувати IP-адресу POSBox в налаштуваннях точки продажу."
-
-#: ../../point_of_sale/overview/setup.rst:436
-msgid "The Barcode Scanner is not working"
-msgstr "Сканер штрих-коду не працює"
-
-#: ../../point_of_sale/overview/setup.rst:438
-msgid ""
-"The barcode scanner must be configured in US QWERTY and emit an Enter after "
-"each barcode. This is the default configuration of most barcode readers. "
-"Refer to the barcode reader documentation for more information."
-msgstr ""
-"Сканер штрих-коду повинен бути налаштований в US QWERTY і видати Enter після"
-" кожного штрих-коду. Це налаштовано за замовчуванням більшості сканерів "
-"штрих-кодів. Для отримання додаткової інформації зверніться до документації "
-"для сканування штрих-кодів."
-
-#: ../../point_of_sale/overview/setup.rst:442
-msgid ""
-"The POSBox needs a 2A power supply to work with some barcode scanners. If "
-"you are not using the provided power supply, make sure the one you use has "
-"enough power."
-msgstr ""
-"Для роботи POSBox потрібен блок живлення 2A для деяких сканерів штрих-кодів."
-" Якщо ви не користуєтесь наданим джерелом живлення, переконайтеся, що у вас "
-"є достатньо енергії."
-
-#: ../../point_of_sale/overview/setup.rst:445
-msgid ""
-"Some barcode scanners will need more than 2A and will not work, or will work"
-" unreliably, even with the provided power supply. In those case you can plug"
-" the barcode scanner in a self-powered USB hub."
-msgstr ""
-"Деякі сканери штрих-кодів потребують більше 2A, і вони не працюватимуть або "
-"працюватимуть неналежним чином, навіть за умови наявності джерела живлення. "
-"У такому випадку ви можете підключити сканер штрих-коду до автономного USB-"
-"концентратора."
-
-#: ../../point_of_sale/overview/setup.rst:448
-msgid ""
-"Some poorly built barcode scanners do not advertise themselves as barcode "
-"scanners but as a usb keyboard instead, and will not be recognized by the "
-"POSBox."
-msgstr ""
-"Деякі погано побудовані сканери штрих-кодів не рекламують себе як сканери "
-"штрих-кодів, а замість клавіатури USB, і не будуть розпізнані POSBox."
-
-#: ../../point_of_sale/overview/setup.rst:453
-msgid "The Barcode Scanner is not working reliably"
-msgstr "Сканер штрих-коду не працює надійно"
-
-#: ../../point_of_sale/overview/setup.rst:455
-msgid ""
-"Make sure that no more than one device with 'Scan via Proxy'/'Barcode "
-"Scanner' enabled are connected to the POSBox at the same time."
-msgstr ""
-"Переконайтеся, що одночасно до POSBox підключено не більше одного пристрою з"
-" функцією \"Сканувати через проксі\"/\"Сканер штрих-коду\"."
-
-#: ../../point_of_sale/overview/setup.rst:460
-msgid "Printing the receipt takes too much time"
-msgstr "Друк квитанції займає надто багато часу"
-
-#: ../../point_of_sale/overview/setup.rst:462
-msgid ""
-"A small delay before the first print is expected, as the POSBox will do some"
-" preprocessing to speed up the next printings. If you suffer delays "
-"afterwards it is most likely due to poor network connection between the POS "
-"and the POSBox."
-msgstr ""
-"Невелика затримка до першого друку очікується, оскільки POSBox зробить деяку"
-" попередню обробку, щоби прискорити наступний друк. Якщо після цього у вас "
-"буде затримка, це, швидше за все, пов'язано з поганим мережевим зв'язком між"
-" точкою продажу і POSBox."
-
-#: ../../point_of_sale/overview/setup.rst:468
-msgid "Some characters are not correctly printed on the receipt"
-msgstr "Деякі символи не надруковані на квитанції"
-
-#: ../../point_of_sale/overview/setup.rst:470
-msgid ""
-"The POSBox does not support all languages and characters. It currently "
-"supports Latin and Cyrillic based scripts, with basic Japanese support."
-msgstr ""
-"POSBox не підтримує всі мови та символи. В даний час він підтримує скрипти з"
-" латинської та кирилицею, з базовою японською підтримкою."
-
-#: ../../point_of_sale/overview/setup.rst:475
-msgid "The printer is offline"
-msgstr "Принтер офлайн"
-
-#: ../../point_of_sale/overview/setup.rst:477
-msgid ""
-"Make sure the printer is connected, powered, has enough paper and has its "
-"lid closed, and is not reporting an error. If the error persists, please "
-"contact support."
-msgstr ""
-"Переконайтесь, що принтер підключений, живиться, має достатню кількість "
-"паперу, кришка закрита та не повідомляється про помилку. Якщо помилка не "
-"зникає, зверніться до служби підтримки."
-
-#: ../../point_of_sale/overview/setup.rst:482
-msgid "The cashdrawer does not open"
-msgstr "Готівковий рахунок не відкривається"
-
-#: ../../point_of_sale/overview/setup.rst:484
-msgid ""
-"The cashdrawer should be connected to the printer and should be activated in"
-" the POS configuration."
-msgstr ""
-"Каса повинна бути підключена до принтера і повинна активуватися в "
-"налаштуваннях точки продажу."
-
-#: ../../point_of_sale/overview/setup.rst:488
-msgid "Credits"
-msgstr "Кредити"
-
-#: ../../point_of_sale/overview/setup.rst:489
-msgid ""
-"The POSBox project was developed by Frédéric van der Essen with the kind "
-"help of Gary Malherbe, Fabien Meghazi, Nicolas Wisniewsky, Dimitri Del "
-"Marmol, Joren Van Onder and Antony Lesuisse."
-msgstr ""
-"Проект POSBox був розроблений Фредеріком ван дер Есеном з належною допомогою"
-" Гарі Малхербе, Фаб'єна Мегазі, Ніколя Висневського, Дімітрі Дель Мармола, "
-"Йорен Ван Ондер та Антоні Лесуісе."
-
-#: ../../point_of_sale/overview/setup.rst:493
-msgid ""
-"This development would not have been possible without the Indiegogo campaign"
-" and those who contributed to it. Special thanks goes to the partners who "
-"backed the campaign with founding partner bundles:"
-msgstr ""
-"Це не було б можливим без кампанії Indiegogo та тих, хто це зробив. Особлива"
-" подяка партнерам, які підтримали кампанію зі зв'язками партнерів-"
-"засновників:"
-
-#: ../../point_of_sale/overview/setup.rst:497
-msgid "Camptocamp"
-msgstr "Camptocamp"
-
-#: ../../point_of_sale/overview/setup.rst:498
-msgid "BHC"
-msgstr "BHC"
-
-#: ../../point_of_sale/overview/setup.rst:499
-msgid "openBig"
-msgstr "openBig"
-
-#: ../../point_of_sale/overview/setup.rst:500
-msgid "Eeezee-IT"
-msgstr "Eeezee-IT"
-
-#: ../../point_of_sale/overview/setup.rst:501
-msgid "Solarsis LDA"
-msgstr "Solarsis LDA"
-
-#: ../../point_of_sale/overview/setup.rst:502
-msgid "ACSONE"
-msgstr "ACSONE"
-
-#: ../../point_of_sale/overview/setup.rst:503
-msgid "Vauxoo"
-msgstr "Vauxoo"
-
-#: ../../point_of_sale/overview/setup.rst:504
-msgid "Ekomurz"
-msgstr "Ekomurz"
-
-#: ../../point_of_sale/overview/setup.rst:505
-msgid "Datalp"
-msgstr "Datalp"
-
-#: ../../point_of_sale/overview/setup.rst:506
-msgid "Dao Systems"
-msgstr "Dao Systems"
-
-#: ../../point_of_sale/overview/setup.rst:507
-msgid "Eggs Solutions"
-msgstr "Eggs Solutions"
-
-#: ../../point_of_sale/overview/setup.rst:508
-msgid "OpusVL"
-msgstr "OpusVL"
-
-#: ../../point_of_sale/overview/setup.rst:510
-msgid ""
-"And also the partners who've backed the development with the Founding POSBox"
-" Bundle:"
-msgstr ""
-"А також партнери, які підтримали розробку за допомогою пакету POSBox із "
-"заснування:"
-
-#: ../../point_of_sale/overview/setup.rst:513
-msgid "Willow IT"
-msgstr "Willow IT"
-
-#: ../../point_of_sale/overview/setup.rst:514
-msgid "E\\. Akhalwaya & Sons"
-msgstr "E\\. Akhalwaya & Sons"
-
-#: ../../point_of_sale/overview/setup.rst:515
-msgid "Multibase"
-msgstr "Multibase"
-
-#: ../../point_of_sale/overview/setup.rst:516
-msgid "Mindesa"
-msgstr "Mindesa"
-
-#: ../../point_of_sale/overview/setup.rst:517
-msgid "bpso.biz"
-msgstr "bpso.biz"
-
-#: ../../point_of_sale/overview/setup.rst:518
-msgid "Shine IT."
-msgstr "Shine IT."
-
 #: ../../point_of_sale/overview/start.rst:3
 msgid "Getting started with Odoo Point of Sale"
 msgstr "Розпочніть точку продажу в Odoo"
@@ -2118,6 +1003,12 @@ msgstr ""
 msgid "It's done, you have now closed your first PoS session."
 msgstr "Все зроблено, ви закрили свою першу сесію точки продажу."
 
+#: ../../point_of_sale/overview/start.rst:133
+msgid ""
+"To connect the PoS to hardware with an Odoo IoT Box, please see the section "
+":doc:`../../../iot/connect` and :doc:`../../../iot/pos`"
+msgstr ""
+
 #: ../../point_of_sale/restaurant.rst:3
 msgid "Advanced Restaurant Features"
 msgstr "Розширені особливості ресторану"
@@ -2195,10 +1086,8 @@ msgstr ""
 
 #: ../../point_of_sale/restaurant/kitchen_printing.rst:16
 msgid ""
-"Under the PosBox / Hardware Proxy category, you will find *Order Printers*."
+"Under the IoT Box / Hardware Proxy category, you will find *Order Printers*."
 msgstr ""
-"Під категорією Точка продажу/Апаратний проксі ви знайдете *Замовлення "
-"принтерів*."
 
 #: ../../point_of_sale/restaurant/kitchen_printing.rst:19
 msgid "Add a printer"
@@ -2550,11 +1439,9 @@ msgstr ""
 
 #: ../../point_of_sale/shop/cash_control.rst:24
 msgid ""
-"When clicking on *->Opening/Closing Values* you will be able to create those"
+"When clicking on **Opening/Closing Values** you will be able to create those"
 " values."
 msgstr ""
-"Якщо натиснути *->Відкриття/Закриття значення*, ви зможете створити ці "
-"значення."
 
 #: ../../point_of_sale/shop/cash_control.rst:31
 msgid "Start a session"
diff --git a/locale/uk/LC_MESSAGES/portal.po b/locale/uk/LC_MESSAGES/portal.po
index 4a6e7ede8..fc1280f5c 100644
--- a/locale/uk/LC_MESSAGES/portal.po
+++ b/locale/uk/LC_MESSAGES/portal.po
@@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-07-23 12:10+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Alina Semeniuk <alinasemeniuk1@gmail.com>, 2018\n"
+"Last-Translator: Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018\n"
 "Language-Team: Ukrainian (https://www.transifex.com/odoo/teams/41243/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: ../../portal/my_odoo_portal.rst:6
 msgid "My Odoo Portal"
-msgstr ""
+msgstr "Мій портал Odoo"
 
 #: ../../portal/my_odoo_portal.rst:8
 msgid ""
@@ -28,6 +28,9 @@ msgid ""
 "you and Odoo, documents such Quotations, Sales Orders, Invoices and your "
 "Subscriptions."
 msgstr ""
+"У цьому розділі порталу ви знайдете всі комунікації між вами та Odoo, "
+"документи такі, як комерційні пропозиції, замовлення на продаж, рахунки-"
+"фактури та ваші підписки."
 
 #: ../../portal/my_odoo_portal.rst:11
 msgid ""
@@ -35,6 +38,10 @@ msgid ""
 "`Odoo <https://www.odoo.com/my/home>`__ . If you are already logged-in just "
 "click on your name on the top-right corner and select \"My Account\"."
 msgstr ""
+"Щоб отримати доступ до цього розділу, вам потрібно ввести ім'я користувача "
+"та пароль для `Odoo <https://www.odoo.com/my/home>`__ . Якщо ви вже "
+"зареєстровані, просто натисніть своє ім'я у верхньому правому куті та "
+"виберіть \"Мій акаунт\"."
 
 #: ../../portal/my_odoo_portal.rst:20
 msgid "Quotations"
@@ -46,6 +53,10 @@ msgid ""
 "quotation can be generated for you after adding an Application or a User to "
 "your database or if your contract has to be renewed."
 msgstr ""
+"Тут ви знайдете всі комерційні пропозиції, надіслані вам від Odoo. "
+"Наприклад, комерційна пропозиція може бути згенерована для вас після "
+"додавання Додатку або Користувача до вашої бази даних або якщо ваш контракт "
+"має бути поновлений."
 
 #: ../../portal/my_odoo_portal.rst:29
 msgid ""
@@ -54,6 +65,10 @@ msgid ""
 "will see all the details of the offer, the pricing and other useful "
 "information."
 msgstr ""
+"Колонка *Дійсний до* показується, поки комерційна пропозиція дійсна; після "
+"цієї дати комерційна пропозиція буде \"Закінчено\". Натиснувши на комерційну"
+" пропозицію, ви побачите всі деталі пропозиції, ціни та іншу корисну "
+"інформацію."
 
 #: ../../portal/my_odoo_portal.rst:36
 msgid ""
@@ -61,6 +76,10 @@ msgid ""
 "quote will get confirmed. If you don't want to accept it, or you need to ask"
 " for some modifications, click on \"Ask Changes Reject\"."
 msgstr ""
+"Якщо ви хочете прийняти пропозицію, просто натисніть \"Прийняти та "
+"сплатити\", і комерційна пропозиція буде підтверджена. Якщо ви не бажаєте її"
+" приймати, або вам потрібно попросити про деякі зміни, натисніть кнопку "
+"\"Запросити зміни відхилу\"."
 
 #: ../../portal/my_odoo_portal.rst:41
 msgid "Sales Orders"
@@ -71,12 +90,16 @@ msgid ""
 "All your purchases within Odoo such as Upsells, Themes, Applications, etc. "
 "will be registered under this section."
 msgstr ""
+"Усі ваші купівлі в Odoo, такі як Допродаж, Теми, Додатки та ін. будуть "
+"зареєстровані в цьому розділі."
 
 #: ../../portal/my_odoo_portal.rst:49
 msgid ""
 "By clicking on the sale order you can review the details of the products "
 "purchased and process the payment."
 msgstr ""
+"Натиснувши на замовлення на продаж, ви можете переглянути деталі придбаних "
+"товарів та опрацювати платіж."
 
 #: ../../portal/my_odoo_portal.rst:53
 msgid "Invoices"
@@ -88,16 +111,21 @@ msgid ""
 "will be shown in this section. The tag before the Amount Due will indicate "
 "you if the invoice has been paid."
 msgstr ""
+"Усі рахунки-фактури вашої підписки, або згенеровані замовленням на продаж, "
+"відображатимуться у цьому розділі. Тег до суми витрат означатиме, чи було "
+"виставлено рахунок-фактуру."
 
 #: ../../portal/my_odoo_portal.rst:62
 msgid ""
 "Just click on the Invoice if you wish to see more information, pay the "
 "invoice or download a PDF version of the document."
 msgstr ""
+"Просто натисніть \"Рахунок-фактура\", якщо ви хочете побачити більше "
+"інформації, оплатити рахунок-фактуру або завантажити PDF-версію документа."
 
 #: ../../portal/my_odoo_portal.rst:66
 msgid "Tickets"
-msgstr "Квитки"
+msgstr "Заявки"
 
 #: ../../portal/my_odoo_portal.rst:68
 msgid ""
@@ -106,6 +134,9 @@ msgid ""
 "all the tickets that you have opened, the conversation between you and our "
 "Agents, the Status of the ticket and the ID (# Ref)."
 msgstr ""
+"Коли ви подаєте заявку через `Підтримку Odoo <https://www.odoo.com/help>`__ "
+", буде створено заявку. Тут ви можете знайти всі відкриті вами заявку, "
+"розмову між вами та нашими агентами, статус заявки та ідентифікатор (# Ref)."
 
 #: ../../portal/my_odoo_portal.rst:77
 msgid "Subscriptions"
@@ -116,6 +147,8 @@ msgid ""
 "You can access to your Subscription with Odoo from this section. The first "
 "page shows you the subscriptions that you have and their status."
 msgstr ""
+"Ви можете отримати доступ до своєї підписки Odoo в цьому розділі. На першій "
+"сторінці відображаються ваші підписки та їхній статус."
 
 #: ../../portal/my_odoo_portal.rst:85
 msgid ""
@@ -123,12 +156,16 @@ msgid ""
 " your plan: this includes the number of applications purchased, the billing "
 "information and the payment method."
 msgstr ""
+"Натиснувши на підписку, ви отримаєте доступ до всіх деталей вашого плану: це"
+" включає кількість придбаних додатків, платіжну інформацію та спосіб оплати."
 
 #: ../../portal/my_odoo_portal.rst:89
 msgid ""
 "To change the payment method click on \"Change Payment Method\" and enter "
 "the new credit card details."
 msgstr ""
+"Щоби змінити спосіб оплати, натисніть \"Змінити спосіб оплати\" та введіть "
+"нові дані про кредитну картку."
 
 #: ../../portal/my_odoo_portal.rst:95
 msgid ""
@@ -136,6 +173,9 @@ msgid ""
 "\"Manage you payment methods\" at the bottom of the page. Click then on "
 "\"Delete\" to delete the payment method."
 msgstr ""
+"Якщо ви хочете видалити збережені кредитні картки, ви можете зробити це, "
+"натиснувши кнопку \"Керування методами оплати\" внизу сторінки. Натисніть "
+"\"Видалити\", щоби видалити спосіб оплати."
 
 #: ../../portal/my_odoo_portal.rst:102
 msgid ""
@@ -145,10 +185,15 @@ msgid ""
 " of payment. After this delay, the subscription will be closed and you will "
 "no longer be able to access the database."
 msgstr ""
+"На дату наступного рахунка-фактури, якщо платіжна інформація відсутня або "
+"якщо термін дії вашої кредитної картки закінчився, статус вашої підписки "
+"буде змінено на \"Відновити\". Після цього ви матимете 7 днів, щоби надати "
+"дійсний спосіб оплати. Після цієї затримки підписка буде закрита, і ви "
+"більше не зможете отримати доступ до бази даних."
 
 #: ../../portal/my_odoo_portal.rst:109
 msgid "Success Packs"
-msgstr ""
+msgstr "Пакети послуг"
 
 #: ../../portal/my_odoo_portal.rst:110
 msgid ""
@@ -157,9 +202,16 @@ msgid ""
 "and optimize your workflows as part of your initial implementation. These "
 "hours never expire allowing you to utilize them whenever you need support."
 msgstr ""
+"Завдяки пакету послуг/пакету послуг партнера вам призначено експерта для "
+"надання унікальної персоналізованої допомоги, яка допоможе вам налаштувати "
+"рішення та оптимізувати робочі процеси як частину початкової реалізації. Ці "
+"години ніколи не закінчуються, що дозволяє вам використовувати їх, коли вам "
+"потрібна підтримка."
 
 #: ../../portal/my_odoo_portal.rst:116
 msgid ""
 "If you need information about how to manage your database see "
 ":ref:`db_online`"
 msgstr ""
+"Якщо вам потрібна інформація про те, як керувати своєю базою даних, дивіться"
+" :ref:`db_online`"
diff --git a/locale/uk/LC_MESSAGES/practical.po b/locale/uk/LC_MESSAGES/practical.po
index 154839b7f..cd56d9012 100644
--- a/locale/uk/LC_MESSAGES/practical.po
+++ b/locale/uk/LC_MESSAGES/practical.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2015-TODAY, Odoo S.A.
-# This file is distributed under the same license as the Odoo Business package.
+# This file is distributed under the same license as the Odoo package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 10.0\n"
+"Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-07 09:30+0200\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Alina Semeniuk <alinasemeniuk1@gmail.com>, 2018\n"
+"Last-Translator: Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018\n"
 "Language-Team: Ukrainian (https://www.transifex.com/odoo/teams/41243/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/locale/uk/LC_MESSAGES/project.po b/locale/uk/LC_MESSAGES/project.po
index e8b0b7ca1..ca9e3f55a 100644
--- a/locale/uk/LC_MESSAGES/project.po
+++ b/locale/uk/LC_MESSAGES/project.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-26 12:01+0200\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018\n"
 "Language-Team: Ukrainian (https://www.transifex.com/odoo/teams/41243/uk/)\n"
@@ -20,15 +20,15 @@ msgstr ""
 
 #: ../../project.rst:5
 msgid "Project"
-msgstr ""
+msgstr "Проект"
 
 #: ../../project/advanced.rst:3
 msgid "Advanced"
-msgstr ""
+msgstr "Розширено"
 
 #: ../../project/advanced/feedback.rst:3
 msgid "How to gather feedback from customers?"
-msgstr ""
+msgstr "Як отримувати відгуки від клієнтів у Odoo?"
 
 #: ../../project/advanced/feedback.rst:6
 #: ../../project/configuration/setup.rst:6
@@ -44,6 +44,10 @@ msgid ""
 "performances of your teams. You can very easily gather feedbacks from your "
 "customers using Odoo."
 msgstr ""
+"Менеджеру не завжди просто слідкувати за всіма командами. Отримання простих "
+"відгуків від клієнтів може бути дуже цікавим для оцінки результатів роботи "
+"вашої команди. Ви можете легко зібрати відгуки від своїх клієнтів, "
+"використовуючи Odoo."
 
 #: ../../project/advanced/feedback.rst:13
 msgid ""
@@ -51,10 +55,13 @@ msgid ""
 "just has to choose between 3 smileys to assess your work (Smile, Neutral or "
 "Sad)."
 msgstr ""
+"Електронна пошта може бути відправлена протягом проекту, щоб отримати "
+"зворотній зв'язок від клієнта. Він просто повинен вибрати один із трьох "
+"смайлів для оцінки вашої роботи (посмішка, нейтральний або сумний)."
 
 #: ../../project/advanced/feedback.rst:18
 msgid "How to gather feedbacks from customers"
-msgstr ""
+msgstr "Як отримати зворотній зв'язок від клієнтів"
 
 #: ../../project/advanced/feedback.rst:20
 msgid ""
@@ -62,12 +69,16 @@ msgid ""
 "necessary to install the **Project** application. To do so simply go to the "
 "apps module and install it."
 msgstr ""
+"Перед початком роботи потрібна певна конфігурація. Перш за все необхідно "
+"встановити додаток **Проект**. Для цього просто перейдіть до модуля додатків"
+" та встановіть його."
 
 #: ../../project/advanced/feedback.rst:27
 msgid ""
 "Moreover, in the same menu, you have to install the **Project Rating** "
 "module."
 msgstr ""
+"Крім того, у тому ж меню потрібно встановити модуль **Оцінки проекту**."
 
 #: ../../project/advanced/feedback.rst:33
 msgid ""
@@ -76,34 +87,43 @@ msgid ""
 "Next select **Allow activating customer rating on projects, at issue "
 "completion**. Don't forget to apply your changes."
 msgstr ""
+"Потім поверніться назад і введіть модуль проекту. Виберіть кнопку "
+"**Налаштування** та натисніть **Налаштування** у спадному меню. Далі "
+"виберіть **Дозволити активацію оцінювання клієнтів на проектах під час "
+"закриття проблеми**. Не забудьте застосувати свої зміни."
 
 #: ../../project/advanced/feedback.rst:42
 msgid "How to get a Customer feedback?"
-msgstr ""
+msgstr "Як отримати відгук клієнтів?"
 
 #: ../../project/advanced/feedback.rst:44
 msgid ""
 "A e-mail can be sent to the customers at each stage of the ongoing projects."
 msgstr ""
+"Електронний лист може бути відправлений клієнтам на кожному етапі поточних "
+"проектів."
 
 #: ../../project/advanced/feedback.rst:47
 msgid ""
 "First, you need to choose for which projects you want to get a feedback."
 msgstr ""
+"По-перше, потрібно вибрати, для яких проектів ви хочете отримати відгук."
 
 #: ../../project/advanced/feedback.rst:50
 msgid "Project configuration"
-msgstr ""
+msgstr "Налаштування проекту"
 
 #: ../../project/advanced/feedback.rst:52
 msgid ""
 "Go to the **Project** application, in the project settings select the "
 "**Customer satisfaction** option."
 msgstr ""
+"Перейдіть до програми **Проект**, в налаштуваннях проекту виберіть параметр "
+"**Задоволення клієнтів**."
 
 #: ../../project/advanced/feedback.rst:59
 msgid "Email Template"
-msgstr ""
+msgstr "Шаблон електронного листа"
 
 #: ../../project/advanced/feedback.rst:61
 msgid ""
@@ -111,10 +131,14 @@ msgid ""
 "column, then select **Edit**). Choose the e-mail template that will be used."
 " You can directly edit it from there."
 msgstr ""
+"Перейдіть до налаштувань етапу (натисніть значок шестірні у верхній частині "
+"стовпця етапу, потім виберіть **Редагувати**). Виберіть шаблон електронного "
+"листа, який буде використовуватися. Ви можете безпосередньо редагувати його "
+"там."
 
 #: ../../project/advanced/feedback.rst:68
 msgid "Here is an email example that a customer can receive :"
-msgstr ""
+msgstr "Ось приклад електронного листа, який клієнт може отримати:"
 
 #: ../../project/advanced/feedback.rst:74
 msgid ""
@@ -122,6 +146,9 @@ msgid ""
 " your work. The customer can reply to the email to add more information. It "
 "will be added to the chatter of the task."
 msgstr ""
+"Клієнт повинен натиснути на посмішку (Посмішка, Нейтральний або Сумний), щоб"
+" оцінити вашу роботу. Клієнт може відповісти на електронний лист, щоб додати"
+" більше інформації. Він буде доданий до чату завдання."
 
 #: ../../project/advanced/feedback.rst:79
 msgid "Reporting"
@@ -132,22 +159,27 @@ msgid ""
 "You have a brief summary on the satisfaction in the upper right corner of "
 "the project."
 msgstr ""
+"У вас є стислий виклад про задоволення в правому верхньому кутку проекту."
 
 #: ../../project/advanced/feedback.rst:88
 msgid "How to display the ratings on your website?"
-msgstr ""
+msgstr "Як відображати оцінювання на вашому веб-сайті?"
 
 #: ../../project/advanced/feedback.rst:90
 msgid ""
 "First of all it's necessary to install the **Website Builder** application. "
 "To do so simply go to the apps module and search for the website builder."
 msgstr ""
+"Перш за все необхідно встановити програму **Конструктор веб-сайту**. Для "
+"цього просто перейдіть до модуля додатків та знайдіть конструктор веб-сайту."
 
 #: ../../project/advanced/feedback.rst:97
 msgid ""
 "Moreover, in the same menu, you have to install the **Website Rating Project"
 " Issue** module."
 msgstr ""
+"Крім того, в тому ж меню потрібно встановити модуль **Оцінка проблем "
+"проекту** веб-сайту."
 
 #: ../../project/advanced/feedback.rst:103
 msgid ""
@@ -155,14 +187,13 @@ msgid ""
 " the website button in the upper right corner and confirming it in the front"
 " end of the website."
 msgstr ""
-
-#: ../../project/advanced/feedback.rst:111
-msgid ":doc:`claim_issue`"
-msgstr ""
+"Потім ви зможете опублікувати свій результат на своєму веб-сайті, натиснувши"
+" кнопку веб-сайту в правому верхньому кутку та підтвердіть його в передній "
+"частині веб-сайту."
 
 #: ../../project/advanced/so_to_task.rst:3
 msgid "How to create tasks from sales orders?"
-msgstr ""
+msgstr "Як створити завдання із замовлення на продаж в Odoo?"
 
 #: ../../project/advanced/so_to_task.rst:5
 msgid ""
@@ -170,6 +201,9 @@ msgid ""
 "management** and **Sales** modules and more precisely how to generate tasks "
 "from sales order lines."
 msgstr ""
+"У цьому розділі ми побачимо інтеграцію між **Управлінням проектом** Odoo та "
+"модулями **Продажу** та, більш точно, як генерувати завдання з рядків "
+"замовлення на продаж."
 
 #: ../../project/advanced/so_to_task.rst:9
 msgid ""
@@ -180,6 +214,11 @@ msgid ""
 "task from a sale order in order to streamline the process between the Sales "
 "and Services departments."
 msgstr ""
+"Завдання в управлінні проектом - це діяльність, яка повинна виконуватися "
+"протягом певного періоду часу. Для компанії, що продає послуги, зазвичай це "
+"завдання представляє собою послугу, яка була продана клієнту і яка повинна "
+"бути доставлена. Ось чому корисно мати можливість генерувати завдання із "
+"замовлення на продаж, щоб спростити процес між відділами продажу та послуг."
 
 #: ../../project/advanced/so_to_task.rst:16
 msgid ""
@@ -190,6 +229,12 @@ msgid ""
 "will record timesheets and, if needed, reinvoice the client according to the"
 " overtime spent on the project."
 msgstr ""
+"Наприклад, ви можете продати ``50-годинну`` підтримку в розмірі ``25 000 "
+"доларів`` США. Ціна фіксується та сплачується спочатку. Але ви хочете "
+"стежити за підтримкою, яку ви надали клієнту. У замовленні на продаж послуга"
+" буде ініціювати створення завдання, з якого консультант буде записувати "
+"табелі та, у разі необхідності, виставляти додатково рахунок клієнту "
+"відповідно до понаднормових витрат, витрачених на проект."
 
 #: ../../project/advanced/so_to_task.rst:24
 #: ../../project/configuration/time_record.rst:12
@@ -199,7 +244,7 @@ msgstr "Налаштування"
 
 #: ../../project/advanced/so_to_task.rst:27
 msgid "Install the required applications"
-msgstr ""
+msgstr "Встановіть необхідні модулі"
 
 #: ../../project/advanced/so_to_task.rst:29
 msgid ""
@@ -207,6 +252,9 @@ msgid ""
 "install the **Sales Management** and **Project** application. Simply go into"
 " the application module and install the following:"
 msgstr ""
+"Щоб мати можливість генерувати завдання із замовлення на продаж, вам "
+"потрібно буде встановити програму **Управління продажами** та **Проект**. "
+"Просто перейдіть у модуль додатків та встановіть наступне:"
 
 #: ../../project/advanced/so_to_task.rst:39
 msgid ""
@@ -214,10 +262,13 @@ msgid ""
 "spent on the task, it is also necessary to install the **Timesheet** module."
 " Simply go into the application module and install the following:"
 msgstr ""
+"Якщо ви хочете мати рахунки для своїх клієнтів у залежності від часу, "
+"витраченого на завдання, необхідно встановити модуль **Табель**. Просто "
+"перейдіть у додатки та встановіть наступне:"
 
 #: ../../project/advanced/so_to_task.rst:47
 msgid "Create and set up a product"
-msgstr ""
+msgstr "Створіть та налаштуйте товар"
 
 #: ../../project/advanced/so_to_task.rst:49
 msgid ""
@@ -226,6 +277,10 @@ msgid ""
 "the menu :menuselection:`Sales --> Products` and create a new product with "
 "the`following setup:"
 msgstr ""
+"Вам потрібно налаштувати свою послугу на самій формі товару, щоби створювати"
+" завдання кожного разу, коли вона буде продаватися. У модулі **Продажі** "
+"використовуйте меню :menuselection:`Продажі --> Товари`  і створіть новий "
+"товар з наступним налаштуванням:"
 
 #: ../../project/advanced/so_to_task.rst:54
 msgid "**Name**: Technical Support"
@@ -241,6 +296,10 @@ msgid ""
 "Settings` and, under **Unit of measures**, check the **Some products may be "
 "sold/purchased in different unit of measures (advanced)** radio button)"
 msgstr ""
+"**Одиниця вимірювання**: Години (перейдіть до :menuselection:`Налаштування "
+"--> Налаштування` та в розділі **Одиниці вимірювання** перевірте кнопку "
+"**Деякі товари можуть бути продані/придбані в різних одиницях вимірювань "
+"(розширені)**)"
 
 #: ../../project/advanced/so_to_task.rst:63
 msgid ""
@@ -248,6 +307,10 @@ msgid ""
 "quantity or on delivered quantity. You can easily follow the amount of hours"
 " that were delivered and/or invoiced to your client."
 msgstr ""
+"**Політика щодо виставлення рахунків**: Ви можете налаштувати політику "
+"рахунків-фактур як за замовленою кількістю, так за кількістю, що "
+"доставляється. Ви можете легко стежити за кількістю годин, які були "
+"доставлені та/або рахунки-фактури для вашого клієнта."
 
 #: ../../project/advanced/so_to_task.rst:68
 msgid ""
@@ -255,6 +318,9 @@ msgid ""
 "service invoiceable by hours you have to set the units of measures of the "
 "product to hours as well."
 msgstr ""
+"**Відстеження послуги**: створіть завдання та відстежуйте години, тому що "
+"ваш товар - це послуга, що виставляється у рахунках за години, де ви також "
+"повинні встановлювати одиниці вимірювання товару за годину."
 
 #: ../../project/advanced/so_to_task.rst:76
 msgid ""
@@ -262,10 +328,13 @@ msgid ""
 "product is specific to one project. Otherwise, you can leave it blank, odoo "
 "will then create a project per SO."
 msgstr ""
+"Пов'яжіть ваше завдання з існуючим проектом або створіть новий \"на льоту\","
+" якщо товар відповідає конкретному проекту. В іншому випадку, ви можете "
+"залишити це порожнім, Odoo потім створить проект на замовлення на продаж."
 
 #: ../../project/advanced/so_to_task.rst:81
 msgid "Create the Sales Order"
-msgstr ""
+msgstr "Створіть замовлення на продаж"
 
 #: ../../project/advanced/so_to_task.rst:83
 msgid ""
@@ -273,19 +342,22 @@ msgid ""
 "the related product. Once the quotation is confirmed and transformed into a "
 "sale order, the task will be created."
 msgstr ""
+"Після налаштування товару можна створити комерційну пропозицію або "
+"замовлення на продаж з відповідним товаром. Коли комерційну пропозицію буде "
+"підтверджено та перетворено в замовлення на продаж, завдання буде створено."
 
 #: ../../project/advanced/so_to_task.rst:91
 msgid "Access the task generated from the sale order"
-msgstr ""
+msgstr "Надайте доступ до завдання, створене за замовленням на продаж"
 
 #: ../../project/advanced/so_to_task.rst:93
 msgid "On the Project module, your new task will appear :"
-msgstr ""
+msgstr "На модулі проекту з'явиться ваше нове завдання:"
 
 #: ../../project/advanced/so_to_task.rst:95
 msgid ""
 "either on a related project if you have selected one in the product form"
-msgstr ""
+msgstr "або на пов'язаному проекті, якщо ви вибрали одне у формі товару"
 
 #: ../../project/advanced/so_to_task.rst:98
 msgid ""
@@ -293,50 +365,59 @@ msgid ""
 "(you can easily change the name of the project by clicking on "
 ":menuselection:`More --> Settings`)"
 msgstr ""
+"або на новому проекті з назвою пов'язаного замовлення на продаж як заголовок"
+" (ви можете легко змінити назву проекту, натиснувши кнопку "
+":menuselection:`Більше --> Налаштування`)"
 
 #: ../../project/advanced/so_to_task.rst:105
 msgid ""
 "On the task itself, you will now be able to record timesheets and to invoice"
 " your customers based on your invoicing policy."
 msgstr ""
+"На самому завданні тепер ви зможете записувати табелі та виставляти рахунки "
+"вашим клієнтам на основі політики щодо виставлення рахунків."
 
 #: ../../project/advanced/so_to_task.rst:109
 msgid ""
 "On Odoo, the central document is the sales order, which means that the "
 "source document of the task is the related sales order."
 msgstr ""
+"В Odoo центральним документом є замовлення на продаж, що означає, що "
+"вихідним документом завдання є пов'язане замовлення на продаж."
 
 #: ../../project/advanced/so_to_task.rst:113
 #: ../../project/planning/assignments.rst:137
 msgid ":doc:`../configuration/setup`"
-msgstr ""
+msgstr ":doc:`../configuration/setup`"
 
 #: ../../project/advanced/so_to_task.rst:114
 msgid ":doc:`../../sales/invoicing/services/reinvoice`"
-msgstr ""
+msgstr ":doc:`../../sales/invoicing/services/reinvoice`"
 
 #: ../../project/advanced/so_to_task.rst:115
 msgid ":doc:`../../sales/invoicing/services/support`"
-msgstr ""
+msgstr ":doc:`../../sales/invoicing/services/support`"
 
 #: ../../project/application.rst:3
 msgid "Awesome Timesheet App"
-msgstr ""
+msgstr "Додаток Чудовий Табель"
 
 #: ../../project/application/intro.rst:3
 msgid "Demonstration Video"
-msgstr ""
+msgstr "Демонстративне відео"
 
 #: ../../project/application/intro.rst:11
 #: ../../project/overview/main_concepts/introduction.rst:11
 msgid "Transcript"
-msgstr "Транскрипція"
+msgstr "Опис"
 
 #: ../../project/application/intro.rst:13
 msgid ""
 "Awesome Timesheet is a mobile app that helps me to instantly record any time"
 " spent on projects in just a click. It's so effortless."
 msgstr ""
+"Чудовий табель - це мобільний додаток, який допомагає мені миттєво "
+"записувати будь-який час, витрачений на проекти в один клік. Це так легко."
 
 #: ../../project/application/intro.rst:16
 msgid ""
@@ -344,6 +425,10 @@ msgid ""
 "the chrome plugin. No need to sign in, just click and start. It's smooth. It"
 " works offline too and is automatically synchronized with my Odoo account."
 msgstr ""
+"Незалежно від пристрою, додаток табелю показується лише одним клацанням "
+"миші. Подивіться на плагін Chrome. Не потрібно входити, просто натисніть і "
+"запустіть його. Це просто. Він також працює в автономному режимі та "
+"автоматично синхронізується з моїм обліковим записом Odoo."
 
 #: ../../project/application/intro.rst:21
 msgid ""
@@ -351,6 +436,10 @@ msgid ""
 " further in the analysis in my Odoo account. I receive reports of timesheets"
 " per user, drill-down per project, and much more."
 msgstr ""
+"Крім того, я отримую індивідуальну статистику за допомогою мобільного та "
+"плагіну Chrome. Я можу просуватися в аналізі в моєму обліковому записі Odoo."
+" Я отримую звіти про табелі для кожного користувача, детальну інформацію про"
+" проект, і багато іншого."
 
 #: ../../project/application/intro.rst:25
 msgid ""
@@ -358,18 +447,20 @@ msgid ""
 "billing is done automatically. But also with Odoo projects. It's time-"
 "saving!"
 msgstr ""
+"Чудовий табель повністю інтегрований з рахунками Odoo, клієнтські рахунки "
+"здійснюється автоматично. Але також з проектами Odoo. Це економія часу!"
 
 #: ../../project/application/intro.rst:28
 msgid "Download awesome timesheet now and gain in productivity."
-msgstr ""
+msgstr "Завантажте чудовий табель зараз і підвищіть продуктивність."
 
 #: ../../project/configuration.rst:3
 msgid "Configuration and basic usage"
-msgstr ""
+msgstr "Налаштування та базове використання"
 
 #: ../../project/configuration/collaboration.rst:3
 msgid "How to manage & collaborate on tasks?"
-msgstr ""
+msgstr "Як керувати завданнями та співпрацювати на них?"
 
 #: ../../project/configuration/collaboration.rst:6
 msgid "Responsibilities"
@@ -377,7 +468,7 @@ msgstr "Обов'язки"
 
 #: ../../project/configuration/collaboration.rst:8
 msgid "In Odoo, you can assign the person who is in charge of the task."
-msgstr ""
+msgstr "В Odoo можна призначити особу, яка відповідає за завдання."
 
 #: ../../project/configuration/collaboration.rst:10
 msgid ""
@@ -385,16 +476,21 @@ msgid ""
 "this by simply typing the username of someone else and choosing it from the "
 "suggestions in the drop down menu."
 msgstr ""
+"При створенні завдання за замовчуванням ви відповідальні за нього. Ви можете"
+" змінити це, просто набравши інше ім'я користувача та вибравши його з "
+"пропозицій у випадаючому меню."
 
 #: ../../project/configuration/collaboration.rst:15
 msgid ""
 "If you add someone new, you can \"Create & Edit\" a new user on the fly. In "
 "order to do so, you need the administrator rights."
 msgstr ""
+"Якщо ви додаєте когось нового, ви можете \"Створити та редагувати\" нового "
+"користувача \"на льоту\". Для цього вам потрібні права адміністратора."
 
 #: ../../project/configuration/collaboration.rst:19
 msgid "Followers"
-msgstr ""
+msgstr "Підписники"
 
 #: ../../project/configuration/collaboration.rst:21
 msgid ""
@@ -407,10 +503,18 @@ msgid ""
 "take part in it simply by replying to the mail. The followers can see the "
 "whole task like you, with the description and the chatter."
 msgstr ""
+"У завданні можна додати інших користувачів, як **Підписників**. Додавання "
+"підписника означає, що цю людину буде повідомлено про будь-які зміни, які "
+"можуть статися в завданні. Мета полягає в тому, щоб дозволити зовнішні "
+"внесення змін з чату. Це може стати безцінним, коли вам потрібна порада "
+"колег з інших відділів. Ви також можете запросити клієнтів взяти участь у "
+"завданні. Вони будуть повідомлені електронною поштою про розмову в чаті, і "
+"зможуть взяти участь у ньому, просто відповівши на лист. Підписники можуть "
+"бачити ціле таке завдання, як ви, з описом і чатом."
 
 #: ../../project/configuration/collaboration.rst:32
 msgid "Project: follow a project to follow the pipe"
-msgstr ""
+msgstr "Проект: підпишіться на проект, щоби слідкувати за конвеєром"
 
 #: ../../project/configuration/collaboration.rst:34
 msgid ""
@@ -420,10 +524,15 @@ msgid ""
 "in your inbox. This feature is perfect for a Project Manager who wants to "
 "see the big picture all the time."
 msgstr ""
+"Ви можете прийняти рішення про виконання проекту. У цій ситуації вам буде "
+"повідомлено про будь-які зміни, внесені в проект: завдання, що рухаються з "
+"однієї стадії до іншої, відбувається розмова, і т. д. Ви отримаєте всю "
+"інформацію у своїй поштовій скриньці. Ця функція ідеально підходить для "
+"менеджера проектів, який хоче бачити загальну картину постійно."
 
 #: ../../project/configuration/collaboration.rst:41
 msgid "Task: follow a specific task"
-msgstr ""
+msgstr "Завдання: підпишіться на конкретне завдання"
 
 #: ../../project/configuration/collaboration.rst:43
 msgid ""
@@ -431,16 +540,21 @@ msgid ""
 "focused on a specific part of the project. All notifications or changes in "
 "that task also appear in your inbox."
 msgstr ""
+"Підписка на завдання - це та сама ідея, що й підписка на проект, за винятком"
+" того, що ви зосереджені на конкретній частині проекту. Усі сповіщення або "
+"зміни у цьому завданні також відображаються у папці \"Вхідні\"."
 
 #: ../../project/configuration/collaboration.rst:48
 msgid "Choose which action to follow"
-msgstr ""
+msgstr "Виберіть, які дії потрібно виконати"
 
 #: ../../project/configuration/collaboration.rst:50
 msgid ""
 "You can choose what you want to follow by clicking on the down arrow in the "
 "Following button."
 msgstr ""
+"Ви можете вибрати, за чим ви хочете стежити, натиснувши стрілку вниз на "
+"кнопці Стежити."
 
 #: ../../project/configuration/collaboration.rst:53
 msgid ""
@@ -448,28 +562,38 @@ msgid ""
 "notified when a note is logged in, when a task is created, blocked or ready "
 "to go, and when the stage of the task has changed."
 msgstr ""
+"За замовчуванням ви стежите за обговореннями, але ви також можете вибрати, "
+"щоб отримувати сповіщення про вхід до нотатки, коли завдання створюється, "
+"заблоковано або готове до виконання, а також коли стадія завдання змінилася."
 
 #: ../../project/configuration/collaboration.rst:61
 msgid "Time management: analytic accounts"
-msgstr ""
+msgstr "Управління часом: аналітичні обліки"
 
 #: ../../project/configuration/collaboration.rst:63
 msgid ""
 "Whether it helps you for estimation of future projects or data for billing "
 "or invoicing, time tracking in Project Management is a real plus."
 msgstr ""
+"Незалежно від того, чи це допоможе вам оцінити майбутні проекти чи дані для "
+"виставлення рахунків, відстеження часу в Управлінні проектами є справжнім "
+"плюсом."
 
 #: ../../project/configuration/collaboration.rst:67
 msgid ""
 "The Odoo Timesheet app is perfectly integrated with Odoo Project and can "
 "help you track time easily."
 msgstr ""
+"Додаток Табель Odoo ідеально інтегрований з Проектом Odoo і може допомогти "
+"легко відстежувати час."
 
 #: ../../project/configuration/collaboration.rst:70
 msgid ""
 "Once Odoo Timesheet is installed, the timesheet option is automatically "
 "available in projects and on tasks."
 msgstr ""
+"Після встановлення Табеля Odoo параметр табеля автоматично доступний у "
+"проектах та на завданнях."
 
 #: ../../project/configuration/collaboration.rst:73
 msgid ""
@@ -478,18 +602,22 @@ msgid ""
 " or contract. Each time a project is created, an analytic account is "
 "automatically created under the same name."
 msgstr ""
+"Щоб уникнути будь-якої плутанини, Odoo працює з аналітичними обліками. "
+"Аналітичний облік - це ім'я, яке завжди буде посиланням на конкретний проект"
+" або контракт. Кожен раз, коли створюється проект, аналітичний облік "
+"створюється автоматично під одним іменем."
 
 #: ../../project/configuration/collaboration.rst:79
 msgid "Record a timesheet on a project:"
-msgstr ""
+msgstr "Запишіть табель у проект:"
 
 #: ../../project/configuration/collaboration.rst:81
 msgid "Click on the settings of a project."
-msgstr ""
+msgstr "Натисніть на налаштування проекту."
 
 #: ../../project/configuration/collaboration.rst:86
 msgid "Click on the Timesheet button in the top grey menu."
-msgstr ""
+msgstr "Натисніть на кнопку Табеля у верхньому сірому меню."
 
 #: ../../project/configuration/collaboration.rst:91
 msgid ""
@@ -498,48 +626,60 @@ msgid ""
 "Analytic Account. No task is set, you can choose to add a specific task for "
 "it, or not."
 msgstr ""
+"Ви отримаєте Табель Odoo. Натисніть кнопку Створити, з'явиться рядок із "
+"сьогоднішньою датою та часом. Назва вашого проекту автоматично вибирається "
+"як Аналітичний облік. Не задано жодного завдання, ви можете додати конкретне"
+" завдання для нього чи ні."
 
 #: ../../project/configuration/collaboration.rst:99
 msgid ""
 "If you go now to Odoo Timesheet, your line will be recorded among your other"
 " timesheets."
 msgstr ""
+"Якщо ви перейдете в Табель Odoo, ваш рядок буде записаний серед інших "
+"табелів."
 
 #: ../../project/configuration/collaboration.rst:103
 msgid "Record a timesheet on a task:"
-msgstr ""
+msgstr "Запишіть табель на завданні:"
 
 #: ../../project/configuration/collaboration.rst:105
 msgid "Within a task, the timesheet option is also available."
-msgstr ""
+msgstr "У межах завдання також доступний параметр табелю."
 
 #: ../../project/configuration/collaboration.rst:107
 msgid ""
 "In the task, click on the Edit button. Go on the Timesheet tab and click on "
 "Add an item."
 msgstr ""
+"У вікні завдання натисніть кнопку Редагувати. Перейдіть на вкладку Табель та"
+" натисніть Додати елемент."
 
 #: ../../project/configuration/collaboration.rst:110
 msgid ""
 "A line will appear with the name of the project already selected in the "
 "Analytic account."
 msgstr ""
+"З'явиться рядок з назвою проекту, вже вибраного в Аналітичному обліку."
 
 #: ../../project/configuration/collaboration.rst:113
 msgid ""
 "Again, you'll find back these timesheet lines in the Odoo Timesheet "
 "application."
-msgstr ""
+msgstr "Знову ж таки, ви знайдете ці рядки табелю у додатку Табель Odoo."
 
 #: ../../project/configuration/collaboration.rst:119
 msgid ""
 "At the end of your project, you can get a real idea of the time you spent on"
 " it by searching based on the Analytic Account name of your project."
 msgstr ""
+"Наприкінці вашого проекту ви можете отримати реальне уявлення про час, "
+"витрачений на нього, шляхом пошуку на основі аналітичного обліку вашого "
+"проекту."
 
 #: ../../project/configuration/collaboration.rst:124
 msgid "Document Management in tasks"
-msgstr ""
+msgstr "Управління документами у завданнях"
 
 #: ../../project/configuration/collaboration.rst:126
 msgid ""
@@ -547,12 +687,18 @@ msgid ""
 " the formatting, etc. An image is sometimes more informative than a thousand"
 " words! You have two ways to add a document to a task."
 msgstr ""
+"Ви можете керувати документами, пов'язаними із завданнями, незалежно від "
+"того, чи є вони планами, фотографіями тощо. Зображення іноді є більш "
+"інформативним, ніж тисяча слів! У вас є два способи додати документ до "
+"завдання."
 
 #: ../../project/configuration/collaboration.rst:130
 msgid ""
 "1. You can add an image/document to your task by clicking on the Attachment "
 "tab on the top of the form."
 msgstr ""
+"1. Ви можете додати зображення/документ до свого завдання, натиснувши "
+"вкладку Прикріплення у верхній частині форми."
 
 #: ../../project/configuration/collaboration.rst:136
 msgid ""
@@ -561,22 +707,31 @@ msgid ""
 "email with an attachment, the document will be automatically saved in the "
 "task."
 msgstr ""
+"2. Ви можете додати зображення/документ до свого завдання через Чат. Ви "
+"можете зареєструвати нотатку/відправити повідомлення та прикріпити до нього "
+"файл. Або, якщо хтось надсилає електронне повідомлення із вкладенням, "
+"документ буде автоматично збережений у завданні."
 
 #: ../../project/configuration/collaboration.rst:145
 msgid ""
 "If you have an important image that helps to understand the tasks you can "
 "set it up as Cover Image. It'll show up in the Kanban view directly."
 msgstr ""
+"Якщо у вас є важливе зображення, яке допомагає зрозуміти завдання, ви можете"
+" встановити його як обкладинку. Воно буде відображатися безпосередньо у "
+"вигляді Канбану."
 
 #: ../../project/configuration/collaboration.rst:152
 msgid "Collaborate on tasks"
-msgstr ""
+msgstr "Співпрацюйте на завданнях"
 
 #: ../../project/configuration/collaboration.rst:154
 msgid ""
 "Tasks in Odoo Project are made to help you to work easily together with your"
 " colleagues. This helps you save time and energy."
 msgstr ""
+"Завдання в Проекті Odoo створені, щоби допомогти вам легко працювати разом "
+"із колегами. Це допоможе вам заощадити час та енергію."
 
 #: ../../project/configuration/collaboration.rst:157
 msgid ""
@@ -584,10 +739,13 @@ msgid ""
 "with your colleagues by writing on the same task at the same time, with task"
 " delegation and the Chatter."
 msgstr ""
+"Ідея - бути в курсі того, що вас цікавить. Ви можете співпрацювати з "
+"колегами, написавши одне і те ж завдання одночасно, з делегуванням завдань "
+"та чатом."
 
 #: ../../project/configuration/collaboration.rst:162
 msgid "Create a task from an email"
-msgstr ""
+msgstr "Створіть завдання з електронного листа"
 
 #: ../../project/configuration/collaboration.rst:164
 msgid ""
@@ -595,12 +753,18 @@ msgid ""
 "sent to that address, it automatically creates a task in the first step of "
 "the project, with all the recipients (To/Cc/Bcc) as followers."
 msgstr ""
+"Ви можете налаштувати адресу електронної пошти, пов'язану з вашим проектом. "
+"Коли електронний лист надсилається на цю адресу, воно автоматично створює "
+"завдання на першому етапі проекту з усіма одержувачами (To/Cc/Bcc) як "
+"послідовниками."
 
 #: ../../project/configuration/collaboration.rst:168
 msgid ""
 "With Odoo Online, the mail gateway is already configured and so every "
 "project gets an automatic email address."
 msgstr ""
+"За допомогою Odoo Online поштовий шлюз вже налаштований, і тому кожен проект"
+" отримує автоматичну адресу електронної пошти."
 
 #: ../../project/configuration/collaboration.rst:171
 msgid ""
@@ -608,34 +772,42 @@ msgid ""
 "space), you'll see it under the name of your project in the Project "
 "Dashboard."
 msgstr ""
+"Електронна пошта завжди має назву проекту (замість пробілу \"-\"), ви "
+"побачите його під назвою вашого проекту на панелі інструментів проекту."
 
 #: ../../project/configuration/collaboration.rst:178
 msgid ""
 "This email address create by default following the project name can be "
 "changed."
 msgstr ""
+"Ця адреса електронної пошти створюється за замовчуванням, оскільки назва "
+"проекту може бути змінена."
 
 #: ../../project/configuration/collaboration.rst:181
 msgid "The alias of the email address can be changed by the project manager."
-msgstr ""
+msgstr "Псевдонім адреси електронної пошти може змінити менеджер проекту."
 
 #: ../../project/configuration/collaboration.rst:183
 msgid "To do so, go to the Project Settings and click on the Email Tab."
 msgstr ""
+"Для цього перейдіть до Налаштування проекту та натисніть вкладку Електронна "
+"пошта."
 
 #: ../../project/configuration/collaboration.rst:185
 msgid "You can directly edit your project email address."
-msgstr ""
+msgstr "Ви можете безпосередньо редагувати адресу електронної пошти проекту."
 
 #: ../../project/configuration/collaboration.rst:191
 msgid "The Chatter, status and follow-up."
-msgstr ""
+msgstr "Чат, статус та підписки"
 
 #: ../../project/configuration/collaboration.rst:193
 msgid ""
 "The Chatter is a very useful tool. It is a communication tool and shows the "
 "history of the task."
 msgstr ""
+"Чат є дуже корисним інструментом. Це комунікаційний інструмент і показує "
+"історію завдання."
 
 #: ../../project/configuration/collaboration.rst:196
 msgid ""
@@ -646,6 +818,11 @@ msgid ""
 "interactions are logged on the chatter, making it easy for the task leader "
 "to remember past interactions."
 msgstr ""
+"У чаті, ви можете бачити, коли завдання було створено, коли воно пройшло від"
+" одного етапу до іншого, тощо. Будь-які зміни, внесені до цього завдання, "
+"автоматично вносяться в чат. Він також включає в себе історію взаємодії між "
+"вами та вашим клієнтом або колегами. Всі взаємодії входять до чату, завдяки "
+"чому керівник завдання легко запам'ятовує минулі взаємодії."
 
 #: ../../project/configuration/collaboration.rst:203
 msgid ""
@@ -655,10 +832,15 @@ msgid ""
 " specific task, you can choose to add a message to notify all of them. For "
 "both of these options, the date and time is saved on the entry."
 msgstr ""
+"Ви можете взаємодіяти з підписниками, незалежно від того, внутрішні (ваші "
+"колеги) або зовнішні (наприклад, клієнт), зареєструвавши нотатку або важливу"
+" інформацію. Також, якщо ви хочете надіслати електронний лист усім "
+"підписникам цього конкретного завдання, ви можете додати повідомлення, щоб "
+"повідомити всіх. Для обох цих параметрів дата і час зберігаються на записі."
 
 #: ../../project/configuration/collaboration.rst:214
 msgid "The description of the task, the Pad"
-msgstr ""
+msgstr "Опис завдання, Пед"
 
 #: ../../project/configuration/collaboration.rst:216
 msgid ""
@@ -668,12 +850,20 @@ msgid ""
 "same content. Every user has their own color and you can replay the whole "
 "creation of the content."
 msgstr ""
+"Odoo дозволяє замінити поле опису завдання за допомогою спільної нотатки "
+"Etherpad (http://etherpad.org). Це означає, що ви можете співпрацювати над "
+"завданнями в режимі реального часу, коли кілька користувачів надають той "
+"самий вміст. Кожен користувач має свій власний колір, і ви можете відтворити"
+" увесь створений вміст."
 
 #: ../../project/configuration/collaboration.rst:222
 msgid ""
 "To activate this option, go to :menuselection:`Project Settings --> Pads`, "
 "tick \"Collaborative rich text on task description\"."
 msgstr ""
+"Щоб активувати цю опцію, перейдіть до :menuselection:`Налаштування проекту "
+"--> Педи`, позначте пункт \"Спільний багатофункціональний текст у описі "
+"завдань\"."
 
 #: ../../project/configuration/collaboration.rst:229
 msgid ""
@@ -683,14 +873,19 @@ msgid ""
 "useful if you want to send it to someone without adding this person as a "
 "follower."
 msgstr ""
+"Якщо вам просто потрібен пед, а не вся сторінка завдання, ви можете "
+"натиснути піктограму у верхньому правому куті, щоби перейти до панелі "
+"безпосередньо в повноекранному режимі. Натисніть на значок ``</>``, щоби "
+"отримати пряму URL-адресу опису завдання: корисно, якщо ви хочете відправити"
+" його комусь, не додаючи цю особу як підписника."
 
 #: ../../project/configuration/collaboration.rst:239
 msgid "Tasks states"
-msgstr ""
+msgstr "Етапи завдання"
 
 #: ../../project/configuration/collaboration.rst:242
 msgid "Set the state of a task"
-msgstr ""
+msgstr "Встановіть етап завдання"
 
 #: ../../project/configuration/collaboration.rst:244
 msgid ""
@@ -698,16 +893,21 @@ msgid ""
 " are working on a task, if the task is ready or if it is blocked. It is a "
 "visual indicator that is seen in a glance."
 msgstr ""
+"Етап завдання - найпростіший спосіб повідомити своїх колег, коли ви працюєте"
+" над завданням, якщо завдання готові або їх заблоковано. Це візуальний "
+"індикатор, який видно одразу."
 
 #: ../../project/configuration/collaboration.rst:248
 msgid ""
 "You can change the status of the task from the kanban view or directly from "
 "the task. Just click on the status ball to get the choices:"
 msgstr ""
+"Ви можете змінити етап завдання з Канбану або безпосередньо із завдання. "
+"Просто натисніть на кружок етапу, щоб отримати вибір:"
 
 #: ../../project/configuration/collaboration.rst:258
 msgid "Custom states"
-msgstr ""
+msgstr "Змінювані етапи"
 
 #: ../../project/configuration/collaboration.rst:260
 msgid ""
@@ -715,18 +915,21 @@ msgid ""
 "project. On the kanban view, click on the gear icon on the top of the stage,"
 " then click on edit:"
 msgstr ""
+"Ви можете вирішити, який статус означає для кожного етапу вашого проекту. У "
+"перегляді Канбану натисніть на значок налаштування у верхній частині екранe,"
+" після чого натисніть Редагувати:"
 
 #: ../../project/configuration/collaboration.rst:267
 msgid "Next to the color ball, write the explanation of the state."
-msgstr ""
+msgstr "Поруч із кольоровим кружком, напишіть пояснення етапу."
 
 #: ../../project/configuration/collaboration.rst:272
 msgid "Now, the explanation will be displayed instead of the generic text:"
-msgstr ""
+msgstr "Тепер пояснення буде відображатися замість загального тексту:"
 
 #: ../../project/configuration/collaboration.rst:278
 msgid "Color Tags"
-msgstr ""
+msgstr "Кольорові мітки"
 
 #: ../../project/configuration/collaboration.rst:280
 msgid ""
@@ -734,6 +937,9 @@ msgid ""
 "tasks. It helps you to highlight a task from the Kanban view or better find "
 "them thanks to the filters."
 msgstr ""
+"У кожному завданні можна додати тег. Теги дуже корисні для класифікації "
+"завдань. Це допоможе вам виділити завдання з Канбану або краще знайти їх "
+"завдяки фільтрам."
 
 #: ../../project/configuration/collaboration.rst:284
 msgid ""
@@ -741,22 +947,29 @@ msgid ""
 " tasks containing the tag with the colors. Each tag can get a specific "
 "color, it's very visual on the Kanban view."
 msgstr ""
+"Якщо ви завжди працюєте з певним типом тегів, ви можете виділити завдання, "
+"що містять тег із кольором. Кожен тег може отримати певний колір, це видно "
+"на Канбані."
 
 #: ../../project/configuration/collaboration.rst:291
 msgid ""
 "In order to make it appear on the kanban view, you have to set a color on "
 "the tag, directly from the task:"
 msgstr ""
+"Щоб зробити його видимим у Канбані, потрібно встановити колір тегу "
+"безпосередньо із завдання:"
 
 #: ../../project/configuration/setup.rst:3
 msgid "How to set up & configure a project?"
-msgstr ""
+msgstr "Як встановити та налаштувати проект?"
 
 #: ../../project/configuration/setup.rst:8
 msgid ""
 "Odoo Project allows you to manage a project together with your whole team, "
 "and to communicate with any member for each project and task."
 msgstr ""
+"Проект Odoo дозволяє вам керувати проектом разом з усією вашою командою та "
+"спілкуватися з будь-яким членом для кожного проекту та завдання."
 
 #: ../../project/configuration/setup.rst:11
 msgid ""
@@ -765,20 +978,26 @@ msgid ""
 " as part of a project. You will be able to give different tasks to several "
 "employees working on this project."
 msgstr ""
+"Він працює з проектами, що містять завдання, які накладаються на налаштовані"
+" етапи. Проект може бути внутрішнім або орієнтованим на клієнта. Завдання - "
+"виконання частини проекту. Ви зможете надати різні завдання кільком "
+"працівникам, які працюють над цим проектом."
 
 #: ../../project/configuration/setup.rst:17
 msgid "Installing the Project module"
-msgstr ""
+msgstr "Встановлення модуля Проект"
 
 #: ../../project/configuration/setup.rst:19
 msgid ""
 "Open the **Apps** module, search for **Project Management**, and click on "
 "**Install**."
 msgstr ""
+"Відкрийте модуль **Додатки**, знайдіть **Керування проектами** та натисніть "
+"**Встановити**."
 
 #: ../../project/configuration/setup.rst:26
 msgid "Creating a new project"
-msgstr ""
+msgstr "Створення нового проекту"
 
 #: ../../project/configuration/setup.rst:28
 msgid ""
@@ -786,45 +1005,51 @@ msgid ""
 " you can specify the name of the project and set up the privacy of the "
 "project."
 msgstr ""
+"Відкрийте додаток **Проект** та натисніть кнопку **Створити**. У цьому вікні"
+" ви можете вказати назву проекту та встановити конфіденційність проекту."
 
 #: ../../project/configuration/setup.rst:32
 msgid "The privacy setting works as:"
-msgstr ""
+msgstr "Параметр конфіденційності працює як:"
 
 #: ../../project/configuration/setup.rst:34
 msgid "**Customer Project**: visible in portal if the customer is a follower."
-msgstr ""
+msgstr "**Проект клієнта**: видимий на порталі, якщо клієнт є підписником."
 
 #: ../../project/configuration/setup.rst:37
 msgid "**All Employees**: employees see all tasks or issues."
-msgstr ""
+msgstr "**Усі співробітники**: працівники бачать всі завдання чи проблеми."
 
 #: ../../project/configuration/setup.rst:39
 msgid ""
 "**Private Project**: followers can see only the followed tasks or issues"
 msgstr ""
+"**Приватний проект**: підписники можуть бачити лише наступні завдання чи "
+"проблеми."
 
 #: ../../project/configuration/setup.rst:42
 msgid ""
 "You can also specify if the project is destined to a customer, or leave the "
 "**Customer** field empty if not."
 msgstr ""
+"Ви також можете вказати, чи проект призначений клієнту, або залишити поле "
+"**клієнта** порожнім, якщо ні."
 
 #: ../../project/configuration/setup.rst:48
 msgid "When you have entered all the required details, click on **Save**."
-msgstr ""
+msgstr "Коли ви введете всі необхідні дані, натисніть кнопку **Зберегти**."
 
 #: ../../project/configuration/setup.rst:51
 msgid "Manage your project's stages"
-msgstr ""
+msgstr "Керування етапами вашого проекту"
 
 #: ../../project/configuration/setup.rst:54
 msgid "Add your project's stages"
-msgstr ""
+msgstr "Додайте етапи вашого проекту"
 
 #: ../../project/configuration/setup.rst:56
 msgid "On your project's dashboard. Click on **# Tasks**."
-msgstr ""
+msgstr "На інформаційній панелі вашого проекту натисніть **# Завдання**."
 
 #: ../../project/configuration/setup.rst:61
 msgid ""
@@ -832,18 +1057,25 @@ msgid ""
 " of your project, then add as many columns as there are stages in your "
 "project."
 msgstr ""
+"У новому вікні додайте новий стовпець і назвіть його відповідно до першого "
+"етапу вашого проекту, а потім додайте стільки стовпчиків, скільки є етапів у"
+" вашому проекті."
 
 #: ../../project/configuration/setup.rst:68
 msgid ""
 "For each stage, there are markers for the status of tasks within a stage, "
 "that you can personalize to fit your needs."
 msgstr ""
+"Для кожного етапу є маркери для статусу завдань в рамках стадії, які можна "
+"персоналізувати відповідно до ваших потреб."
 
 #: ../../project/configuration/setup.rst:71
 msgid ""
 "Drag your mouse pointer over a stage name, and click on the appearing "
 "bearing, and on the opening menu, click on **Edit**."
 msgstr ""
+"Перетягніть вказівник миші над назвою стадії та натисніть на значення, що "
+"з'являється, а у відкритому меню натисніть **Редагувати**."
 
 #: ../../project/configuration/setup.rst:77
 msgid ""
@@ -851,14 +1083,18 @@ msgid ""
 "customizable markers applied on tasks, making it easier to know what task "
 "requires attention. You can give them any signification you like."
 msgstr ""
+"Відкриється нове вікно. Кольорові точки та значок зірки відповідають "
+"налаштованим маркерам, застосованим до завдань, що полегшує знання того, яке"
+" завдання потребує уваги. Ви можете дати їм будь-яке позначення, яке вам "
+"подобається."
 
 #: ../../project/configuration/setup.rst:84
 msgid "Click on **Save** when you are done."
-msgstr ""
+msgstr "Натисніть кнопку **Зберегти** після завершення."
 
 #: ../../project/configuration/setup.rst:87
 msgid "Rearrange stages"
-msgstr ""
+msgstr "Налаштування етапів"
 
 #: ../../project/configuration/setup.rst:89
 msgid ""
@@ -869,28 +1105,38 @@ msgid ""
 "you want to move to the desired location. You can also fold or unfold your "
 "stages by using the **Setting** icon on your desired stage."
 msgstr ""
+"Ви можете легко персоналізувати цей перегляд, щоби краще відповідати вашим "
+"потребам бізнесу, створивши нові стовпці. З канбану вашого проекту, ви "
+"можете додати етапи, натиснувши кнопку **Додати новий стовпець**. Якщо ви "
+"хочете змінити порядок ваших етапів, ви можете легко зробити це, "
+"перетягнувши стовпчик, який потрібно перемістити в потрібне місце. Ви також "
+"можете скласти або розгорнути свої етапи, використовуючи значок "
+"**Налаштування** на потрібному вам етапі."
 
 #: ../../project/configuration/setup.rst:100
 msgid ":doc:`visualization`"
-msgstr ""
+msgstr ":doc:`visualization`"
 
 #: ../../project/configuration/setup.rst:101
 msgid ":doc:`collaboration`"
-msgstr ""
+msgstr ":doc:`collaboration`"
 
 #: ../../project/configuration/setup.rst:102
 msgid ":doc:`time_record`"
-msgstr ""
+msgstr ":doc:`time_record`"
 
 #: ../../project/configuration/time_record.rst:3
 msgid "How to record time spent?"
-msgstr ""
+msgstr "Як записати витрачений час?"
 
 #: ../../project/configuration/time_record.rst:8
 msgid ""
 "Odoo allows you to record the time spent per employee and per project, for "
 "simple reports as well as for direct invoicing to the customer."
 msgstr ""
+"Odoo дозволяє записувати час, витрачений на одного співробітника на кожен "
+"проекту, для простих звітів, а також для прямого виставлення рахунків "
+"клієнту."
 
 #: ../../project/configuration/time_record.rst:14
 msgid ""
@@ -899,58 +1145,75 @@ msgid ""
 ":menuselection:`Configuration --> Settings`. In the **Timesheets** section "
 "of the page, tick **Activate timesheets on issues**."
 msgstr ""
+"Щоб записати час, витрачений на проекти, спершу потрібно активувати "
+"виставлення рахунків за часом. У модулі **Проект** відкрийте "
+":menuselection:`Налаштування --> Налаштування`. У розділі **Табелі** "
+"позначте пункт **Активувати табелі на проблемах**."
 
 #: ../../project/configuration/time_record.rst:23
 msgid ""
 "Activating the option will install the Sales, Invoicing, Issue Tracking, "
 "Employee and Timesheet apps."
 msgstr ""
+"Активація цього параметра дозволить встановити додатки для продажів, "
+"виставлення рахунків-фактур, відстеження проблем, працівників і табель."
 
 #: ../../project/configuration/time_record.rst:27
 msgid "Recording timesheets"
-msgstr ""
+msgstr "Запис табелів"
 
 #: ../../project/configuration/time_record.rst:29
 msgid ""
 "You can record the time spent in projects straight from the projects "
 "application. You can either record timesheets in a project, or in a task."
 msgstr ""
+"Ви можете зафіксувати час, витрачений на проекти, безпосередньо із програми "
+"проекту. Ви можете або записувати табелі в проекті, або в задачі."
 
 #: ../../project/configuration/time_record.rst:34
 msgid "Recording in a project"
-msgstr ""
+msgstr "Запис у проекті"
 
 #: ../../project/configuration/time_record.rst:36
 msgid ""
 "In the **Project** application dashboard, open the **More** menu of the "
 "project you want to record timesheets for, and click on **Timesheets**."
 msgstr ""
+"На інформаційній панелі програми **Проект** відкрийте меню **Більше** "
+"проекту, для якого потрібно записати табелі, і натисніть кнопку **Табелі**."
 
 #: ../../project/configuration/time_record.rst:42
 msgid ""
 "In the new window, click on **Create** and insert the required details, then"
 " click on **Save**."
 msgstr ""
+"У новому вікні натисніть кнопку **Створити** та вставте необхідні дані, а "
+"потім натисніть кнопку **Зберегти**."
 
 #: ../../project/configuration/time_record.rst:49
 msgid "Recording in a task"
-msgstr ""
+msgstr "Запис у завдання"
 
 #: ../../project/configuration/time_record.rst:51
 msgid ""
 "In the **Project** app, open the project you want to record timesheets for, "
 "and open the task on which you have been working."
 msgstr ""
+"У модулі **Проект** відкрийте проект, який в якому ви хочете записати "
+"табель, і відкрийте завдання, на якому ви працювали."
 
 #: ../../project/configuration/time_record.rst:54
 msgid ""
 "In the task, click on **Edit**, open the **Timesheets** tab and click on "
 "**Add an item**. Insert the required details, then click on **Save**."
 msgstr ""
+"У цьому завданні натисніть **Редагувати**, відкрийте вкладку **Табель** та "
+"натисніть **Додати елемент**. Вставте потрібні дані, а потім натисніть "
+"кнопку **Зберегти**."
 
 #: ../../project/configuration/visualization.rst:3
 msgid "Visualize a project's tasks"
-msgstr ""
+msgstr "Візуалізуйте завдання проекту"
 
 #: ../../project/configuration/visualization.rst:5
 msgid ""
@@ -960,35 +1223,44 @@ msgid ""
 "enables you to efficiently visualize and organize the different tasks you "
 "have to cope with."
 msgstr ""
+"У повсякденному бізнесі ваша компанія може зіткнутися з великою кількістю "
+"завдань. Ці завдання досить складні. Потрібно згадати їх усіх і слідкувати "
+"за ними, що може бути тягарем. На щастя, Odoo дозволяє вам ефективно "
+"візуалізувати та організовувати різні завдання, з якими ви маєте справу."
 
 #: ../../project/configuration/visualization.rst:12
 msgid "Create a task"
-msgstr ""
+msgstr "Створіть завдання"
 
 #: ../../project/configuration/visualization.rst:14
 msgid ""
 "While in the project app, select an existing project or create a new one."
 msgstr ""
+"Під час додавання проекту, виберіть існуючий проект або створіть новий."
 
 #: ../../project/configuration/visualization.rst:17
 msgid "In the project, create a new task."
-msgstr ""
+msgstr "У проекті створіть нове завдання."
 
 #: ../../project/configuration/visualization.rst:22
 msgid ""
 "In that task you can then assigned it to the right person, add tags, a "
 "deadline, descriptions… and anything else you might need for that task."
 msgstr ""
+"Це завдання ви можете призначити потрібній людині, додавати в ньому теги, "
+"терміни, описи ... і все інше, що вам може знадобитися для цього завдання."
 
 #: ../../project/configuration/visualization.rst:29
 msgid "View your tasks with the Kanban view"
-msgstr ""
+msgstr "Перегляньте свої завдання за допомогою Канбану"
 
 #: ../../project/configuration/visualization.rst:31
 msgid ""
 "Once you created several tasks, they can be managed and followed up thanks "
 "to the Kanban view."
 msgstr ""
+"Після того, як ви створили декілька завдань, їх можна буде керувати та "
+"контролювати завдяки Канбану."
 
 #: ../../project/configuration/visualization.rst:34
 msgid ""
@@ -996,6 +1268,9 @@ msgid ""
 "enables you to have a clear view on the stages your tasks are in and which "
 "one have the higher priorities."
 msgstr ""
+"Перегляд у Канбані - перегляд посту, розділений на різні етапи. Це дає змогу"
+" мати чітке уявлення про етапи виконання ваших завдань і про те, які з них "
+"мають вищі пріоритети."
 
 #: ../../project/configuration/visualization.rst:38
 #: ../../project/planning/assignments.rst:53
@@ -1004,6 +1279,9 @@ msgid ""
 " on another view, you can go back to it any time by clicking the kanban view"
 " logo in the upper right corner"
 msgstr ""
+"Канбан є переглядом за замовчуванням при доступі до проекту, але якщо ви "
+"перебуваєте в іншому перегляді, ви можете будь-коли повернутися до нього, "
+"натиснувши значок Канбану у верхньому правому куті."
 
 #: ../../project/configuration/visualization.rst:45
 msgid ""
@@ -1011,10 +1289,13 @@ msgid ""
 "the Kanban view by using the little dot, it will notify follower of the task"
 " and indicate if the task is ready."
 msgstr ""
+"Ви також можете повідомити своїх колег про стан завдання прямо з Канбану за "
+"допомогою маленької точки, він буде повідомляти підписника завдання і "
+"вказати, чи завдання готові."
 
 #: ../../project/configuration/visualization.rst:53
 msgid "Sort tasks in your Kanban view"
-msgstr ""
+msgstr "Сортування завдань у Канбані"
 
 #: ../../project/configuration/visualization.rst:55
 msgid ""
@@ -1023,21 +1304,30 @@ msgid ""
 "using drag & drop, they will be in that order and finally by their ID linked"
 " to their creation date."
 msgstr ""
+"Задачі упорядковуються за пріоритетом, які ви можете надати, натиснувши "
+"зірочку поруч із годинником, а потім підписку, тобто якщо ви рухаєте їх за "
+"допомогою перетягування, вони будуть в такому порядку і, нарешті, своїми "
+"ідентифікаторами, пов'язаними з датою їх створення."
 
 #: ../../project/configuration/visualization.rst:63
 msgid ""
 "Tasks that are past their deadline will appear in red in your Kanban view."
 msgstr ""
+"Задачі, що минули через їхній термін, будуть позначені червоним у вашому "
+"Канбані."
 
 #: ../../project/configuration/visualization.rst:67
 msgid ""
 "If you put a low priority task on top, when you go back to your dashboard "
 "the next time, it will have moved back below the high priority tasks."
 msgstr ""
+"Якщо ви поставите завдання з низьким пріоритетом зверху, коли ви знову "
+"повернетеся на інформаційну панель наступного разу, завдання повернеться "
+"назад до задач з високим пріоритетом."
 
 #: ../../project/configuration/visualization.rst:72
 msgid "Manage deadlines with the Calendar view"
-msgstr ""
+msgstr "Керуйте дедлайнами в Календарі"
 
 #: ../../project/configuration/visualization.rst:74
 msgid ""
@@ -1045,12 +1335,18 @@ msgid ""
 "allowing you to see every deadline for every task that has a deadline set "
 "easily in a single window."
 msgstr ""
+"Ви також маєте можливість перейти з режиму перегляду Канбану на режим "
+"перегляду Календаря, що дозволяє переглядати дедлайн кожного завдання просто"
+" в одному вікні."
 
 #: ../../project/configuration/visualization.rst:78
 msgid ""
 "Tasks are color coded to the employee they are assigned to and you can "
 "filter deadlines by employees by selecting who's deadline you wish to see."
 msgstr ""
+"Задачі позначені кольором для працівника, якому вони призначені, і ви можете"
+" відфільтрувати дедлайни для працівників, вибравши кінцевий термін, який ви "
+"хочете бачити."
 
 #: ../../project/configuration/visualization.rst:86
 #: ../../project/planning/assignments.rst:133
@@ -1058,16 +1354,21 @@ msgid ""
 "You can easily change the deadline from the Calendar view by dragging and "
 "dropping the task to another case."
 msgstr ""
+"Ви можете легко змінити кінцевий термін з перегляду Календаря, перетягнувши "
+"завдання в інший."
 
 #: ../../project/overview/main_concepts/introduction.rst:3
 msgid "Introduction to Odoo Project"
-msgstr ""
+msgstr "Введення у Проект Odoo"
 
 #: ../../project/overview/main_concepts/introduction.rst:13
 msgid ""
 "As a business manager, I have a varied job involving multiple stakeholders. "
 "To manage every task seamlessly, Odoo Projects is of great help."
 msgstr ""
+"Будучи менеджером по бізнесу, у нас є різноманітна робота, що включає кілька"
+" зацікавлених сторін. Керуючи кожним завданням, Проект Odoo відмінно з цим "
+"справляється."
 
 #: ../../project/overview/main_concepts/introduction.rst:17
 msgid ""
@@ -1077,6 +1378,11 @@ msgid ""
 "any task at any time, and for any user. It is convenient for any other "
 "project manager too."
 msgstr ""
+"Завдяки проектам Odoo, наші члени проекту можуть легко спланувати та "
+"здійснити запуск нової лінійки продуктів у Канаді. Ми організували цей "
+"проект, створивши різні етапи. Це дозволяє нам чітко визначити статус будь-"
+"якого завдання в будь-який час і для будь-якого користувача. Це зручно для "
+"будь-якого іншого менеджера проекту."
 
 #: ../../project/overview/main_concepts/introduction.rst:24
 msgid ""
@@ -1085,6 +1391,11 @@ msgid ""
 "management process, I proceed to a final review, so I add this stage. Odoo "
 "projects is designed to work for any kind of business."
 msgstr ""
+"Ці добре структуровані етапи проекту повністю налаштовуються. Тут ми "
+"ідентифікуємо одну відсутню стадію, ми можемо легко додати її лише одним "
+"кліком. У процесі управління проектом ми приступаємо до остаточного "
+"розгляду, тому додаємо цей етап. Проекти Odoo призначені для роботи будь-"
+"якого виду бізнесу."
 
 #: ../../project/overview/main_concepts/introduction.rst:30
 msgid ""
@@ -1092,6 +1403,9 @@ msgid ""
 " That will help the project manager to review the task before changing the "
 "stage with a simple drag and drop. Easy, right?"
 msgstr ""
+"Після виконання завдання, кожен колега може виділити його, змінивши статус. "
+"Це допоможе менеджеру проекту переглянути завдання перед тим, як змінити "
+"етап з простим перетягуванням. Легко, чи не так?"
 
 #: ../../project/overview/main_concepts/introduction.rst:35
 msgid ""
@@ -1106,6 +1420,16 @@ msgid ""
 " this timesheet integration, the project manager has a thorough follow-up on"
 " the progress of each task."
 msgstr ""
+"Ми також можемо організувати різні завдання, адаптуючи вигляд. Тут ми "
+"вибираємо перегляд списку, в якому відображається інша інформація, така як "
+"робочий час. Якщо ми натискаємо на наше завдання, то перейдемо на вигляд "
+"форми, де можемо відредагувати заплановані години і ввести наші табелі. Це "
+"відмінний інструмент для будь-якого менеджера проекту. Контроль за прогресом"
+" робочого часу і час, витрачений на кожного члена команди, є дуже важливим. "
+"Ми встановили час для тренінгу команди продажів до 24 годин. Сьогодні ми "
+"підготували матеріал, тому вказуємо 4 години на розкладі. Прогрес робочого "
+"часу оновлюється автоматично. Завдяки цій схемі інтеграції, керівник проекту"
+" ретельно відстежує хід виконання кожного завдання."
 
 #: ../../project/overview/main_concepts/introduction.rst:49
 msgid ""
@@ -1119,6 +1443,15 @@ msgid ""
 "deadline. Odoo projects is the perfect app for strategic and executive "
 "planning."
 msgstr ""
+"Іншою відмінною функцією в проектах Odoo є інструмент прогнозування. Коли "
+"він активований, ми можемо спланувати ресурси за проект і робоче "
+"навантаження. Тому розподіл часу для інших проектів набагато простіший. Для "
+"цього проекту ми повинні навчати членів команди з продажу. Це вимагатиме 50%"
+" часу до кінця тижня. Як керівник проекту, ми можемо зробити цей розподіл "
+"ресурсів для будь-якого користувача та адаптувати його за іншими проектами. "
+"Це дозволить запобігти будь-якому перетині часу. Ми можемо перепризначити "
+"завдання або пристосувати термін. Проект Odoo - це ідеальний додаток для "
+"стратегічного та виконавчого планування."
 
 #: ../../project/overview/main_concepts/introduction.rst:61
 msgid ""
@@ -1128,6 +1461,11 @@ msgid ""
 "task, or any team member. I can also look at the number of hours assigned to"
 " each team member."
 msgstr ""
+"Крім того, завдяки звітам можна проаналізувати будь-який аспект будь-якого "
+"проекту. Наприклад, ми можемо мати звіт про фактичні години, витрачені у "
+"порівнянні із запланованими годинами. Ми можемо оцінити прибутковість будь-"
+"якого проекту, будь-якого завдання чи будь-якого члена команди. Ми також "
+"можемо подивитися на кількість годин, призначених кожному члену команди."
 
 #: ../../project/overview/main_concepts/introduction.rst:68
 msgid ""
@@ -1138,6 +1476,12 @@ msgid ""
 "always one-click away. I can also start a new conversation with anyone in my"
 " team."
 msgstr ""
+"Іншим елементом відмінного управління проектом є спілкування. Це ключовий "
+"фактор успіху будь-якого проекту. Під час роботи з кількома зацікавленими "
+"сторонами, можливість безпосереднього обміну документами у завданні дуже "
+"корисна. З проектами Odoo ми можемо говорити через функцію чату, яка є в "
+"одному кліку миші. Ми також можемо почати нову бесіду з тими, хто працює в "
+"нашій команді."
 
 #: ../../project/overview/main_concepts/introduction.rst:76
 msgid ""
@@ -1147,6 +1491,11 @@ msgid ""
 "The app also automatically creates an invoice of time spent on tasks or "
 "issues."
 msgstr ""
+"Крім того, що потужний додаток для керування проектами незмінний, проекти "
+"Odoo також є ефективним сервісним обслуговуванням або післяпродажним "
+"додатком. Завдяки цьому ми можемо стежити за будь-яким питанням клієнтів, "
+"навіть створюючи спеціальний проект підтримки. Програма також автоматично "
+"створює рахунок-фактуру часу, витраченого на завдання чи проблеми."
 
 #: ../../project/overview/main_concepts/introduction.rst:83
 msgid ""
@@ -1154,22 +1503,28 @@ msgid ""
 "planner to clearly state my objectives and set up the project app. Get this "
 "app, it will help you get started quickly too."
 msgstr ""
+"Проект Odoo - це потужний, але простий у використанні додаток. Спочатку ми "
+"використовували планувальник, аби чітко визначити свої цілі та налаштувати "
+"додаток до проекту. Отримайте цей додаток, який допоможе вам швидко "
+"розпочати роботу."
 
 #: ../../project/overview/main_concepts/introduction.rst:88
 msgid "Start your free trial now and better manage your projects with Odoo!"
 msgstr ""
+"Почніть безкоштовну пробну версію і краще керуйте своїми проектами за "
+"допомогою Odoo!"
 
 #: ../../project/overview/main_concepts/introduction.rst:91
 msgid "Start your free trial now with the CRM sales people love"
-msgstr ""
+msgstr "Почніть свою безкоштовну пробну версію зараз, з любов'ю продавців CRM"
 
 #: ../../project/planning.rst:3
 msgid "Planning your project"
-msgstr ""
+msgstr "Планування вашого проекту"
 
 #: ../../project/planning/assignments.rst:3
 msgid "How to plan and track employees' assignments?"
-msgstr ""
+msgstr "Як планувати та відстежувати завдання співробітників?"
 
 #: ../../project/planning/assignments.rst:5
 msgid ""
@@ -1177,6 +1532,9 @@ msgid ""
 "especially when you manage several people. Luckily, using Odoo Project, you "
 "can handle it in only a couple of clicks."
 msgstr ""
+"Слідкування та планування завдань ваших співробітників можуть бути важким "
+"завданням, особливо коли ви керуєте кількома людьми. На щастя, "
+"використовуючи Проект Odoo, ви можете впоратися з ним лише за кілька кліків."
 
 #: ../../project/planning/assignments.rst:12
 msgid ""
@@ -1184,6 +1542,8 @@ msgid ""
 "module. To do so, go in the application module, search for project and "
 "install the application."
 msgstr ""
+"Єдина необхідна конфігурація - встановити модуль **Управління проектами**. "
+"Для цього перейдіть у модуль додатків, знайдіть Проект та встановіть його."
 
 #: ../../project/planning/assignments.rst:19
 msgid ""
@@ -1193,6 +1553,11 @@ msgid ""
 "under **Time Work Estimation**, select the **manage time estimation on "
 "tasks** option. Do not forget to apply your changes."
 msgstr ""
+"Якщо ви хочете керувати оцінкою часу, вам потрібно буде ввімкнути табелі для"
+" завдань. У програмі **Проект** перейдіть до :menuselection:`Налаштування "
+"--> Налаштування` у спадному меню. Потім, під **Оцінкою часу роботи**, "
+"виберіть **керування оцінкою часу завдань** у параметрах. Не забудьте "
+"застосувати свої зміни."
 
 #: ../../project/planning/assignments.rst:28
 msgid ""
@@ -1200,10 +1565,13 @@ msgid ""
 "Every time your salesperson will add working time in his timesheet, the bar "
 "will be updated accordingly, based on the initially planned hours."
 msgstr ""
+"Ця функція створить панель прогресу у вигляді перегляду ваших завдань. "
+"Кожного разу, коли ваш продавець додасть робочий час у свій табель, панель "
+"буде оновлено відповідно до запланованих раніше годин."
 
 #: ../../project/planning/assignments.rst:36
 msgid "Manage tasks with views"
-msgstr ""
+msgstr "Керуйте завданнями з переглядами"
 
 #: ../../project/planning/assignments.rst:38
 msgid ""
@@ -1212,16 +1580,22 @@ msgid ""
 "on your employees' tasks: the kanban view, the list view (using timesheets) "
 "and the calendar view."
 msgstr ""
+"Ви можете отримати огляд ваших різних завдань завдяки різноманітним "
+"переглядам з Odoo. Три основні перегляди допоможуть вам планувати та "
+"відслідковувати завдання своїх співробітників: вигляд Канбану, перегляд "
+"списку (за допомогою розрахункових таблиць) та перегляд календаря."
 
 #: ../../project/planning/assignments.rst:43
 msgid ""
 "Create and edit tasks in order to fill up your pipeline. Don't forget to "
 "fill in a responsible person and an estimated time if you have one."
 msgstr ""
+"Створіть та відредагуйте завдання, щоби заповнити конвеєр. Не забудьте "
+"заповнити відповідальну особу та приблизний час, якщо він є."
 
 #: ../../project/planning/assignments.rst:47
 msgid "Get an overview of activities with the kanban view"
-msgstr ""
+msgstr "Ознайомтеся з діями з переглядом Канбану"
 
 #: ../../project/planning/assignments.rst:49
 msgid ""
@@ -1229,10 +1603,13 @@ msgid ""
 "enables you to have a clear view on the stages your tasks are in and the "
 "ones having the higher priorities."
 msgstr ""
+"Перегляд Канбану - пост-подібний перегляд, розділений на різні етапи. Це дає"
+" змогу мати чітке уявлення про етапи виконання ваших завдань і те, що має "
+"вищі пріоритети."
 
 #: ../../project/planning/assignments.rst:61
 msgid "Add/rearrange stages"
-msgstr ""
+msgstr "Додати/переставити етапи"
 
 #: ../../project/planning/assignments.rst:63
 msgid ""
@@ -1244,6 +1621,13 @@ msgid ""
 "fold or unfold your stages by using the **setting** icon on your desired "
 "stage."
 msgstr ""
+"Ви можете легко персоналізувати свій проект відповідно до потреб вашого "
+"бізнесу, створивши нові стовпці. З перегляду Канбану на ваш проект, ви "
+"можете додати етапи, натиснувши на **Додати новий стовпець** (див. Малюнок "
+"нижче). Якщо ви хочете змінити порядок ваших етапів, ви можете легко зробити"
+" це, перетягнувши стовпчик, який потрібно перемістити в потрібне місце. Ви "
+"також можете скласти або розгорнути етапи, використовуючи значок "
+"**налаштування** на потрібному етапі."
 
 #: ../../project/planning/assignments.rst:75
 msgid ""
@@ -1251,10 +1635,13 @@ msgid ""
 "development project, stages might be: Specifications, Development, Test, "
 "Done."
 msgstr ""
+"Створіть один стовпець на кожному етапі в робочому процесі. Наприклад, у "
+"проекті розробки етапи можуть бути: Специфікації, Розробка, Тестування, "
+"Готово."
 
 #: ../../project/planning/assignments.rst:80
 msgid "Sort tasks by priority"
-msgstr ""
+msgstr "Сортуйте завдання за пріоритетом"
 
 #: ../../project/planning/assignments.rst:82
 msgid ""
@@ -1264,20 +1651,31 @@ msgid ""
 "left of a task to tag it as **high priority**. For the tasks that are not "
 "tagged, Odoo will automatically classify them according to their deadlines."
 msgstr ""
+"У кожному з ваших стовпчиків ви можете сортувати свої завдання за "
+"пріоритетом. Завдання з вищим пріоритетом автоматично переміщаються до "
+"верхньої частини стовпця. У режимі перегляду Канбану натисніть на зірочку у "
+"лівій нижній частині завдання, щоби позначити його як **найвищий "
+"пріоритет**. Для завдань, які не позначені, Odoo буде автоматично "
+"класифікувати їх відповідно до їх термінів."
 
 #: ../../project/planning/assignments.rst:89
 msgid ""
 "Note that dates that passed their deadlines will appear in red( in the list "
 "view too) so you can easily follow up the progression of different tasks."
 msgstr ""
+"Зверніть увагу, що дати, що пройшли їхні терміни, позначатимуться червоним "
+"(також у перегляді списку), щоб ви могли легко відслідковувати прогрес "
+"різних завдань."
 
 #: ../../project/planning/assignments.rst:97
 msgid "Don't forget you can filter your tasks with the filter menu."
 msgstr ""
+"Не забувайте, що ви можете фільтрувати свої завдання за допомогою меню "
+"фільтру."
 
 #: ../../project/planning/assignments.rst:100
 msgid "Track the progress of each task with the list view"
-msgstr ""
+msgstr "Відстежуйте прогрес кожної задачі за допомогою перегляду списку"
 
 #: ../../project/planning/assignments.rst:102
 msgid ""
@@ -1286,6 +1684,10 @@ msgid ""
 "along with their duration. The **Working Time Progress** bar will be updated"
 " each time the employee will add an activity."
 msgstr ""
+"Якщо ви ввімкнули **Керування оцінкою часу на завданнях**, ваші "
+"співробітники зможуть зареєструвати свою діяльність на задачах під меню "
+"**Табелі** разом із їх тривалістю. **Прогрес робочого часу** буде "
+"оновлюватись кожного разу, коли працівник додасть активність."
 
 #: ../../project/planning/assignments.rst:110
 msgid ""
@@ -1294,10 +1696,14 @@ msgid ""
 "choice and click on the List view icon (see below). The last column will "
 "show you the progression of each task."
 msgstr ""
+"Як менеджер, ви можете легко переглянути час, витрачений на завдання для "
+"всіх співробітників, за допомогою перегляду списку. Для цього відкрийте "
+"проект за вашим вибором та натисніть значок списку (див. Нижче). Останній "
+"стовпець покаже вам прогрес кожного завдання."
 
 #: ../../project/planning/assignments.rst:119
 msgid "Keep an eye on deadlines with the Calendar view"
-msgstr ""
+msgstr "Слідкуйте за дедлайнами в Календарі"
 
 #: ../../project/planning/assignments.rst:121
 msgid ""
@@ -1305,6 +1711,9 @@ msgid ""
 "As a manager, this view enables you to keep an eye on all deadlines in a "
 "single window."
 msgstr ""
+"Якщо ви додасте дедлайн у своєму завданні, вони з'являться у вікні "
+"календаря. Цей перегляд дає змогу менеджеру стежити за усіма кінцевими "
+"термінами в одному вікні."
 
 #: ../../project/planning/assignments.rst:128
 msgid ""
@@ -1312,6 +1721,9 @@ msgid ""
 " to them. You can easily filter the deadlines by employees by ticking the "
 "related boxes on the right of the calendar view."
 msgstr ""
+"Всі завдання позначаються відповідним кольором, призначеному працівнику. Ви "
+"можете легко відфільтрувати дедлайни співробітників, позначаючи відповідні "
+"поля справа на екрані календаря."
 
 #: ../../project/planning/assignments.rst:138
 msgid ":doc:`forecast`"
@@ -1319,23 +1731,27 @@ msgstr ":doc:`forecast`"
 
 #: ../../project/planning/forecast.rst:3
 msgid "How to forecast tasks?"
-msgstr ""
+msgstr "Як прогнозувати завдання?"
 
 #: ../../project/planning/forecast.rst:6
 msgid "Introduction to forecast"
-msgstr ""
+msgstr "Введення в прогнозування"
 
 #: ../../project/planning/forecast.rst:8
 msgid ""
 "Scheduling and forecasting tasks is another way to manage projects. In Odoo,"
 " the Forecast option gives you access to the Gantt chart."
 msgstr ""
+"Планування та прогнозування завдання - це ще один спосіб керувати проектами."
+" В Odoo параметр Прогнозування дає вам доступ до діаграми Ганта."
 
 #: ../../project/planning/forecast.rst:11
 msgid ""
 "So far, you've been working with the Kanban view, which shows you the "
 "progress of a project and its related tasks."
 msgstr ""
+"Поки що ви працювали з Канбаном, який показує вам прогрес проекту та "
+"пов'язані з ним завдання."
 
 #: ../../project/planning/forecast.rst:14
 msgid ""
@@ -1343,20 +1759,25 @@ msgid ""
 "It's highly visual which is a real plus for complex projects, and it helps "
 "team members to collaborate better."
 msgstr ""
+"Тепер, якщо вибрати параметр Прогнозування, діаграма Ганта відображає велику"
+" картину. Це дуже візуальне зображення, яке є справжнім плюсом для складних "
+"проектів, і це допомагає членам команди працювати краще."
 
 #: ../../project/planning/forecast.rst:18
 msgid ""
 "This option is a real benefit in terms of planning and organizing the "
 "workload and human resources."
 msgstr ""
+"Цей варіант вигідний для планування та організації робочого навантаження та "
+"людських ресурсів."
 
 #: ../../project/planning/forecast.rst:22
 msgid "How to configure the projects?"
-msgstr ""
+msgstr "Як налаштувати проекти?"
 
 #: ../../project/planning/forecast.rst:25
 msgid "Configure the project application"
-msgstr ""
+msgstr "Налаштуйте додаток проекту"
 
 #: ../../project/planning/forecast.rst:27
 msgid ""
@@ -1365,18 +1786,26 @@ msgid ""
 " task is assigned a specific timeframe (amount of hours) in which your "
 "employee should complete it!"
 msgstr ""
+"Параметр **Прогнозування** допоможе вам організувати свої проекти. Він "
+"ідеально підходить, коли вам потрібно налаштувати проект із певним "
+"дедлайном. Тому для кожної задачі призначається певний часовий проміжок "
+"(кількість годин), в який ваш працівник повинен його заповнити!"
 
 #: ../../project/planning/forecast.rst:32
 msgid ""
 "First you need to activate the **Forecast** option for the whole project "
 "application:"
 msgstr ""
+"Спочатку потрібно активувати параметр **Прогнозування** для всього модуля "
+"проекту:"
 
 #: ../../project/planning/forecast.rst:35
 msgid ""
 "Go to :menuselection:`Project --> Configuration --> Settings`. Select the "
 "Forecast option and click **Apply**."
 msgstr ""
+"Перейдіть до :menuselection:`Проект --> Налаштування --> Налаштування`. "
+"Виберіть опцію Прогноз і натисніть кнопку **Застосувати**."
 
 #: ../../project/planning/forecast.rst:41
 msgid ""
@@ -1384,40 +1813,51 @@ msgid ""
 "specifically for your **Project** (maybe you don't need the Gantt chart for "
 "all the projects that you manage)."
 msgstr ""
+"Після цього вам все одно потрібно активувати параметр **Прогнозування** "
+"спеціально для вашого **Проекту** (можливо, вам не потрібна діаграма Ганта "
+"для всіх проектів, якими ви керуєте)."
 
 #: ../../project/planning/forecast.rst:46
 msgid "Configure a specific project."
-msgstr ""
+msgstr "Налаштуйте конкретний проект"
 
 #: ../../project/planning/forecast.rst:48
 msgid ""
 "When creating a new project, make sure to select the option \"Allow "
 "Forecast\" in your project settings."
 msgstr ""
+"Під час створення нового проекту обов'язково виберіть параметр \"Дозволити "
+"прогноз\" у налаштуваннях проекту."
 
 #: ../../project/planning/forecast.rst:51
 msgid "You'll see the **Forecast** option appearing in the top menu."
 msgstr ""
+"Ви побачите параметр **Прогнозування**, який з'явиться у верхньому меню."
 
 #: ../../project/planning/forecast.rst:56
 msgid ""
 "If you add the Forecasting option to an existing project, whether there are "
 "task deadlines or not scheduled, the task won't be displayed."
 msgstr ""
+"Якщо ви додаєте параметр Прогнозування до існуючого проекту, будь то терміни"
+" завдань або незаплановані, завдання не відображатимуться."
 
 #: ../../project/planning/forecast.rst:59
 msgid "The tasks of a project are not related to a forecast."
-msgstr ""
+msgstr "Завдання проекту не пов'язані з прогнозом."
 
 #: ../../project/planning/forecast.rst:62
 msgid "How to create a forecast?"
-msgstr ""
+msgstr "Як створити прогнозування?"
 
 #: ../../project/planning/forecast.rst:64
 msgid ""
 "Before creating a project with forecast, list all the tasks with the "
 "projected time they should take. It will help you to coordinate the work."
 msgstr ""
+"Перед створенням проекту з прогнозом перелічіть усі завдання за "
+"прогнозованим часом, який вони повинні взяти. Це допоможе вам координувати "
+"роботу."
 
 #: ../../project/planning/forecast.rst:68
 msgid ""
@@ -1425,12 +1865,17 @@ msgid ""
 "forecast from the task page. To create a forecast, click on the top left "
 "corner of the task, **Create a Forecast**."
 msgstr ""
+"Щоб відобразити проекти в діаграмі Ганта, потрібно створити прогноз на "
+"сторінці завдання. Щоб створити прогноз, натисніть на верхньому лівому куті "
+"завдання **Створити прогнозування**."
 
 #: ../../project/planning/forecast.rst:76
 msgid ""
 "You can also create a new Forecast easily by directly clicking on an empty "
 "space in the Gantt chart calendar."
 msgstr ""
+"Ви також можете легко створити новий Прогнозування, просто натиснувши на "
+"порожній простір у календарі діаграми Ганта."
 
 #: ../../project/planning/forecast.rst:79
 msgid ""
@@ -1438,6 +1883,8 @@ msgid ""
 "automatically. You just need to add the dates and the time the task should "
 "take."
 msgstr ""
+"Інтерфейс Прогнозування автоматично заповнить назву проекту та завдання. Вам"
+" просто потрібно додати дату та час виконання завдання."
 
 #: ../../project/planning/forecast.rst:87
 msgid ""
@@ -1445,6 +1892,9 @@ msgid ""
 " installed on your database. This option helps you to see the progress of a "
 "task thanks to the integration with Timesheet."
 msgstr ""
+"Поле \"Ефективні години\" з'являється, лише якщо у вашій базі даних "
+"встановлено додаток **Табель**. Цей параметр допомагає вам побачити прогрес "
+"завдань завдяки інтеграції з Табелем."
 
 #: ../../project/planning/forecast.rst:91
 msgid ""
@@ -1452,10 +1902,13 @@ msgid ""
 "(Analytic account), with 10 hours spent, the forecast will display 10 hours "
 "in the Effective hours field."
 msgstr ""
+"Наприклад: коли користувач заповнює таблицю з назвою свого проекту "
+"(аналітичний облік), при цьому витрачається 10 годин, прогноз буде "
+"відображати 10 годин у полі Ефективні години."
 
 #: ../../project/planning/forecast.rst:96
 msgid "What are the difference between the views?"
-msgstr ""
+msgstr "Яка різниця між переглядами?"
 
 #: ../../project/planning/forecast.rst:98
 msgid ""
@@ -1463,10 +1916,12 @@ msgid ""
 "helps you to see the Gantt chart from different points of view: by users or "
 "by projects."
 msgstr ""
+"У меню програми **Проект** є меню **Прогнозування**. Це підменю допомагає "
+"переглядати діаграму Ганта з різних точок зору: користувачами або проектами."
 
 #: ../../project/planning/forecast.rst:103
 msgid "By users : people management"
-msgstr ""
+msgstr "Користувачами: управління людьми"
 
 #: ../../project/planning/forecast.rst:105
 msgid ""
@@ -1474,6 +1929,9 @@ msgid ""
 "chart shows you who's involved; it gives you the big picture of the project."
 " It's very useful to allocate your resources effectively."
 msgstr ""
+"Цей параметр відображає діаграму Ганта з призначеними людьми. Діаграма Ганта"
+" показує залучених; це дає вам загальну картину проекту. Дуже корисно "
+"ефективно розподіляти ресурси."
 
 #: ../../project/planning/forecast.rst:109
 msgid ""
@@ -1481,12 +1939,17 @@ msgid ""
 "on the second level you see which projects they are assigned to. On the "
 "third, you see which tasks they're on."
 msgstr ""
+"На лівій стороні, на першому рівні, ви можете побачити задіяних "
+"користувачів. Потім на другому рівні ви бачите, до яких проектів вони "
+"призначені. По-третє, ви бачите, які завдання вони виконують."
 
 #: ../../project/planning/forecast.rst:113
 msgid ""
 "Each task is represented by a coloured rectangle. This rectangle reflects "
 "the duration of the task in the calendar."
 msgstr ""
+"Кожне завдання позначено кольоровим прямокутником. Цей прямокутник "
+"відображає тривалість завдання в календарі."
 
 #: ../../project/planning/forecast.rst:116
 msgid ""
@@ -1495,10 +1958,15 @@ msgid ""
 "to that user is less than 100%. When it's red, it means that this user is "
 "assigned to multiple tasks which total more than 100% of his/her time."
 msgstr ""
+"Верхній прямокутник на першому рівні - це сума всіх завдань, складена з "
+"третього рівня. Якщо він зелений, це означає, що загальний час, призначений "
+"для цього користувача, становить менше 100%. Коли він червоний, це означає, "
+"що цей користувач призначений для виконання декількох завдань, які складають"
+" більше 100% свого часу."
 
 #: ../../project/planning/forecast.rst:126
 msgid "Plan the workload"
-msgstr ""
+msgstr "План робочого навантаження"
 
 #: ../../project/planning/forecast.rst:128
 msgid ""
@@ -1507,6 +1975,11 @@ msgid ""
 "days. He/She has no other tasks to work on. So you can decide from 1 to 100%"
 " how your users should organize their time between different tasks."
 msgstr ""
+"Під час створення прогнозування потрібно вибрати час, який користувач має "
+"витратити на нього. 100% означає, що ваш користувач повинен працювати на "
+"повний робочий день протягом цих днів. Він/вона не має інших завдань для "
+"роботи. Таким чином, ви можете вирішити від 1 до 100%, як ваші користувачі "
+"повинні організувати свій час між різними завданнями."
 
 #: ../../project/planning/forecast.rst:134
 msgid ""
@@ -1514,6 +1987,9 @@ msgid ""
 "example, if your expert is already at 40% on another task in another "
 "project, you can book him/her for only 60% for that period."
 msgstr ""
+"Інтеграція допомагає вам уникнути подвійного бронювання співробітника. "
+"Наприклад, якщо ваш експерт уже має 40% від іншого завдання в іншому "
+"проекті, ви можете забронювати його лише на 60% за цей період."
 
 #: ../../project/planning/forecast.rst:138
 msgid ""
@@ -1524,11 +2000,17 @@ msgid ""
 "Otherwise, the PM can change the dedicated time or the dates, to make sure "
 "that this is feasible."
 msgstr ""
+"У наведеному нижче прикладі користувач \"Адміністратор\" працює над двома "
+"проектами (\"Фази доставки IT1367\" та \"Процес виконання 56\"). Користувач "
+"призначений для обох проектів загальним обсягом у 110% свого часу. Це "
+"занадто багато, тому Менеджер проектів повинен змінити користувачів, "
+"призначених для завдання. В іншому випадку Прем'єр-міністр може змінити "
+"присвячений час або дату, аби переконатися, що це можливо."
 
 #: ../../project/planning/forecast.rst:149
 #: ../../project/planning/forecast.rst:191
 msgid "Gantt view advantages"
-msgstr ""
+msgstr "Переваги діаграми Ганта"
 
 #: ../../project/planning/forecast.rst:151
 msgid ""
@@ -1538,11 +2020,16 @@ msgid ""
 "elements at once. Also, you immediately know what has to be done next. This "
 "method helps you to better understand the relations between the tasks."
 msgstr ""
+"Діаграма Ганта \"користувачем\" допомагає вам краще спланувати свої людські "
+"ресурси. Ви уникаєте плутанини щодо завдань і призначень користувачів. "
+"Діаграма Ганта є візуальною і допомагає зрозуміти всі різні елементи "
+"одночасно. Також ви негайно знаєте, що потрібно зробити далі. Цей метод "
+"допоможе вам краще зрозуміти відносини між завданнями."
 
 #: ../../project/planning/forecast.rst:158
 #: ../../project/planning/forecast.rst:193
 msgid "The dynamic view of the Gantt in Odoo allows you to:"
-msgstr ""
+msgstr "Динамічний перегляд Ганта в Odoo дозволяє:"
 
 #: ../../project/planning/forecast.rst:160
 #: ../../project/planning/forecast.rst:195
@@ -1550,25 +2037,27 @@ msgid ""
 "change the time and date of a forecast by clicking and sliding the tasks in "
 "the future or in the past"
 msgstr ""
+"змінити час і дату прогнозу, натиснувши та пересунувши завдання в "
+"майбутньому чи в минулому"
 
 #: ../../project/planning/forecast.rst:163
 #: ../../project/planning/forecast.rst:198
 msgid "create a new forecast into the Gantt chart immediately"
-msgstr ""
+msgstr "негайно створити новий прогноз у діаграмі Ганта"
 
 #: ../../project/planning/forecast.rst:165
 #: ../../project/planning/forecast.rst:200
 msgid "modify an existing forecast"
-msgstr ""
+msgstr "змінити існуючий прогноз"
 
 #: ../../project/planning/forecast.rst:167
 #: ../../project/planning/forecast.rst:202
 msgid "change the length of a task by extending or shortening the rectangle."
-msgstr ""
+msgstr "змінити довжину задачі шляхом розширення або скорочення прямокутника."
 
 #: ../../project/planning/forecast.rst:170
 msgid "By projects: project management"
-msgstr ""
+msgstr "Проектами: управління проектами"
 
 #: ../../project/planning/forecast.rst:172
 msgid ""
@@ -1577,12 +2066,18 @@ msgid ""
 "one too early if another one isn't finished. Odoo Gantt chart is clear and "
 "helps you to coordinate tasks efficiently."
 msgstr ""
+"Діаграма Ганта - це ідеальне уявлення про проект, щоби краще зрозуміти "
+"взаємодію між завданнями. Ви можете уникати дублювання завдань або запускати"
+" їх занадто рано, якщо інший не завершений. Діаграма Ганта в Odoo є чіткою і"
+" допомагає вам ефективно координувати завдання."
 
 #: ../../project/planning/forecast.rst:177
 msgid ""
 "This option displays the Gantt chart by showing the projects on the first "
 "level of hierarchy."
 msgstr ""
+"Цей параметр відображає графік Ганта, показуючи проекти на першому рівні "
+"ієрархії."
 
 #: ../../project/planning/forecast.rst:180
 msgid ""
@@ -1590,9 +2085,14 @@ msgid ""
 " level you see which users are assigned. On the third, you see which tasks "
 "they're on."
 msgstr ""
+"Зліва, на першому рівні, ви можете побачити проекти. Потім на другому рівні "
+"ви бачите призначених користувачів. По-третє, ви бачите, які завдання вони "
+"виконують."
 
 #: ../../project/planning/forecast.rst:184
 msgid ""
 "This view won't show your HR time. The colours don't apply. (see **By "
 "Users** section)"
 msgstr ""
+"Цей перегляд не покаже ваш час HR. Кольори не застосовуються. (див. розділ "
+"**Користувачами**)"
diff --git a/locale/uk/LC_MESSAGES/purchase.po b/locale/uk/LC_MESSAGES/purchase.po
index 06c9b2441..a807a08ad 100644
--- a/locale/uk/LC_MESSAGES/purchase.po
+++ b/locale/uk/LC_MESSAGES/purchase.po
@@ -1,14 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2015-TODAY, Odoo S.A.
-# This file is distributed under the same license as the Odoo Business package.
+# This file is distributed under the same license as the Odoo package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 10.0\n"
+"Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-22 15:27+0100\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018\n"
 "Language-Team: Ukrainian (https://www.transifex.com/odoo/teams/41243/uk/)\n"
@@ -22,891 +22,101 @@ msgstr ""
 msgid "Purchase"
 msgstr "Купівлі"
 
-#: ../../purchase/overview.rst:3
-#: ../../purchase/replenishment/flows/dropshipping.rst:6
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:6
-#: ../../purchase/replenishment/flows/warning_triggering.rst:6
-#: ../../purchase/replenishment/multicompany/setup.rst:6
-msgid "Overview"
-msgstr "Загальний огляд"
-
-#: ../../purchase/overview/process.rst:3
-msgid "Process Overview"
-msgstr "Загальний огляд процесу"
-
-#: ../../purchase/overview/process/difference.rst:3
-msgid "Request for Quotation, Purchase Tender or Purchase Order?"
-msgstr "Запит на пропозицію, тендер на купівлю чи замовлення на купівлю?"
-
-#: ../../purchase/overview/process/difference.rst:5
-msgid ""
-"Although they are intimately related, Requests for Quotation, Purchase "
-"Tenders and Purchase Orders are not the same."
-msgstr ""
-"Хоча вони тісно пов'язані, запити на пропозицію, тендер на купівлю та "
-"замовлення на купівлю не є однаковими."
-
-#: ../../purchase/overview/process/difference.rst:8
-msgid ""
-"A **Request for Quotation** (RfQ) is used when you plan to purchase some "
-"products and you would like to receive a quote for those products. In Odoo, "
-"the Request for Quotation is used to send your list of desired products to "
-"your supplier. Once your supplier has answered your request, you can choose "
-"to go ahead with the offer and purchase or to turn down the offer."
-msgstr ""
-"**Запит на комерційну пропозицію** (ЗНКП) використовується, коли ви плануєте"
-" придбати деякі товари, і ви хочете отримати комерційну пропозицію для цих "
-"товарів. В Odoo запит на комерційну пропозицію використовується для "
-"надсилання вашого списку потрібних товарів своєму постачальнику. Коли ваш "
-"постачальник відповість на ваш запит, ви можете вирішити продовжити "
-"пропозицію та придбати товари або відхилити пропозицію."
-
-#: ../../purchase/overview/process/difference.rst:15
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:5
-msgid ""
-"A **Purchase Tender** (PT), also known as Call for Bids, is used to drive "
-"competition between several suppliers in order to get the best offer for a "
-"list of products. In comparison to the RfQ, a Purchase Tender is sent to "
-"multiple suppliers, stating each are competing with one another, and that "
-"the best offer will win. The main interest is that it usually leads to "
-"better offers."
-msgstr ""
-"**Тендер на купівлю** (ТНК), також відомий як Call for Bids, "
-"використовується для стимулювання конкуренції між декількома "
-"постачальниками, щоб отримати найкращу пропозицію для переліку товарів. У "
-"порівнянні із ЗНКП, тендер на купівлю надсилається кількома постачальниками,"
-" заявляючи, що кожен конкурує один з одним і що найкраща пропозиція виграє. "
-"Головний інтерес полягає в тому, що зазвичай це призводить до кращих "
-"пропозицій."
-
-#: ../../purchase/overview/process/difference.rst:22
-msgid ""
-"The **Purchase Order** (PO) is the actual order that you place to the "
-"supplier that you chose, either through a RfQ, a Purchase Tender, or simply "
-"when you already know which supplier to order from."
-msgstr ""
-"**Замовлення на купівлю** (ЗНК) - це фактичне замовлення, яке ви розміщуєте "
-"постачальнику, якого ви обрали, через ЗНКП, тендер на купівлю або коли ви "
-"вже знаєте, який постачальник повинен зробити замовлення."
-
-#: ../../purchase/overview/process/difference.rst:27
-msgid "When to use?"
-msgstr "Коли використовувати?"
-
-#: ../../purchase/overview/process/difference.rst:29
-msgid ""
-"A **RfQ** is interesting when you have never purchased the products with "
-"that supplier before and therefore don't know their price. It is also useful"
-" if you want to challenge your suppliers once you have a well-established "
-"relationship with them. You can also use it to assess the cost of a project "
-"and see if it makes it feasible."
-msgstr ""
-"**ЗНКП** цікаво, коли ви ніколи раніше не придбали товари з цим "
-"постачальником, і тому не знаєте їх ціни. Це також корисно, якщо ви хочете "
-"кинути виклик своїм постачальникам, якщо ви маєте добре налагоджений зв'язок"
-" з ними. Ви також можете використовувати його для оцінки вартості проекту і "
-"дізнатися, чи це можливо."
-
-#: ../../purchase/overview/process/difference.rst:35
-msgid ""
-"A **Purchase Tender** is used for public offers that require an open "
-"offering from several suppliers. It is also useful when you need to make a "
-"one-off order for a product and you would like to get the best offer, no "
-"matter which supplier it is. It may be used when your supplier has not been "
-"up to your standards and you would like to either push them to deliver a "
-"better service, or find a replacement in their competitors."
-msgstr ""
-"**Тендер на купівлю** використовується для публічних пропозицій, які "
-"вимагають відкритої пропозиції від декількох постачальників. Це також "
-"корисно, коли вам потрібно зробити одноразове замовлення на товар, і ви "
-"хотіли б отримати найкращу пропозицію незалежно від того, який це "
-"постачальник. Це може бути використано, коли ваш постачальник не відповідає "
-"вашим стандартам, і ви хотіли б або натиснути на них, щоб забезпечити кращу "
-"послугу, або знайти заміну у своїх конкурентів."
-
-#: ../../purchase/overview/process/difference.rst:43
-msgid "When not to use?"
-msgstr "Коли не використовувати?"
-
-#: ../../purchase/overview/process/difference.rst:45
-msgid ""
-"**RfQ**\\ s become unnecessary once you have established your favorite "
-"supplier for each item, and will only increase the delay in the delivery of "
-"your items. In that case, the process will be simpler by starting straight "
-"from a Purchase Order."
-msgstr ""
-"**ЗНКП**\\ стає непотрібною, коли ви встановите вашого улюбленого "
-"постачальника для кожного товару, і тільки збільшить затримку в доставці "
-"ваших товарів. У такому випадку процес буде простішим, починаючи "
-"безпосередньо із замовлення на купівлю."
-
-#: ../../purchase/overview/process/difference.rst:50
-msgid ""
-"**Purchase Tenders** are a long and tedious process that will likely take "
-"more than several weeks in the best cases. If you need a quick delivery, "
-"this is not the way to go. Also, if you have a well-established relationship"
-" with one supplier, think twice before you initiate a PT with them as it "
-"might tear the relationship and finally lead to less interesting deals."
-msgstr ""
-"**Тендери на купівлю** - це довгий і нудний процес, який, найімовірніше, "
-"займе більше декількох тижнів. Якщо вам потрібна швидка доставка, це не той "
-"шлях, яким варто іти. Крім того, якщо у вас добре налагоджені відносини з "
-"одним постачальником, подумайте двічі, перш ніж проводити з ними ТНК, "
-"оскільки це може спричинити розрив відносин і, нарешті, призвести до менш "
-"цікавих операцій."
-
-#: ../../purchase/overview/process/difference.rst:58
-#: ../../purchase/replenishment/flows/compute_date.rst:139
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:39
-msgid "Example"
-msgstr "Приклад"
-
-#: ../../purchase/overview/process/difference.rst:60
-msgid ""
-"My company builds wooden furniture. For the new series of table we are "
-"designing, we need some screws, metal frames and rubber protections."
-msgstr ""
-"Наша компанія виробляє дерев'яні меблі. Для нової серії таблиць, яку ми "
-"розробляємо, нам потрібні шурупи, металеві рами та гумові захисні елементи."
-
-#: ../../purchase/overview/process/difference.rst:63
-msgid ""
-"I create a Request for Quotation in Odoo with those products to my usual "
-"supplier, and send it by email. He answers back with an offer. However, I am"
-" not convinced by the offer, and I want to see if anyone can give a better "
-"one."
-msgstr ""
-"Ми створюємо запит на комерційну пропозицію в Odoo з цими товарами для "
-"нашого звичайного постачальника та відправляємо його по електронній пошті. "
-"Він відповідає на пропозицію. Проте, ми не впевнені в пропозиції і хочемо "
-"побачити, чи зможе хтонебудь надати послугу краще."
-
-#: ../../purchase/overview/process/difference.rst:68
-msgid ""
-"I decide to push competition a bit and set up a Purchase Tender, that Odoo "
-"will send to a list of suppliers I specified. Out of the 8 offers I receive,"
-" one gets my attention and I decide to go ahead with that one."
-msgstr ""
-"Ми вирішуємо трохи посилити конкуренцію і налаштувати тендер на купівлю, "
-"який Odoo відправить до списку постачальників, які ми вказали. З 8 "
-"пропозицій, які ми отримуємо, обираємо найкращого та працюємо з ним."
-
-#: ../../purchase/overview/process/difference.rst:72
-msgid ""
-"I confirm the order to the supplier by creating a Purchase Order from the "
-"PT, and Odoo automatically asks delivery of the items to the supplier."
-msgstr ""
-"Ми підтверджуємо замовлення постачальнику, створивши замовлення на купівлю з"
-" ТНК, і Odoo автоматично запитує доставку товарів постачальнику. "
-
-#: ../../purchase/overview/process/difference.rst:77
-#: ../../purchase/purchases/master/suppliers.rst:16
-#: ../../purchase/purchases/master/uom.rst:22
-#: ../../purchase/purchases/rfq/3_way_matching.rst:18
-#: ../../purchase/purchases/rfq/analyze.rst:24
-#: ../../purchase/purchases/rfq/bills.rst:31
-#: ../../purchase/purchases/rfq/create.rst:16
-#: ../../purchase/purchases/rfq/reception.rst:14
-#: ../../purchase/purchases/tender/partial_purchase.rst:14
-#: ../../purchase/replenishment/flows/dropshipping.rst:13
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:58
-#: ../../purchase/replenishment/flows/warning_triggering.rst:21
-msgid "Configuration"
-msgstr "Налаштування"
-
-#: ../../purchase/overview/process/difference.rst:79
-msgid ""
-"If you want to know how to create a **Purchase Order**, read the "
-"documentation on :doc:`from_po_to_invoice`"
-msgstr ""
-"Якщо ви хочете дізнатися, як створити **Замовлення на купівлю** прочитайте "
-"документацію :doc:`from_po_to_invoice`"
-
-#: ../../purchase/overview/process/difference.rst:82
-msgid ""
-"If you want to know how to create a **RfQ**, read the documentation on "
-":doc:`../../purchases/rfq/create`"
-msgstr ""
-"Якщо хочете дізнатись, як створити **ЗНКП**, прочитайте документацію "
-":doc:`../../purchases/rfq/create`"
-
-#: ../../purchase/overview/process/difference.rst:85
-msgid ""
-"If you want to know how to create a **Purchase Tender**, read the "
-"documentation on :doc:`../../purchases/tender/manage_multiple_offers`"
-msgstr ""
-"Якщо хочете дізнатись, як створити **Тендер на купівлю**, прочитайте "
-"документацію :doc:`../../purchases/tender/manage_multiple_offers`"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:3
-msgid "From purchase order to invoice and receptions"
-msgstr "Від замовлення на купівлю до рахунків та квитанцій"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:5
-msgid ""
-"For most of your everyday purchases, chances are you already know where to "
-"purchase and at what price. For these cases, a simple Purchase Order (PO) "
-"will allow you to handle the whole process."
-msgstr ""
-"Для більшості ваших повсякденних покупок, швидше за все, ви вже знаєте, де "
-"придбати і за якою ціною. Для цих випадків просте замовлення на купівлю (ЗК)"
-" дозволить вам обробляти весь процес."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:9
-msgid ""
-"In Odoo, a purchase order can be created as is, but can also be the result "
-"of a Request for Quotation or of a Purchase Tender. Therefore, every "
-"purchase made in Odoo has a PO."
-msgstr ""
-"В Odoo замовлення на купівлю може бути створено так, як це є, але також може"
-" бути результатом запиту на пропозицію або тендеру на придбання. Тому кожна "
-"покупка в Odoo має ЗК."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:13
-msgid ""
-"The PO will generate an invoice, and depending on the contract with your "
-"supplier, you will be required to pay the invoice before or after delivery."
-msgstr ""
-"ЗК створить рахунок-фактуру, і залежно від контракту з постачальником, вам "
-"доведеться сплатити рахунок-фактуру до або після доставки."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:18
-msgid "Install the Purchase Management application"
-msgstr "Встановіть додаток Управління купівлями"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:20
-msgid ""
-"From the **Apps** application, search and install the **Purchase "
-"Management** application."
-msgstr ""
-"У додатку **Програми** виконайте пошук і встановіть додаток **Управління "
-"купівлями**."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:27
-msgid "Creating a Purchase Order"
-msgstr "Створення замовлення на купівлю"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:29
-msgid ""
-"In the **Purchases** app, open the **Purchase** menu and click on **Purchase"
-" Orders**."
-msgstr ""
-"У додатку **Купівлі** відкрийте меню **Купівлі** та натисніть **Замовлення "
-"на купівлю**."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:32
-msgid "In the **Purchase Orders** window, click on **Create**."
-msgstr "У вікні **Замовлення на купівлю** натисніть **Створити**."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:37
-msgid ""
-"From the new window, insert the **Vendor** and type in the **Order Date**."
-msgstr ""
-"У новому вікні вставте **постачальника** та введіть **дату замовлення**."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:40
-msgid "In the **Products** section, click on **Add an item**."
-msgstr "У розділі **Товари** натисніть на **Додати елемент**."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:45
-msgid "Select your product from the list and add a description if necessary."
-msgstr "Виберіть товар зі списку та додайте опис, якщо це необхідно."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:47
-msgid "The **Scheduled Date** menu corresponds to the expected delivery date."
-msgstr "Меню **Запланована дата** відповідає очікуваній даті доставки."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:49
-msgid ""
-"Type in the quantity which you wish to purchase, then click on **Save** and "
-"on **Confirm Order**."
-msgstr ""
-"Введіть кількість, яку ви бажаєте придбати, потім натисніть кнопку "
-"**Зберегти** та на **Підтвердити замовлення**."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:53
-msgid ""
-"If you wish to go through the complete flow and create a **Request for "
-"Quotation** for this order, refer to the document on "
-":doc:`../../purchases/rfq/create`"
-msgstr ""
-"Якщо ви хочете пройти повний процес і створити **Запит на комерційну "
-"пропозицію** для цього замовлення, зверніться до документації "
-"в:doc:`../../purchases/rfq/create`"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:57
-msgid ""
-"As you can see, the status of the PO has switched to ``Purchase Order``."
-msgstr "Як ви бачите, статус ЗК перейшов до ``Замовлення на купівлю``."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:63
-msgid "Registering invoice, payments and receiving products"
-msgstr "Реєстрація рахунків-фактур, платежів та отримання товарів"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:65
-msgid ""
-"Depending on the contract you have with your supplier, you can either pay "
-"for the purchase upon delivery of the goods, or get the goods delivered "
-"after payment."
-msgstr ""
-"Залежно від контракту, який ви маєте зі своїм постачальником, ви можете "
-"заплатити за покупку після доставки товару або придбати товар після "
-"доставки."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:70
-msgid "Payment upon or after reception"
-msgstr "Оплата під час або після прийому"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:72
-msgid "Still from your purchase order, click on **Receive Products**."
-msgstr "З вашого замовлення на купівлю натисніть **Отримати товари**."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:74
-msgid ""
-"In the next page, check that the number of products received corresponds to "
-"the number ordered, then manually enter the delivered quantity and click on "
-"**Validate**."
-msgstr ""
-"На наступній сторінці перевірте, чи кількість отриманих товарів відповідає "
-"замовленій кількості, потім вручну введіть доставлену кількість та натисніть"
-" кнопку **Перевірити**."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:81
-msgid ""
-"Go back to the PO. In the PO, a **Shipment** and an **Invoice** button have "
-"appeared."
-msgstr ""
-"Поверніться до PO. У PO з'явилася кнопка **відвантаження** та **рахунок-"
-"фактура**."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:87
-msgid ""
-"Click on the **Invoices** button, then click on **Validate**. The invoice is"
-" now registered in the system. Click on **Register Payment**, insert the "
-"detail of the payment, and click on **Validate**."
-msgstr ""
-"Натисніть кнопку **Рахунки-фактури**, потім натисніть **Перевірити**. Тепер "
-"рахунок-фактура зареєстрована в системі. Натисніть кнопку **Зареєструвати "
-"платіж**, введіть деталі платежу та натисніть **Підтвердити**."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:94
-#: ../../purchase/overview/process/from_po_to_invoice.rst:124
-msgid ""
-"Your products are now ready for picking and storage, and the invoice is "
-"marked as paid."
-msgstr ""
-"Ваші товари вже готові до комплектування та зберігання, а рахунок-фактуру "
-"позначено як оплачену."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:98
-msgid "Upfront payment"
-msgstr "Авансовий платіж"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:100
-msgid ""
-"From the **Purchase Order** page, open the **Invoices** tab, then click on "
-"**Create**."
-msgstr ""
-"На сторінці **Замовлення на купівлю** відкрийте вкладку **Рахунки-фактури** "
-"та натисніть кнопку **Створити**."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:103
-msgid ""
-"In the next page, click on **Validate**. The invoice is now registered in "
-"the system. Click on **Register Payment**, insert the detail of the payment,"
-" and click on **Validate**."
-msgstr ""
-"На наступній сторінці натисніть кнопку **Підтвердити**. Тепер рахунок-"
-"фактура зареєстрована в системі. Натисніть кнопку **Зареєструвати платіж**, "
-"введіть деталі платежу та натисніть **Підтвердити**."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:110
-msgid ""
-"Go back to the PO. In the PO, a **Shipment** tab and an **Invoice** tab have"
-" appeared."
-msgstr ""
-"Повернутися до ЗК. У ЗК з'явилася вкладка **Доставка** та вкладка **Рахунок-"
-"фактура**."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:116
-msgid ""
-"Click on **Receive Products**, then in the new page, click on **Validate**."
-msgstr ""
-"Натисніть **Отримати товари**, потім на новій сторінці натисніть "
-"**Підтвердити**."
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:121
-msgid ""
-"A window will appear, asking if you wish to process every item at once. "
-"Click on **Apply**."
-msgstr ""
-"З'явиться вікно із запитом, чи хочете ви обробляти кожен елемент одночасно. "
-"Натисніть **Застосувати**."
-
 #: ../../purchase/purchases.rst:3
 msgid "Purchases"
-msgstr "Закупівлі"
+msgstr "Купівлі"
 
 #: ../../purchase/purchases/master.rst:3
 msgid "Master Data"
 msgstr "Основні дані"
 
 #: ../../purchase/purchases/master/import.rst:3
-msgid "How to import supplier pricelists?"
-msgstr "Як імпортувати прайслист постачальника в Odoo?"
+msgid "Import vendors pricelists"
+msgstr ""
 
-#: ../../purchase/purchases/master/import.rst:6
-msgid "Introduction"
-msgstr "Загальний огляд"
-
-#: ../../purchase/purchases/master/import.rst:8
+#: ../../purchase/purchases/master/import.rst:5
 msgid ""
-"Big companies use to import supplier pricelists day to day. Indeed, prices "
-"are always changing and you need to get price up to date to deal with a high"
-" number of products."
+"It is key for companies to be able to import vendors pricelists to stay up "
+"to date on products pricing."
 msgstr ""
-"Великі компанії використовують імпорт прайс-листів постачальників кожного "
-"дня. Дійсно, ціни завжди змінюються, і вам потрібно оновлювати ціну, щоби "
-"мати справу з великою кількістю товарів."
 
-#: ../../purchase/purchases/master/import.rst:12
+#: ../../purchase/purchases/master/import.rst:9
+#: ../../purchase/purchases/master/uom.rst:22
+#: ../../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/create.rst:13
+#: ../../purchase/purchases/rfq/lock_orders.rst:9
+#: ../../purchase/purchases/rfq/reception.rst:14
+#: ../../purchase/purchases/rfq/warning.rst:14
+#: ../../purchase/purchases/tender/blanket_orders.rst:10
+#: ../../purchase/purchases/tender/call_for_tender.rst:9
+#: ../../purchase/replenishment/flows/dropshipping.rst:13
+msgid "Configuration"
+msgstr "Налаштування"
+
+#: ../../purchase/purchases/master/import.rst:11
 msgid ""
-"To manage supplier prices on product form, read this document "
-"(:doc:`suppliers`). Here we will show you how to import customer prices."
+"For this feature to work, go to :menuselection:`Purchases --> Configuration "
+"--> Settings` and tick the box in front of \"Vendor Pricelists\"."
 msgstr ""
-"Щоби керувати цінами постачальників на формі товару, прочитайте попередню "
-"документацію (:doc:`suppliers`). Тут ми покажемо, як імпортувати ціни "
-"постачальників."
 
-#: ../../purchase/purchases/master/import.rst:16
-msgid "Required configuration"
-msgstr "Необхідне налаштування"
-
-#: ../../purchase/purchases/master/import.rst:18
-msgid "In purchase settings, you have 2 options:"
-msgstr "У налаштуваннях купівлі є 2 варіанти:"
-
-#: ../../purchase/purchases/master/import.rst:20
-msgid "Manage vendor price on the product form"
-msgstr "Керування ціною постачальника на формі товару"
-
-#: ../../purchase/purchases/master/import.rst:22
-msgid "Allow using and importing vendor pricelists"
-msgstr "Дозволити використання та імпорт прайс-листів постачальників"
-
-#: ../../purchase/purchases/master/import.rst:24
-msgid "Here we are selecting: **Allow using and importing vendor pricelists**"
+#: ../../purchase/purchases/master/import.rst:15
+msgid "Don't forget to save your settings in the top left corner."
 msgstr ""
-"Тут ми обираємо: **Дозволити використання та імпорт прайс-листів "
-"постачальників**"
 
-#: ../../purchase/purchases/master/import.rst:30
-msgid "Import vendor pricelists"
-msgstr "Імпортувати прайслист постачальника"
+#: ../../purchase/purchases/master/import.rst:21
+msgid "Import a pricelist"
+msgstr ""
 
-#: ../../purchase/purchases/master/import.rst:32
+#: ../../purchase/purchases/master/import.rst:23
+msgid "To import go to :menuselection:`Purchase --> Vendor Pricelists`"
+msgstr ""
+
+#: ../../purchase/purchases/master/import.rst:25
 msgid ""
-"There are 2 scenarios: import the vendor pricelist for the first time, or "
-"update an existing vendor pricelist. In both scenarios, we assume your "
-"product list and vendor list is updated and you want to import the price "
-"list of vendors for a given product."
+"Load your file, then you can check if everything is correct before clicking "
+"import."
 msgstr ""
-"Існує два сценарії: імпортуйте прайс-лист постачальника вперше або оновіть "
-"існуючий прайслист постачальника. В обох сценаріях ми припускаємо, що ваш "
-"список товарів і список постачальників оновлено, і ви хочете імпортувати "
-"прайс-лист постачальників для даного товару."
 
-#: ../../purchase/purchases/master/import.rst:40
+#: ../../purchase/purchases/master/import.rst:28
+msgid "See below a template of the columns used."
+msgstr ""
+
+#: ../../purchase/purchases/master/import.rst:33
 msgid ""
-"To import a list from a document, the best pratice is to export first to get"
-" an example of data formating and a proper header to reimport."
+"`Template download "
+"<https://docs.google.com/spreadsheets/d/1N8c_eejLV_8NhYMGCfZau_oGCnRkUIT9nwdX7n0shhY/edit#gid=964193981>`__"
 msgstr ""
-"Щоб імпортувати список з документа, краще спочатку навчитися експортувати, "
-"щоб отримати приклад форматування даних та правильний заголовок для "
-"повторного імпорту."
-
-#: ../../purchase/purchases/master/import.rst:50
-msgid "Import the list for the first time"
-msgstr "Імпорт списку вперше"
-
-#: ../../purchase/purchases/master/import.rst:53
-msgid "Prepare the document"
-msgstr "Підготуйте документ"
-
-#: ../../purchase/purchases/master/import.rst:55
-msgid ""
-"In :menuselection:`Purchase --> Purchase --> Supplier Pricelists`, export a "
-"template of document to get import/export compatible and get the right "
-"format to import in mass. Create manually a data and export it "
-"(:menuselection:`select --> Action --> Export`)"
-msgstr ""
-"У :menuselection:`Купівлі --> Купівлі --> Прайс-листи постачальника` "
-"експортуйте шаблон документа, щоб отримати сумісний імпорт/експорт та "
-"отримати правильний формат для масового імпорту. Створіть дані вручну та "
-"експортуйте їх (:menuselection:`виберіть --> Дія --> Експорт`)"
-
-#: ../../purchase/purchases/master/import.rst:63
-msgid "Here is the list of fields you can import:"
-msgstr "Ось список полів, які ви можете імпортувати:"
-
-#: ../../purchase/purchases/master/import.rst:66
-msgid "**Header of the document to import (csv, xls)**"
-msgstr "**Заголовок документа для імпорту (csv, xls)**"
-
-#: ../../purchase/purchases/master/import.rst:66
-msgid "**Meaning and how to get it**"
-msgstr "**Значення і як його отримати**"
-
-#: ../../purchase/purchases/master/import.rst:66
-msgid "**Example**"
-msgstr "**Приклад**"
-
-#: ../../purchase/purchases/master/import.rst:68
-msgid "name_id"
-msgstr "name_id"
-
-#: ../../purchase/purchases/master/import.rst:68
-msgid "Vendor ID -> export supplier list to get it"
-msgstr ""
-"Ідентифікатор постачальника -> експортувати список постачальників, щоб "
-"отримати його"
-
-#: ../../purchase/purchases/master/import.rst:68
-msgid "\\_\\_export\\_\\_.res\\_partner\\_12"
-msgstr "\\_\\_export\\_\\_.res\\_partner\\_12"
-
-#: ../../purchase/purchases/master/import.rst:70
-msgid "product_code"
-msgstr "product_code"
-
-#: ../../purchase/purchases/master/import.rst:70
-msgid "Vendor product Code -> free text"
-msgstr "Код товару постачальника -> вільний текст"
-
-#: ../../purchase/purchases/master/import.rst:70
-msgid "569874"
-msgstr "569874"
-
-#: ../../purchase/purchases/master/import.rst:72
-msgid "price"
-msgstr "price"
-
-#: ../../purchase/purchases/master/import.rst:72
-msgid "Vendor Price -> free text"
-msgstr "Ціна постачальника -> безкоштовний текст"
-
-#: ../../purchase/purchases/master/import.rst:72
-msgid "1500"
-msgstr "1500"
-
-#: ../../purchase/purchases/master/import.rst:74
-msgid "product_tmpl_id.id"
-msgstr "product_tmpl_id.id"
-
-#: ../../purchase/purchases/master/import.rst:74
-msgid "Product Template ID -> export you product list to get it"
-msgstr ""
-"Ідентифікатор шаблону товару -> експортувати список товарів, щоб отримати "
-"його"
-
-#: ../../purchase/purchases/master/import.rst:74
-msgid "\\_\\_export\\_\\_.product_template_13"
-msgstr "\\_\\_export\\_\\_.product_template_13"
-
-#: ../../purchase/purchases/master/import.rst:76
-msgid "currency_id.id"
-msgstr "currency_id.id"
-
-#: ../../purchase/purchases/master/import.rst:76
-msgid "Currency -> to get it export the currency list"
-msgstr "Валюта -> щоб експортувати валютний список"
-
-#: ../../purchase/purchases/master/import.rst:78
-msgid "date_end"
-msgstr "date_end"
-
-#: ../../purchase/purchases/master/import.rst:78
-msgid "End date of the price validity"
-msgstr "Дата закінчення терміну дії ціни"
-
-#: ../../purchase/purchases/master/import.rst:78
-msgid "2015-10-22"
-msgstr "2015-10-22"
-
-#: ../../purchase/purchases/master/import.rst:80
-msgid "min_qty"
-msgstr "min_qty"
-
-#: ../../purchase/purchases/master/import.rst:80
-msgid "Minimal quantity to purchase from this vendor"
-msgstr "Мінімальна кількість для покупки від цього постачальника"
-
-#: ../../purchase/purchases/master/import.rst:80
-msgid "2"
-msgstr "2"
-
-#: ../../purchase/purchases/master/import.rst:82
-msgid "product_id.id"
-msgstr "product_id.id"
-
-#: ../../purchase/purchases/master/import.rst:82
-msgid "Product Variante name -> export your variant list to get it"
-msgstr ""
-"Назва варіанта товару -> експортувати свій варіант списку, щоб отримати його"
-
-#: ../../purchase/purchases/master/import.rst:82
-msgid "\\_\\_export\\_\\_.product\\_13"
-msgstr "\\_\\_export\\_\\_.product\\_13"
-
-#: ../../purchase/purchases/master/import.rst:84
-msgid "date_start"
-msgstr "date_start"
-
-#: ../../purchase/purchases/master/import.rst:84
-msgid "Start date of price validity"
-msgstr "Дата початку дії ціни"
-
-#: ../../purchase/purchases/master/import.rst:84
-msgid "2015-12-31"
-msgstr "2015-12-31"
-
-#: ../../purchase/purchases/master/import.rst:87
-msgid "You obtain a document which can be imported, fill in your vendor pices"
-msgstr ""
-"Ви отримуєте документ, який можна імпортувати, заповніть свого "
-"постачальника."
-
-#: ../../purchase/purchases/master/import.rst:92
-msgid ""
-"Import this document in Odoo. Click on **Import** in the list view and "
-"upload your document. You can validate and check error. Once the system "
-"tells you everything is ok, you can import the list."
-msgstr ""
-"Імпортуйте цей документ у Odoo. Натисніть **Імпортувати** у вікні списку та "
-"завантажте свій документ. Ви можете перевірити помилки. Коли система скаже, "
-"що все добре, ви можете імпортувати список."
-
-#: ../../purchase/purchases/master/import.rst:102
-msgid ""
-"After the import, the **Vendors** section in **Inventory** tab of the "
-"product form is filled in."
-msgstr ""
-"Після імпорту заповнюється розділ **Постачальники** на вкладці **Склад** "
-"форми товару."
-
-#: ../../purchase/purchases/master/import.rst:106
-msgid "Update the vendor pricelist"
-msgstr "Оновіть прайс-лист постачальника"
-
-#: ../../purchase/purchases/master/import.rst:108
-msgid ""
-"When the pricelist of your suppliers change, it is necessary to update "
-"existing prices."
-msgstr ""
-"Коли змінюється прайс-лист ваших постачальників, необхідно оновити існуючі "
-"ціни."
-
-#: ../../purchase/purchases/master/import.rst:111
-msgid ""
-"Follow the procedure of the first scenario in order to export existing data "
-"from :menuselection:`Purchases --> Purchase --> Vendor Pricelist`. Select "
-"everything, and export from the **Action** menu."
-msgstr ""
-"Дотримуйтесь процедури першого сценарію, щоб експортувати існуючі дані з "
-":menuselection:`Купівлі --> Купівля --> Прайс-лист постачальника`. Виберіть "
-"все, і експортуйте з меню **Дія**."
-
-#: ../../purchase/purchases/master/import.rst:115
-msgid ""
-"Change price, end date, add a line, change a supplier, ... and then reimport"
-" in Odoo. Thanks to the ID, the list will be updated. Either the id is "
-"recognized and the line is updated or the ID is not known by Odoo and it "
-"will create a new pricelist line."
-msgstr ""
-"Змініть ціну, дату завершення, додайте рядок, змініть постачальника, ... а "
-"потім знову додайте в Odoo. Завдяки ідентифікації список буде оновлено. Або "
-"ідентифікатор визнається, а рядок оновлюється, або ідентифікатор не відомий "
-"Odoo, і він створить новий рядок прайс-листа."
-
-#: ../../purchase/purchases/master/import.rst:120
-msgid ""
-"After the import, the **Vendors** section in **Inventory** tab of the "
-"product form is updated."
-msgstr ""
-"Після імпорту оновлюється розділ **Постачальники** на вкладці **Склад** "
-"форми товару."
 
 #: ../../purchase/purchases/master/suppliers.rst:3
-msgid "How to set several suppliers on a product?"
-msgstr "Як встановити кілька постачальників на товарі?"
+msgid "Set multiple vendors on a product"
+msgstr ""
 
 #: ../../purchase/purchases/master/suppliers.rst:5
 msgid ""
-"Keeping track of your vendors can be a real burden in day-to-day business "
-"life. Prices can change and you might have several suppliers for one "
-"product. With Odoo you have the possibility to directly link vendors with "
-"the corresponding product and specify prices automatically the first time "
-"you purchase them."
+"If you find yourself with the need to buy from multiple vendors for one "
+"product, Odoo can let you directly link them with a single product."
+msgstr ""
+
+#: ../../purchase/purchases/master/suppliers.rst:9
+msgid "Add vendors in a product"
 msgstr ""
-"Відстеження ваших постачальників може стати справжнім тягарем у "
-"повсякденному діловому житті. Ціни можуть змінюватися, і у вас може бути "
-"декілька постачальників одного товару. За допомогою Odoo у вас є можливість "
-"безпосередньо зв'язати постачальників з відповідним товаром і автоматично "
-"вказувати ціни при першому придбанні."
 
 #: ../../purchase/purchases/master/suppliers.rst:11
 msgid ""
-"We will take the following example: We need to buy ``5 t-shirts``. We found "
-"a **Vendor**; called ``Bob&Jerry's`` and we want to issue a request for "
-"quotation."
+"To use this feature, go to :menuselection:`Purchases --> Products`, then "
+"select a product."
 msgstr ""
-"Наведемо приклад: ми повинні купити ``5 футболок``. Ми знайшли "
-"**постачальника**, який називається ``Bob&Jerry``, і ми хочемо виставити "
-"запит на комерційну пропозицію."
 
-#: ../../purchase/purchases/master/suppliers.rst:19
-msgid "Install the purchase module"
-msgstr "Встановіть модуль купівлі"
-
-#: ../../purchase/purchases/master/suppliers.rst:21
+#: ../../purchase/purchases/master/suppliers.rst:14
 msgid ""
-"The first step to set your suppliers on your products is to install the "
-"purchase module. Go into your **App** module and install the **Purchase** "
-"module."
+"From there you can add existing vendors to your product or create a new one "
+"on the fly."
 msgstr ""
-"Першим кроком для встановлення постачальників на ваших товарах є "
-"встановлення модуля купівлі. Перейдіть до **додатків** та встановіть модуль "
-"**Купівлі**."
 
-#: ../../purchase/purchases/master/suppliers.rst:29
-msgid ""
-"By installing the purchase module, the inventory and invoicing module will "
-"be installed as well."
-msgstr ""
-"Встановивши модуль купівлі, модуль склад та виставлення рахунків також буде "
-"встановлено."
-
-#: ../../purchase/purchases/master/suppliers.rst:33
-msgid "Create a Vendor"
-msgstr "Створіть постачальника"
-
-#: ../../purchase/purchases/master/suppliers.rst:35
-msgid ""
-"The second step is to create a vendor. In this case we'll create the vendor "
-"``Bob&Jerry's``. Enter the purchase module, select :menuselection:`Purchase "
-"--> Vendors` and create a new vendor."
-msgstr ""
-"Другий крок - створиіть постачальника. У цьому випадку ми створимо "
-"постачальника ``Bob&Jerry``. Введіть модуль купівлі, виберіть "
-":menuselection:`Купівлі --> Постачальники` та створіть нового постачальника."
-
-#: ../../purchase/purchases/master/suppliers.rst:39
-msgid ""
-"You can choose if the contact is a company or a person, fill in basic "
-"information such as address, phone, email,..."
-msgstr ""
-"Ви можете вибрати, чи контакт є компанією або особою, заповніть основну "
-"інформацію, таку як адреса, телефон, електронна пошта ..."
-
-#: ../../purchase/purchases/master/suppliers.rst:42
-msgid ""
-"If you did not create the contact from the purchase module you will need to "
-"go in the **Sales and Purchases** tab as well and indicate that the contact "
-"is a **Vendor** (see picture below). If the contact is created from the "
-"purchase module this box will be ticked automatically."
-msgstr ""
-"Якщо ви не створили контакт з модуля купівлі, вам потрібно буде перейти на "
-"вкладку **Продажі та купівлі** та вказати, що контакт є **постачальником** "
-"(див. Малюнок нижче). Якщо контакт створено з модуля купівлі, це буде "
-"позначено автоматично."
-
-#: ../../purchase/purchases/master/suppliers.rst:51
-msgid "Create a product"
-msgstr "Створіть товар"
-
-#: ../../purchase/purchases/master/suppliers.rst:53
-msgid ""
-"Next we can create the product we want to buy. We don't know the price of "
-"the t-shirt yet because we still need to issue our **Request for "
-"Quotation**."
-msgstr ""
-"Далі ми можемо створити товар, який ми хочемо придбати. Ми не знаємо ціну "
-"футболки, оскільки нам усе ще потрібно виставити наш **запит на комерційну "
-"пропозицію**."
-
-#: ../../purchase/purchases/master/suppliers.rst:57
-msgid ""
-"To create a product enter your purchase module select "
-":menuselection:`Purchase --> Products` and create a new product."
-msgstr ""
-"Щоб створити товар, введіть свій модуль купівлі, виберіть "
-":menuselection:`Купівлі --> Товари` і створіть новий товар."
-
-#: ../../purchase/purchases/master/suppliers.rst:60
-msgid ""
-"We will call our product ``T-shirt`` and specify that the product can be "
-"sold and purchased."
-msgstr ""
-"Ми називатимемо ``футболку`` нашим товаром і вкажемо, що товар може бути "
-"проданий та придбаний."
-
-#: ../../purchase/purchases/master/suppliers.rst:67
-msgid "Add Vendors to the product"
-msgstr "Додайте постачальників до товару"
-
-#: ../../purchase/purchases/master/suppliers.rst:69
-msgid ""
-"The next action is to add vendors to the product. There are two ways to "
-"handle this. If you issue a purchase order for the first time Odoo will "
-"automatically link the vendor and its price to the product. You can also add"
-" vendors manually"
-msgstr ""
-"Наступним кроком є додавання постачальників до товару. Є два способи "
-"вирішити це. Якщо ви вперше виставите замовлення на купівлю, Odoo "
-"автоматично зв'яже постачальника та його ціну з товаром. Ви також можете "
-"додати продавців вручну"
-
-#: ../../purchase/purchases/master/suppliers.rst:75
-msgid "By issuing a first Purchase Order to new vendor"
-msgstr "Видаючи перше замовлення на купівлю новому постачальнику"
-
-#: ../../purchase/purchases/master/suppliers.rst:77
-msgid ""
-"When issuing a purchase order for the first time to a vendor, he will "
-"automatically be linked to the product by Odoo. For our example let's say "
-"that we issue a first purchase order to ``Bob&Jerry's`` for ``5 t-shirts`` "
-"at ``12.35 euros / piece``."
-msgstr ""
-"Оформивши постачальнику замовлення на купівлю вперше, він автоматично буде "
-"пов'язаний з товаром Odoo. Скажімо, для нашого прикладу ми надішлемо перше "
-"замовлення на купівлю ``Bob&Jerry`` на ``5 футболок`` у розмірі ``12,35 "
-"євро/шт``."
-
-#: ../../purchase/purchases/master/suppliers.rst:82
-msgid ""
-"First create your purchase order with the correct product and supplier (see "
-"picture below, or the documentation page :doc:`../rfq/create` for more "
-"information)"
-msgstr ""
-"Спочатку створіть замовлення на купівлю з правильним товаром та "
-"постачальником (див. Малюнок нижче), або зверніться за детальною інформацією"
-" в документації :doc:`../rfq/create`."
-
-#: ../../purchase/purchases/master/suppliers.rst:89
-msgid ""
-"When we save and validate the purchase order the vendor will automatically "
-"be added to the product's vendors list. To check this enter the purchase "
-"module, select :menuselection:`Purchase --> Products` and select our T-shirt"
-" product. By opening the **Inventory** tab we notice that our vendor and its"
-" price has automatically been added."
-msgstr ""
-"Коли ми зберігаємо та підтверджуємо замовлення на купівлю, постачальник буде"
-" автоматично доданий до списку постачальників товару. Щоби перевірити це, "
-"введіть модуль купівлі, виберіть :menuselection:`Купівлі --> Товари` та "
-"виберіть наш товар футболки. Відкривши вкладку **Склад**, ми помітили, що "
-"наш постачальник і його ціна були автоматично додані."
-
-#: ../../purchase/purchases/master/suppliers.rst:98
+#: ../../purchase/purchases/master/suppliers.rst:17
 msgid ""
 "Note that every first time the product is purchased from a new vendor, Odoo "
 "will automatically link the contact and price with the product."
@@ -914,35 +124,26 @@ msgstr ""
 "Зверніть увагу, що кожен перший раз, коли товар купується у нового "
 "постачальника, Odoo автоматично зв'язуватиме контакти та ціну з товаром."
 
-#: ../../purchase/purchases/master/suppliers.rst:103
-msgid "By adding manually"
-msgstr "Додавши вручну"
-
-#: ../../purchase/purchases/master/suppliers.rst:105
-msgid ""
-"We can of course also add vendors and vendors information manually. On the "
-"same page than previously, simply click on **Edit** and click the **Add an "
-"item** button."
+#: ../../purchase/purchases/master/suppliers.rst:24
+msgid "Add price & quantity as well as a validity period"
 msgstr ""
-"Звичайно, ми також можемо додати постачальників і інформацію про них вручну."
-" На тій самій сторінці, що і раніше, просто натисніть кнопку **Редагувати** "
-"та натисніть кнопку **Додати елемент**."
 
-#: ../../purchase/purchases/master/suppliers.rst:112
+#: ../../purchase/purchases/master/suppliers.rst:26
 msgid ""
-"When adding a new **Vendor** you are also able to add extra information such"
-" as the vendor product name or code, the validity of the price and the "
-"eventual minimum quantity required. These informations can be added and "
-"modified for existing vendors by simply clicking on the vendors line."
+"When you're adding a vendor to a product, you're able to add the vendor "
+"product name & code as well as set the minimal quantity, price and validity "
+"period."
+msgstr ""
+
+#: ../../purchase/purchases/master/suppliers.rst:34
+msgid ""
+"This Odoo feature also works with variants of your products, such as one "
+"t-shirt in different sizes!"
 msgstr ""
-"Під час додавання нового **постачальника** ви також можете додати додаткову "
-"інформацію, таку як назва товару постачальника або код, дійсну ціну та "
-"мінімальну необхідну кількість. Ці відомості можна додавати та змінювати для"
-" існуючих постачальників, просто натискаючи рядок постачальників."
 
 #: ../../purchase/purchases/master/uom.rst:3
-msgid "How to purchase in different unit of measures than sales?"
-msgstr "Як купляти та продавати у різних одиницях вимірювання?"
+msgid "Purchase in different unit of measures than sales"
+msgstr ""
 
 #: ../../purchase/purchases/master/uom.rst:5
 msgid ""
@@ -1176,97 +377,65 @@ msgstr ""
 "як одиницю вимірювання купівлі у формі товару."
 
 #: ../../purchase/purchases/rfq.rst:3
-msgid "Request for Quotations"
-msgstr "Запит на комерційні пропозиції"
+msgid "Request for Quotation and Purchase Orders"
+msgstr ""
 
 #: ../../purchase/purchases/rfq/3_way_matching.rst:3
-msgid "How to determine if a vendor bill should be paid (3-way matching)"
+msgid "Determine when to pay a vendor bill with 3-way matching"
 msgstr ""
-"Як визначити, чи рахунок постачальника повинен був бути оплачений "
-"(3-стороннє узгодження)"
 
 #: ../../purchase/purchases/rfq/3_way_matching.rst:5
 msgid ""
 "In some industries, you may receive a bill from a vendor before receiving "
-"the ordered products. However, the bill should maybe not be paid until the "
-"products have actually been received."
+"the ordered products. However, you might not want to pay it until the "
+"products have been received."
 msgstr ""
-"У деяких галузях ви можете отримати рахунок від продавця, перш ніж "
-"отримувати замовлені товари. Проте рахунок, можливо, не буде оплачено, поки "
-"товари насправді не отримано."
 
 #: ../../purchase/purchases/rfq/3_way_matching.rst:9
 msgid ""
-"To define whether the vendor bill should be paid or not, you can use what is"
-" called the **3-way matching**. It refers to the comparison of the "
-"information appearing on the Purchase Order, the Vendor Bill and the "
-"Receipt."
+"To define whether the vendor bill should be paid or not, you can use what we"
+" call *3-way matching*. It refers to the comparaison of the information "
+"appearing on the *Purchase Order*, the *Vendor Bill* and the *Receipt*."
 msgstr ""
-"Щоб визначити, чи повинен бути оплачений рахунок постачальника, ви можете "
-"використовувати так зване **3-стороннє узгодження**. Це стосується "
-"порівняння інформації, яка відображається в рахунку замовленя на купівлю, "
-"рахунку постачальника та квитанції."
 
 #: ../../purchase/purchases/rfq/3_way_matching.rst:14
 msgid ""
-"The 3-way matching helps you to avoid paying incorrect or fraudulent vendor "
+"The 3-way matching helps you avoid paying incorrect or fraudulent vendor "
 "bills."
 msgstr ""
-"3-стороння відповідність допоможе вам уникнути сплати невірних або "
-"шахрайських рахунків постачальників."
 
 #: ../../purchase/purchases/rfq/3_way_matching.rst:20
 msgid ""
-"Go in :menuselection:`Purchase --> Configuration --> Settings` and activate "
-"the 3-way matching."
+"For this feature to work, go to :menuselection:`Purchases --> Configuration "
+"--> Settings` and activate the *3-way matching* feature"
 msgstr ""
-"Перейдіть до :menuselection:`Купівлі --> Налаштування --> Налаштування` та "
-"активуйте 3-стороннє узгодження."
 
-#: ../../purchase/purchases/rfq/3_way_matching.rst:30
-msgid "Should I pay this vendor bill?"
-msgstr "Чи повинен я сплачувати цей рахунок постачальника?"
+#: ../../purchase/purchases/rfq/3_way_matching.rst:27
+msgid "Should I pay the vendor bill?"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/3_way_matching.rst:29
+msgid ""
+"With the feature activated you will have a new *Should be paid* line appear "
+"on the vendor bill under the *Other info* tab."
+msgstr ""
 
 #: ../../purchase/purchases/rfq/3_way_matching.rst:32
 msgid ""
-"Once this setting has been activated, a new information appears on the "
-"vendor bill, defining whether the bill should be paid or not. There are "
-"three possible values:"
+"That way Odoo let's you easily know if you should pay the vendor bill or "
+"not."
 msgstr ""
-"Коли цей параметр буде активовано, на рахунку постачальника з'являється нова"
-" інформація, яка визначає, чи потрібно сплачувати рахунок. Є три можливі "
-"значення:"
 
-#: ../../purchase/purchases/rfq/3_way_matching.rst:36
-msgid "*Use case 1*: I have received the ordered products."
-msgstr "*Використовуйте випадок 1*: Я отримав замовлені товари."
-
-#: ../../purchase/purchases/rfq/3_way_matching.rst:43
-msgid "*Use case 2*: I have not received the ordered products."
-msgstr "*Використовуйте випадок 2*: Я не отримав замовлені товари."
-
-#: ../../purchase/purchases/rfq/3_way_matching.rst:50
-msgid ""
-"*Use case 3*: the quantities do not match across the Purchase Order, Vendor "
-"Bill and Receipt."
-msgstr ""
-"*Використовуйте 3-й випадок*: кількість не співпадає із замовленням на "
-"купівлю, рахунком постачальника та квитанцією."
-
-#: ../../purchase/purchases/rfq/3_way_matching.rst:59
+#: ../../purchase/purchases/rfq/3_way_matching.rst:39
 msgid ""
 "The status is defined automatically by Odoo. However, if you want to define "
-"this status manually, you can tick the box *Force Status* and then you will "
-"be able to set manually whether the vendor bill should be paid or not."
+"this status manually, you can tick the box Force Status and then you will be"
+" able to set manually whether the vendor bill should be paid or not."
 msgstr ""
-"Статус визначається автоматично в Odoo. Однак, якщо ви хочете визначити цей "
-"статус вручну, ви можете позначити поле *Примусити статус*, а тоді ви "
-"зможете встановити вручну, чи повинен бути рахунок постачальника оплачений "
-"чи ні."
 
 #: ../../purchase/purchases/rfq/analyze.rst:3
-msgid "How to analyze the performance of my vendors?"
-msgstr "Як проаналізувати ефективність моїх постачальників?"
+msgid "Analyze the performance of my vendors"
+msgstr ""
 
 #: ../../purchase/purchases/rfq/analyze.rst:5
 msgid ""
@@ -1309,7 +478,6 @@ msgstr ""
 "аналізувати, прогнозувати та планувати свої майбутні замовлення."
 
 #: ../../purchase/purchases/rfq/analyze.rst:27
-#: ../../purchase/purchases/tender/partial_purchase.rst:17
 msgid "Install the Purchase Management module"
 msgstr "Встановіть модуль управління купівлями"
 
@@ -1328,25 +496,18 @@ msgstr "Створіть деякі замовлення на купівлю"
 #: ../../purchase/purchases/rfq/analyze.rst:38
 msgid ""
 "Of course, in order to analyze your vendors' performance, you need to issue "
-"some **Request For Quotations** (RfQ) and confirm some **Purchase Orders**. "
-"If you want to know how to generate a purchase order, please read the "
-"documentation :doc:`../../overview/process/from_po_to_invoice`."
+"some **Request For Quotations** (RfQ) and confirm some **Purchase Orders**."
 msgstr ""
-"Звичайно, для того, щоби проаналізувати ефективність своїх постачальників, "
-"вам потрібно буде створити запит на комерційну пропозицію і підтвердити "
-"деякі замовлення на купівлю. Якщо ви хочете дізнатись, як згенерувати "
-"замовлення на купівлю, прочитайте документацію "
-":doc:`../../overview/process/from_po_to_invoice`."
 
-#: ../../purchase/purchases/rfq/analyze.rst:44
+#: ../../purchase/purchases/rfq/analyze.rst:43
 msgid "Analyzing your vendors"
 msgstr "Проаналізуйте ваших постачальників"
 
-#: ../../purchase/purchases/rfq/analyze.rst:47
+#: ../../purchase/purchases/rfq/analyze.rst:46
 msgid "Generate flexible reports"
 msgstr "Створення гнучких звітів"
 
-#: ../../purchase/purchases/rfq/analyze.rst:49
+#: ../../purchase/purchases/rfq/analyze.rst:48
 msgid ""
 "You have access to your vendors' performances on the Reports menu. By "
 "default, the report groups all your purchase orders on a pivot table by "
@@ -1363,7 +524,7 @@ msgstr ""
 "можете додати багато додаткових даних у свій звіт, натиснувши значок "
 "**Вимірювання**."
 
-#: ../../purchase/purchases/rfq/analyze.rst:60
+#: ../../purchase/purchases/rfq/analyze.rst:59
 msgid ""
 "By clicking on the **+** and **-** icons, you can drill up and down your "
 "report in order to change the way your information is displayed. For "
@@ -1376,7 +537,7 @@ msgstr ""
 "всі товари, придбані за поточний місяць, я повинен натиснути **+** на "
 "вертикальній осі, а потім на \"Товари\"."
 
-#: ../../purchase/purchases/rfq/analyze.rst:67
+#: ../../purchase/purchases/rfq/analyze.rst:66
 msgid ""
 "Depending on the data you want to highlight, you may need to display your "
 "reports in a more visual view. You can transform your report in just a click"
@@ -1390,7 +551,7 @@ msgstr ""
 "**Гістограма** та **Графік**: ці види доступні через значки, виділені на "
 "знімку екрана нижче."
 
-#: ../../purchase/purchases/rfq/analyze.rst:77
+#: ../../purchase/purchases/rfq/analyze.rst:76
 msgid ""
 "On the contrary to the pivot table, a graph can only be computed with one "
 "dependent and one independent measure."
@@ -1398,11 +559,11 @@ msgstr ""
 "На відміну від зведеної таблиці, графік може бути обчислений лише з однією "
 "залежною та однією незалежною мірою."
 
-#: ../../purchase/purchases/rfq/analyze.rst:81
+#: ../../purchase/purchases/rfq/analyze.rst:80
 msgid "Customize reports"
 msgstr "Налаштування звітів"
 
-#: ../../purchase/purchases/rfq/analyze.rst:83
+#: ../../purchase/purchases/rfq/analyze.rst:82
 msgid ""
 "You can easily customize your purchase reports depending on your needs. To "
 "do so, use the **Advanced search view** located in the right hand side of "
@@ -1422,7 +583,7 @@ msgstr ""
 "що ви можете фільтрувати та групувати за будь-яким існуючим полем, зробивши "
 "ваше налаштування дуже гнучким та потужним."
 
-#: ../../purchase/purchases/rfq/analyze.rst:97
+#: ../../purchase/purchases/rfq/analyze.rst:96
 msgid ""
 "You can save and reuse any customized filter by clicking on **Favorites** "
 "from the **Advanced search view** and then on **Save current search**. The "
@@ -1432,74 +593,52 @@ msgstr ""
 "натиснувши **Вибране** у **Вікні розширеного пошуку**, а потім на **Зберегти"
 " поточний пошук**. Збережений фільтр буде доступний у меню **Вибране**."
 
-#: ../../purchase/purchases/rfq/analyze.rst:103
-#: ../../purchase/purchases/rfq/create.rst:76
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:86
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:81
-#: ../../purchase/purchases/tender/partial_purchase.rst:77
-msgid ":doc:`../../overview/process/from_po_to_invoice`"
-msgstr ":doc:`../../overview/process/from_po_to_invoice`"
-
 #: ../../purchase/purchases/rfq/approvals.rst:3
-msgid "How to setup two levels of approval for purchase orders?"
-msgstr "Як налаштувати два рівні схвалення для замовлень на купівлю?"
-
-#: ../../purchase/purchases/rfq/approvals.rst:6
-msgid "Two level approval setup"
-msgstr "Встановлення затвердження у два рівні"
-
-#: ../../purchase/purchases/rfq/approvals.rst:8
-msgid ""
-"Double validation on purchases forces a validation when the purchased amount"
-" exceeds a certain limit."
+msgid "Request managers approval for expensive orders"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/approvals.rst:5
+msgid ""
+"In case of expensive purchases you may want a manager approval to validate "
+"the orders, Odoo let's you easily set that up."
 msgstr ""
-"Подвійна перевірка на купівлю змушує перевіряти, коли придбана сума "
-"перевищує певну межу."
 
 #: ../../purchase/purchases/rfq/approvals.rst:11
 msgid ""
-"Install **Purchase Management** module and then go to **General Settings** "
-"to configure the company data."
+"For this feature to work, go to :menuselection:`Purchases --> Configuration "
+"--> Settings` and activate the *Order Approval* feature. From there you can "
+"also set the minimum amount required to activate this feature."
 msgstr ""
-"Встановіть модуль **Управління купівлями**, а потім перейдіть у **Загальні "
-"налаштування**, щоб налаштувати дані компанії."
 
-#: ../../purchase/purchases/rfq/approvals.rst:17
+#: ../../purchase/purchases/rfq/approvals.rst:20
+msgid "Create a new Request for Quotation"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/approvals.rst:22
 msgid ""
-"Set here the amount limit for second approval and set approval from manager "
-"side."
+"While working on a new RfQ, if the order is made by a user and not a manager"
+" and the amount of the order is above the minimum amount you specified, a "
+"new *To Approve* status will be introduced in the process."
 msgstr ""
-"Встановіть тут ліміт суми для другого схвалення та встановіть затвердження "
-"зі сторони менеджера."
 
-#: ../../purchase/purchases/rfq/approvals.rst:21
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:47
-msgid "Process"
-msgstr "Процес"
+#: ../../purchase/purchases/rfq/approvals.rst:31
+msgid "Approve the order"
+msgstr ""
 
-#: ../../purchase/purchases/rfq/approvals.rst:23
+#: ../../purchase/purchases/rfq/approvals.rst:33
 msgid ""
-"Logged as a purchase user, create a purchase order for more than the amount "
-"set above, and confirm it. The purchase order is set in a state **To "
-"Approve**"
+"If you are a purchase manager, you can now go to the purchase order and "
+"approve the order if everything is alright with it. Giving you full control "
+"of what your users can or can't do."
 msgstr ""
-"Записаний як користувач купівлі, створіть замовлення на купівлю, що "
-"перевищує суму, встановлену вище, і підтвердіть її. Замовлення на доставку "
-"встановлено на етапі **Для затвердження**."
 
-#: ../../purchase/purchases/rfq/approvals.rst:29
-msgid "The manager gets the order to approve and validates the final order."
-msgstr ""
-"Менеджер отримує замовлення на затвердження та перевірку остаточного "
-"замовлення."
-
-#: ../../purchase/purchases/rfq/approvals.rst:34
+#: ../../purchase/purchases/rfq/approvals.rst:37
 msgid "Once approved, the purchase order follows the normal process."
 msgstr "Після затвердження замовлення на купівлю слідує звичайному процесу."
 
 #: ../../purchase/purchases/rfq/bills.rst:3
-msgid "How to control supplier bills?"
-msgstr "Як контролювати рахунки постачальників?"
+msgid "Control supplier bills"
+msgstr ""
 
 #: ../../purchase/purchases/rfq/bills.rst:5
 msgid ""
@@ -1563,7 +702,7 @@ msgid ""
 "only one."
 msgstr ""
 "Цей процес може виконуватись трьома різними людьми всередині компанії або "
-"лише одним."
+"лише однією особою."
 
 #: ../../purchase/purchases/rfq/bills.rst:34
 msgid "Installing the Purchase and Inventory applications"
@@ -1813,7 +952,7 @@ msgid ""
 "reasons:"
 msgstr ""
 "Якщо рахунок, який ви отримуєте від постачальника, має кількості, які не "
-"відповідають автоматичному заповнненню Odoo, це може бути пов'язано з "
+"відповідають автоматичному заповненню Odoo, це може бути пов'язано з "
 "кількома причинами:"
 
 #: ../../purchase/purchases/rfq/bills.rst:174
@@ -1909,7 +1048,7 @@ msgstr ""
 
 #: ../../purchase/purchases/rfq/bills.rst:216
 msgid "Ordered quantities"
-msgstr "замовлені кількості"
+msgstr "По замовленій кількості"
 
 #: ../../purchase/purchases/rfq/bills.rst:218
 msgid "Received quantities"
@@ -1934,8 +1073,8 @@ msgstr ""
 " відповідними замовленнями на купівлю."
 
 #: ../../purchase/purchases/rfq/cancel.rst:3
-msgid "How to cancel a purchase order?"
-msgstr "Як скасувати замовлення на купівлю?"
+msgid "Cancel a purchase order"
+msgstr ""
 
 #: ../../purchase/purchases/rfq/cancel.rst:5
 msgid ""
@@ -1978,22 +1117,14 @@ msgstr ""
 "пропозицію, щоб підтвердити замовлення на купівлю"
 
 #: ../../purchase/purchases/rfq/cancel.rst:25
-msgid ""
-"To learn more about the purchase order process, read the documentation page "
-":doc:`../../overview/process/from_po_to_invoice`"
-msgstr ""
-"Щоб дізнатися більше про процес замовлення на купівлю, прочитайте сторінку "
-"документації :doc:`../../overview/process/from_po_to_invoice`"
-
-#: ../../purchase/purchases/rfq/cancel.rst:30
 msgid "Cancel your Purchase Order"
 msgstr "Скасуйте замовлення на купівлю"
 
-#: ../../purchase/purchases/rfq/cancel.rst:33
+#: ../../purchase/purchases/rfq/cancel.rst:28
 msgid "Use case 1 : you didn't receive your goods yet"
 msgstr "Використовуйте випадок 1 : ви ще не отримали ваш товар"
 
-#: ../../purchase/purchases/rfq/cancel.rst:35
+#: ../../purchase/purchases/rfq/cancel.rst:30
 msgid ""
 "If you confirmed your purchase order and did not received your goods yet, "
 "you can simply cancel the PO it by clicking the cancel button."
@@ -2001,7 +1132,7 @@ msgstr ""
 "Якщо ви підтвердили ваше замовлення на купівлю і ще не отримали товар, ви "
 "можете просто скасувати його, натиснувши кнопку скасування."
 
-#: ../../purchase/purchases/rfq/cancel.rst:41
+#: ../../purchase/purchases/rfq/cancel.rst:36
 msgid ""
 "Odoo will automatically cancel the outstanding shipments related to this PO "
 "and the status bar will switch from **Purchase order** to **Cancelled**."
@@ -2009,11 +1140,11 @@ msgstr ""
 "Odoo автоматично скасує відправлену доставку, пов'язану з цією послугою, і "
 "рядок стану переходить від **Замовлення на купівлю** до **Скасованого**."
 
-#: ../../purchase/purchases/rfq/cancel.rst:48
+#: ../../purchase/purchases/rfq/cancel.rst:43
 msgid "Use case 2 : partially delivered goods"
 msgstr "Використовуйте випадок 2: частково доставлені товари"
 
-#: ../../purchase/purchases/rfq/cancel.rst:50
+#: ../../purchase/purchases/rfq/cancel.rst:45
 msgid ""
 "In this case, **2** of the **3 iPad Mini** arrived before you needed to "
 "cancel the PO."
@@ -2021,11 +1152,11 @@ msgstr ""
 "У цьому випадку **2** з **3 iPad Mini** з'явилися перед тим, як потрібно "
 "було скасувати замовлення."
 
-#: ../../purchase/purchases/rfq/cancel.rst:54
+#: ../../purchase/purchases/rfq/cancel.rst:49
 msgid "Register good received and cancel backorder"
 msgstr "Зареєструйте отриманий товар та скасуйте зворотнє замовлення"
 
-#: ../../purchase/purchases/rfq/cancel.rst:56
+#: ../../purchase/purchases/rfq/cancel.rst:51
 msgid ""
 "The first thing to do will be to register the goods received and to cancel "
 "the arrival of the **third iPad Mini** that is still supposed to be shipped."
@@ -2037,11 +1168,11 @@ msgstr ""
 "відправлений. З PO, натисніть **Прийняти товари**, а в **рядку Замовлення "
 "iPad Mini** вручну змініть отримані значення в стовпці **Готово**."
 
-#: ../../purchase/purchases/rfq/cancel.rst:66
+#: ../../purchase/purchases/rfq/cancel.rst:61
 msgid "To learn more, see :doc:`reception`"
 msgstr "Щоб дізнатись більше, дивіться :doc:`reception`"
 
-#: ../../purchase/purchases/rfq/cancel.rst:68
+#: ../../purchase/purchases/rfq/cancel.rst:63
 msgid ""
 "When clicking on **Validate**, Odoo will warn you that you have processed "
 "less products than the initial demand (2 instead of 3 in our case) and will "
@@ -2051,7 +1182,7 @@ msgstr ""
 "товарів, ніж початкова поставка (2 замість 3 у нашому випадку), і попросить "
 "вас дозволу створити зворотнє замовлення."
 
-#: ../../purchase/purchases/rfq/cancel.rst:75
+#: ../../purchase/purchases/rfq/cancel.rst:70
 msgid ""
 "Click on **No backorder** to cancel the supply of the remaining product. You"
 " will notice than the quantity to receive has been changed accordingly and, "
@@ -2061,11 +1192,11 @@ msgstr ""
 "залишкового товару. Ви помітите, що кількість, яку потрібно було отримати, "
 "була відповідно змінена, і тому стан доставки перейшов на **Готово**."
 
-#: ../../purchase/purchases/rfq/cancel.rst:83
+#: ../../purchase/purchases/rfq/cancel.rst:78
 msgid "Create reverse transfer"
 msgstr "Створіть зворотнє замовлення"
 
-#: ../../purchase/purchases/rfq/cancel.rst:85
+#: ../../purchase/purchases/rfq/cancel.rst:80
 msgid ""
 "Now, you need to return the iPad Minis that you have received to your vendor"
 " location. To do so, click on the **Reverse** button from the same document."
@@ -2077,7 +1208,7 @@ msgstr ""
 " З'явиться вікно зворотнього переказу. Введіть кількість, яку потрібно "
 "повернути, і відповідне місцезнаходження та натисніть кнопку **Повернути**."
 
-#: ../../purchase/purchases/rfq/cancel.rst:93
+#: ../../purchase/purchases/rfq/cancel.rst:88
 msgid ""
 "Process the return shipment and control that the stock move is from your "
 "stock to your vendor location."
@@ -2085,7 +1216,7 @@ msgstr ""
 "Обробіть відвантаження з поверненням та контролюйте, чи переміщення запасів "
 "відбувається від вашого складу до місцезнаходження вашого постачальника."
 
-#: ../../purchase/purchases/rfq/cancel.rst:99
+#: ../../purchase/purchases/rfq/cancel.rst:94
 msgid ""
 "When the reverse transfer is done, the status of your purchase order will be"
 " automatically set to done, meaning that your PO has been completely "
@@ -2094,18 +1225,18 @@ msgstr ""
 "Коли здійснюється зворотній трансфер, статус замовлення на купівлю буде "
 "автоматично налаштоване на завершення, тобто ваш PO був повністю скасований."
 
-#: ../../purchase/purchases/rfq/cancel.rst:104
-#: ../../purchase/purchases/rfq/reception.rst:120
+#: ../../purchase/purchases/rfq/cancel.rst:99
+#: ../../purchase/purchases/rfq/reception.rst:116
 msgid ":doc:`bills`"
 msgstr ":doc:`bills`"
 
-#: ../../purchase/purchases/rfq/cancel.rst:105
+#: ../../purchase/purchases/rfq/cancel.rst:100
 msgid ":doc:`reception`"
 msgstr ":doc:`reception`"
 
 #: ../../purchase/purchases/rfq/create.rst:3
-msgid "How to create a Request for Quotation?"
-msgstr "Як створити запит на комерційну пропозицію?"
+msgid "Create a Request for Quotation"
+msgstr ""
 
 #: ../../purchase/purchases/rfq/create.rst:5
 msgid ""
@@ -2122,19 +1253,11 @@ msgstr ""
 "ваш запит, ви можете вирішити продовжити пропозицію та придбати або "
 "відхилити пропозицію."
 
-#: ../../purchase/purchases/rfq/create.rst:12
-msgid ""
-"For more information on best uses, please read the chapter "
-":doc:`../../overview/process/difference`"
-msgstr ""
-"Для додаткової інформації про найкращі способи використання, прочитайте "
-"розділ :doc:`../../overview/process/difference`"
-
-#: ../../purchase/purchases/rfq/create.rst:19
+#: ../../purchase/purchases/rfq/create.rst:16
 msgid "Creating a Request for Quotation"
 msgstr "Створення запиту на комерційну пропозицію"
 
-#: ../../purchase/purchases/rfq/create.rst:21
+#: ../../purchase/purchases/rfq/create.rst:18
 msgid ""
 "In the Purchases module, open :menuselection:`Purchase --> Requests for "
 "Quotation` and click on **Create**."
@@ -2142,7 +1265,7 @@ msgstr ""
 "У модулі Купівлі відкрийте :menuselection:`Купівлі --> Запит на комерційну "
 "пропозицію` та натисніть на **Створити**."
 
-#: ../../purchase/purchases/rfq/create.rst:27
+#: ../../purchase/purchases/rfq/create.rst:24
 msgid ""
 "Select your supplier in the **Vendor** menu, or create it on-the-fly by "
 "clicking on **Create and Edit**. In the **Order Date** field, select the "
@@ -2153,100 +1276,12 @@ msgstr ""
 "замовлення** виберіть дату, до якої ви хочете перейти до фактичного "
 "замовлення."
 
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid "Shipment"
-msgstr "Доставка"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid "Incoming Shipments"
-msgstr "Вхідні відправлення"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid "Vendor Reference"
-msgstr "Референс постачальника"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid ""
-"Reference of the sales order or bid sent by the vendor. It's used to do the "
-"matching when you receive the products as this reference is usually written "
-"on the delivery order sent by your vendor."
-msgstr ""
-"Референс замовлення на продаж або пропозицію від постачальника. Він "
-"використовується для виконання відповідності, коли ви отримуєте товари, "
-"оскільки це посилання, як правило, написано в замовленні на доставку, "
-"надісланого вашим постачальником."
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid "Order Date"
-msgstr "Дата замовлення"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid ""
-"Depicts the date where the Quotation should be validated and converted into "
-"a purchase order."
-msgstr ""
-"Зображає дату, коли комерційна пропозиція повинна бути перевірена та "
-"перетворена в замовлення на купівлю."
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid "Source Document"
-msgstr "Джерело документа"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid ""
-"Reference of the document that generated this purchase order request (e.g. a"
-" sales order)"
-msgstr ""
-"Посилання на документ, який створив цей запит на замовлення на купівлю "
-"(наприклад, замовлення на продаж)"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid "Deliver To"
-msgstr "Доставити до"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid "This will determine operation type of incoming shipment"
-msgstr "Це визначатиме тип операції вхідної відправки"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid "Drop Ship Address"
-msgstr "Адреса дроп-шипінгу"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid ""
-"Put an address if you want to deliver directly from the vendor to the "
-"customer. Otherwise, keep empty to deliver to your own company."
-msgstr ""
-"Введіть адресу, якщо ви хочете доставити безпосередньо від продавця до "
-"клієнта. Інакше залишайте порожніми, щоб доставити до своєї компанії."
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid "Destination Location Type"
-msgstr "Тип місцезнаходження призначення:"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid "Technical field used to display the Drop Ship Address"
-msgstr ""
-"Технічне поле, яке використовується для відображення адреси дроп-шипінгу"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid "Incoterm"
-msgstr "Інкотерм"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid ""
-"International Commercial Terms are a series of predefined commercial terms "
-"used in international transactions."
-msgstr ""
-"Міжнародні комерційні умови - це серія заздалегідь визначених комерційних "
-"умов, що використовуються в міжнародних операціях."
-
-#: ../../purchase/purchases/rfq/create.rst:35
+#: ../../purchase/purchases/rfq/create.rst:32
 msgid "View *Request for Quotation* in our Online Demonstration"
 msgstr ""
 "Перегляньте *Запит на комерційну пропозицію* в нашій демоверсії онлайн"
 
-#: ../../purchase/purchases/rfq/create.rst:37
+#: ../../purchase/purchases/rfq/create.rst:34
 msgid ""
 "In **Products**, click on Add an item. Select the product you wish to order "
 "in the **Product** menu. Specify the **Quantity** by inserting the number "
@@ -2267,7 +1302,7 @@ msgstr ""
 "що для цього постачальника вказано адресу електронної пошти або введіть "
 "нову)."
 
-#: ../../purchase/purchases/rfq/create.rst:51
+#: ../../purchase/purchases/rfq/create.rst:48
 msgid ""
 "After having clicked on **Send**, you will notice that the RFQ's status will"
 " switch from **Draft** to **RFQ Sent**."
@@ -2275,7 +1310,7 @@ msgstr ""
 "Після натискання кнопки **Надіслати** ви помітите, що статус Комерційної "
 "пропозиції перейде з **Чернетки** в **Надіслану комерційну пропозицію**."
 
-#: ../../purchase/purchases/rfq/create.rst:57
+#: ../../purchase/purchases/rfq/create.rst:54
 msgid ""
 "Once your supplier has replied with an offer, update the RfQ by clicking on "
 "**Edit** to fit the quotation (prices, taxes, expected delivery lead time, "
@@ -2286,7 +1321,7 @@ msgstr ""
 "очікувана вартість доставки, умови платежу тощо), а потім натисніть кнопку "
 "**Зберегти**, щоб оформити замовлення на купівлю."
 
-#: ../../purchase/purchases/rfq/create.rst:62
+#: ../../purchase/purchases/rfq/create.rst:59
 msgid ""
 "To proceed with the order, click on **Confirm Order** to send the order to "
 "the supplier. The RfQ's status will switch to **Purchase Order**."
@@ -2295,7 +1330,7 @@ msgstr ""
 "відправити замовлення постачальнику. Статус Комерційної пропозиції перейде у"
 " **Замовлення на купівлю**."
 
-#: ../../purchase/purchases/rfq/create.rst:68
+#: ../../purchase/purchases/rfq/create.rst:65
 msgid ""
 "The status of the RfQ will change to PURCHASE ORDER. Tabs in the upper right"
 " corner of the order will show 1 Shipment and 0 Invoice."
@@ -2303,9 +1338,100 @@ msgstr ""
 "Статус комерційної пропозиції зміниться на ЗАМОВЛЕННЯ НА КУПІВЛЮ. Вкладки у "
 "верхньому правому куті замовлення покажуть 1 доставку та 0 рахунка-фактури."
 
+#: ../../purchase/purchases/rfq/dropshipping.rst:3
+msgid "Dropship products"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/dropshipping.rst:5
+msgid ""
+"Dropshipping is a method in which the vendor does not keep products in stock"
+" but instead transfers the products directly from the supplier to the "
+"customer."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/dropshipping.rst:10
+msgid ""
+"You need the *Sales*, *Inventory* and *Purchases* modules for this feature "
+"to work."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/dropshipping.rst:14
+msgid "Activate the dropshipping feature"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/dropshipping.rst:16
+msgid ""
+"Go to :menuselection:`Purchases --> Configuration --> Settings` and select "
+"*Dropshipping*."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/dropshipping.rst:22
+msgid ""
+"A new route *Dropshipping* has been created. You can go on a product and "
+"tick the dropshipping route. You also need to define to which vendor you "
+"will buy the product. Now, each time this product will be sold, it will be "
+"drop shipped."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/dropshipping.rst:30
+msgid ""
+"If you don't always dropship that product, you can go to "
+":menuselection:`Sales --> Configuration --> Settings` and tick the box in "
+"front of *Order-Specific Routes*."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/dropshipping.rst:37
+msgid ""
+"When you create a quotation or sales order, you can now decide, order line "
+"per order line, which products should be drop shipped by selecting the "
+"dropship route on the SO line."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/dropshipping.rst:45
+msgid "Drop ship a product"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/dropshipping.rst:47
+msgid ""
+"Once a sale order with products to dropship is confirmed, a request for "
+"quotation is generated by Odoo to buy the product to the vendor. If you "
+"confirm that request for quotation into a purchase order, it will create a "
+"transfer from your vendor directly to your customer. The products doesn't go"
+" through your own stock."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/lock_orders.rst:3
+msgid "Lock a purchase order"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/lock_orders.rst:5
+msgid ""
+"Once an order is confirmed, you can lock it preventing any further editing."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/lock_orders.rst:11
+msgid ""
+"For this feature to work, go to :menuselection:`Purchases --> Configuration "
+"--> Settings` and activate the *Lock Confirmed Orders* feature"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/lock_orders.rst:19
+msgid "Lock an order"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/lock_orders.rst:21
+msgid ""
+"While working on a purchase order, when you confirm it, you can then lock "
+"the order preventing any further modification on the document."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/lock_orders.rst:28
+msgid "You can unlock the document if you need to make additional changes"
+msgstr ""
+
 #: ../../purchase/purchases/rfq/reception.rst:3
-msgid "How to control product received? (entirely & partially)"
-msgstr "Як контролювати отримання товарів (повністю та частково)?"
+msgid "Control product received (entirely & partially)"
+msgstr ""
 
 #: ../../purchase/purchases/rfq/reception.rst:5
 msgid ""
@@ -2406,19 +1532,10 @@ msgstr ""
 "його замовлення на продаж)."
 
 #: ../../purchase/purchases/rfq/reception.rst:67
-msgid ""
-"See the documentation page :doc:`../../overview/process/from_po_to_invoice` "
-"for a full overview of the purchase process."
-msgstr ""
-"Перегляньте сторінку документації "
-":doc:`../../overview/process/from_po_to_invoice` для загального огляду "
-"процесу закупівлі."
-
-#: ../../purchase/purchases/rfq/reception.rst:71
 msgid "Receive Products"
 msgstr "Отримайте товари"
 
-#: ../../purchase/purchases/rfq/reception.rst:73
+#: ../../purchase/purchases/rfq/reception.rst:69
 msgid ""
 "If you purchased physical goods (stockable or consumable products), you can "
 "receive the products from the **Inventory** application. From the "
@@ -2430,7 +1547,7 @@ msgstr ""
 "ви повинні побачити кнопку **X Отримати**, в коробці квитанцій пов'язаного "
 "складу."
 
-#: ../../purchase/purchases/rfq/reception.rst:81
+#: ../../purchase/purchases/rfq/reception.rst:77
 msgid ""
 "Click on this button and you access a list of all awaiting orders for this "
 "warehouse."
@@ -2438,7 +1555,7 @@ msgstr ""
 "Натисніть цю кнопку, і ви отримаєте доступ до списку всіх очікуваних "
 "замовлень для цього складу."
 
-#: ../../purchase/purchases/rfq/reception.rst:87
+#: ../../purchase/purchases/rfq/reception.rst:83
 msgid ""
 "If you have a lot of awaiting orders, you can use the filter bar to search "
 "on the **Vendor** (also called **Partner** in Odoo), the product or the "
@@ -2452,7 +1569,7 @@ msgstr ""
 "на купівлю. Ви можете відкрити документ, який відповідає отриманому "
 "замовленню на доставку, і обробляти всі рядки в ньому."
 
-#: ../../purchase/purchases/rfq/reception.rst:96
+#: ../../purchase/purchases/rfq/reception.rst:92
 msgid ""
 "You may validate the whole document at once by clicking on the **Validate** "
 "button or you can control all products, one by one, by manually change the "
@@ -2464,7 +1581,7 @@ msgstr ""
 "**Виконано** (те, що насправді отримано). Коли рядок зелений, це означає, що"
 " отримана кількість відповідає очікуваній."
 
-#: ../../purchase/purchases/rfq/reception.rst:103
+#: ../../purchase/purchases/rfq/reception.rst:99
 msgid ""
 "If you work with lots or serial numbers, you can not set the processed "
 "quantity, but you have to provide all the lots or serial numbers to record "
@@ -2474,7 +1591,7 @@ msgstr ""
 "оброблену кількість, але вам потрібно надати всі партійні або серійні номери"
 " для запису отриманої кількості."
 
-#: ../../purchase/purchases/rfq/reception.rst:107
+#: ../../purchase/purchases/rfq/reception.rst:103
 msgid ""
 "When you validate the reception, if you have received less products than the"
 " initial demand, Odoo will ask youthe permission to create a backorder."
@@ -2482,7 +1599,7 @@ msgstr ""
 "Коли ви підтверджуєте прийом, якщо ви отримали менше товарів, ніж вихідна "
 "поставка, Odoo запитає у вас дозвіл на створення зворотнього замовлення."
 
-#: ../../purchase/purchases/rfq/reception.rst:114
+#: ../../purchase/purchases/rfq/reception.rst:110
 msgid ""
 "If you plan to receive the remaining product in the future, select **Create "
 "Backorder**. Odoo will create a new documents for the awaiting products. If "
@@ -2493,437 +1610,221 @@ msgstr ""
 " Якщо ви виберете варіант **Немає зворотнього замовлення**, замовлення "
 "вважається виконаним."
 
-#: ../../purchase/purchases/rfq/reception.rst:121
+#: ../../purchase/purchases/rfq/reception.rst:117
 msgid ":doc:`cancel`"
 msgstr ":doc:`cancel`"
 
+#: ../../purchase/purchases/rfq/warning.rst:3
+msgid "Raise warnings on purchase orders"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/warning.rst:5
+msgid ""
+"The *Warnings* feature allows you to raise warnings or blocking messages on "
+"purchase orders based on a vendor or a product."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/warning.rst:8
+msgid ""
+"For example, if you often have a problem with a vendor, you might want to "
+"raise a warning when purchasing from that vendor. If a product is about to "
+"be discontinued, you may want to raise a blocking message on the purchase "
+"order."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/warning.rst:16
+msgid ""
+"For this feature to work, go to :menuselection:`Purchases --> Configuration "
+"--> Settings` and activate the *Warnings* feature."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/warning.rst:24
+msgid "Add a warning on a vendor"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/warning.rst:26
+msgid ""
+"When you activate the feature, you get a new option under the *Internal "
+"Notes* tab on vendors. You can decide to write a simple warning or a "
+"blocking message."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/warning.rst:34
+msgid "Add a warning on a product"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/warning.rst:36
+msgid ""
+"When you activate the feature, you get a new option under the *Purchase* tab"
+" on the product page where you can add a warning or a blocking message."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/warning.rst:44
+msgid "Trying to buy with warnings or blocking messages"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/warning.rst:46
+msgid ""
+"If you try to validate a *Purchase Order* from a vendor or with a product "
+"with a warning, a message will be raised. You can ignore it by clicking ok."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/warning.rst:53
+msgid "However, if it is a blocking message, you can not ignore it."
+msgstr ""
+
 #: ../../purchase/purchases/tender.rst:3
-msgid "Purchase Tenders"
-msgstr "Тендери на закупівлю"
+msgid "Purchase Agreements"
+msgstr "Угоди про придбання"
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:3
-msgid "How to manage Blanket Orders"
-msgstr "Управління довгостроковим замовленням"
-
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:5
-msgid ""
-"A **Blanket Order** is a contract between you (the customer) and your "
-"supplier. It is used to negotiate a discounted price. The supplier is "
-"benefited by the economies of scale inherent in a large order. You are "
-"benefited by being allowed to take multiple smaller deliveries over a period"
-" of time, at a lower price, without paying for the large order immediately. "
-"Each small periodic delivery is called a release or call-off."
+#: ../../purchase/purchases/tender/blanket_orders.rst:3
+msgid "Manage Blanket Orders"
 msgstr ""
-"**Довгострокове замовлення** - це контракт між вами (замовником) та вашим "
-"постачальником. Він використовується для узгодження ціни зі знижкою. "
-"Постачальник отримує вигоду від економії на масштабі, яка притаманна "
-"великому замовленню. Ви отримуєте вигоду від того, що ви можете отримувати "
-"кілька менших покупок протягом певного періоду часу за більш низькою ціною, "
-"не відразу ж оплативши за велике замовлення. Кожна невелика періодична "
-"доставка називається випуском або відкликанням."
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:12
+#: ../../purchase/purchases/tender/blanket_orders.rst:5
 msgid ""
-"As the blanket order is a contract, it will have some prearranged "
-"conditions. These usually include:"
+"A Blanket Order is a purchase order which a customer places with its "
+"supplier to allow multiple delivery dates over a period of time, often "
+"negotiated to take advantage of predetermined pricing."
 msgstr ""
-"Оскільки довгострокове замовлення - це контракт, він матиме певні попередньо"
-" встановлені умови, які включають:"
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:15
-msgid "Total quantity of each product to be delivered"
-msgstr "Загальну кількість кожного товару, що підлягає доставці"
-
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:17
+#: ../../purchase/purchases/tender/blanket_orders.rst:12
 msgid ""
-"Completion deadline, by which you must take delivery of the total quantity"
+"For this feature to work, go to :menuselection:`Purchases --> Configuration "
+"--> Settings` and activate the *Purchase Agreements* feature"
 msgstr ""
-"Кінцевий термін завершення, за яким потрібно приймати доставку загальної "
-"кількості"
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:19
-msgid "Unit price for each product"
-msgstr "Ціна одиниці для кожного товару"
-
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:21
-msgid "Delivery lead time in days for each release"
-msgstr "Час доставки у днях кожного випуску"
-
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:24
-msgid "Activate the Purchase Agreements"
-msgstr "Активуйте Угоди про закупівлю"
-
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:26
-msgid ""
-"The Blanket Order function is provided by the Purchase Agreements feature. "
-"By default, the Purchase Agreements is not activated. To be able to use "
-"blanket orders, you must first activate the option."
+#: ../../purchase/purchases/tender/blanket_orders.rst:20
+msgid "Start a Blanket Order"
 msgstr ""
-"Довгострокове замовлення передбачене функцією купівельних угод. За "
-"замовчуванням Договори про купівлю не активовані. Щоб мати можливість "
-"використовувати довгострокові замовлення, потрібно спершу активувати цю "
-"опцію."
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:30
+#: ../../purchase/purchases/tender/blanket_orders.rst:22
+#: ../../purchase/purchases/tender/call_for_tender.rst:21
 msgid ""
-"In the Purchases module, open the Configuration menu and click on Settings. "
-"In the **Orders** section, locate the **Purchase Agreements** and tick the "
-"box, then click on **Save**."
-msgstr ""
-"У модулі Купівлі відкрийте меню Налаштування та натисніть Налаштування. У "
-"розділі **Замовлення** знайдіть **Угоду про купівлю** та поставте прапорець,"
-" а потім натисніть кнопку **Зберегти**."
-
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:38
-msgid "Create a Blanket Order"
-msgstr "Створіть довгострокове замовлення"
-
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:40
-msgid ""
-"To create a new blanket order, open :menuselection:`Purchase --> Purchase "
+"To use this feature go to :menuselection:`Purchases --> Purchase "
 "Agreements`."
 msgstr ""
-"Щоб створити нове довгострокове замовлення, відкрийте  "
-":menuselection:`Купівлі --> Угоди про купівлю`."
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:45
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:39
+#: ../../purchase/purchases/tender/blanket_orders.rst:24
 msgid ""
-"In the Purchase Agreements window, click on **Create**. A new Purchase "
-"Agreement window opens."
+"Once you are creating the purchase agreement, access the *Agreement Type* "
+"drop down menu and select *Blanket Order*."
 msgstr ""
-"У вікні Купівлі натисніть **Створити**. Відкриється вікно нового договору "
-"купівлі."
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:48
-msgid "In the **Agreement Type** field, choose Blanket Order."
-msgstr "У полі **Тип угоди** оберіть Довгострокові замолення."
-
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:50
-msgid "Choose the **Vendor** with whom you will make the agreement."
-msgstr "Виберіть **Постачальника**, з яким ви складаєте угоду."
-
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:52
-msgid "Set the **Agreement Deadline** as per the conditions of the agreement."
-msgstr "Встановіть **Термін дії угоди** відповідно до умов угоди."
-
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:54
-msgid "Set the **Ordering Date** to the starting date of the contract."
-msgstr "Встановіть **Дату замовлення** на дату початку дії контракту."
-
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:56
+#: ../../purchase/purchases/tender/blanket_orders.rst:30
 msgid ""
-"Leave the **Delivery Date** empty because we will have different delivery "
-"dates with each release."
+"You can then create your new blanket order, select your vendor, the "
+"product(s), agreement deadline, ordering date and delivery date."
 msgstr ""
-"Залиште **Дату доставки** порожньою, оскільки у нас будеуть різні дати "
-"доставки з кожним випуском."
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:59
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:52
+#: ../../purchase/purchases/tender/blanket_orders.rst:33
 msgid ""
-"In the **Products** section, click on **Add an item**. Select products in "
-"the Product list, then insert **Quantity**. You can add as many products as "
-"you wish."
+"When you are satisfied with your purchase agreement, confirm it. Its status "
+"will change from*Draft* to *Ongoing* and a new *RFQs/Orders* will appear in "
+"the top right corner of the document."
 msgstr ""
-"У розділі **Товари** натисніть на **Додати елемент**. Виберіть товари в "
-"списку товарів, а потім введіть **Кількість**. Ви можете додати стільки "
-"товарів, скільки хочете."
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:66
-msgid "Click on **Confirm**."
-msgstr "Натисніть на **Підтвердити**."
+#: ../../purchase/purchases/tender/blanket_orders.rst:41
+msgid "RFQ from the Blanket Order"
+msgstr ""
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:68
+#: ../../purchase/purchases/tender/blanket_orders.rst:43
 msgid ""
-"Now click on the button **New Quotation**. A RfQ is created for this vendor,"
-" with the products chosen on the PT. Repeat this operation for each release."
+"From your blanket order you can create a new quotation, Odoo will auto-fill "
+"the document with the product(s) from your blanket order, you only have to "
+"choose the quantity and confirm the order."
 msgstr ""
-"Тепер натисніть на кнопку **Нова комерційна пропозиція**. Для цього "
-"постачальника створено запит на комерційну пропозицію, з товарами, вибраними"
-" в PT. Повторіть цю операцію для кожного випуску."
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:71
+#: ../../purchase/purchases/tender/blanket_orders.rst:47
 msgid ""
-"Be careful to change the **Quantity** field on the RFQ.  By default, the RFQ"
-" quantity will be for the entire remaining quantity. Your individual "
-"releases should be for some smaller quantity."
+"When you will go back on the blanket order, you will see how many quantities"
+" you have already ordered from your blanket order."
 msgstr ""
-"Будьте обережні, щоб змінити поле **Кількість** у запиті на комерційну "
-"пропозицію. За замовчуванням кількість запитів буде для всієї залишкової "
-"кількості. Ваші окремі випуски повинні бути з меншою кількістю."
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:78
+#: ../../purchase/purchases/tender/blanket_orders.rst:51
+msgid "Vendors prices on your product"
+msgstr ""
+
+#: ../../purchase/purchases/tender/blanket_orders.rst:53
 msgid ""
-"When all of the releases (purchase orders) have been delivered and paid, you"
-" can click on **Validate** and **Done**."
+"When a blanket order is validated, a new vendor line is added in your "
+"product. You can see which one are linked to a blanket order and give "
+"priority to the ones you want with the arrows on the left of the vendor "
+"name."
 msgstr ""
-"Коли всі випуски (замовлення на купівлю) були доставлені та оплачені, ви "
-"можете натиснути **Підтвердити** та **Готово**."
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:81
+#: ../../purchase/purchases/tender/blanket_orders.rst:58
 msgid ""
-"View `Purchase Agreements "
-"<https://demo.odoo.com/?module=purchase_requisition.action_purchase_requisition>`__"
-" in our Online Demonstration."
+"Thanks to this, a blanket order can be used for automated replenishment "
+"(using *reordering rules* or *made to order* configuration)."
 msgstr ""
-"Перегляньте `Угоди закупівлі "
-"<https://demo.odoo.com/?module=purchase_requisition.action_purchase_requisition>`__"
-" в нашій демо версії онлайн. "
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:88
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:83
-msgid ":doc:`../../overview/process/difference`"
-msgstr ":doc:`../../overview/process/difference`"
-
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:3
-msgid "How to manage Purchase Tenders"
-msgstr "Управління тендерами на закупівлю"
-
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:12
+#: ../../purchase/purchases/tender/blanket_orders.rst:65
 msgid ""
-"For more information on best uses, please read the chapter `Request for "
-"Quotation, Purchase Tender or Purchase Order? "
-"<https://www.odoo.com/documentation/user/11.0/purchase/overview/process/difference.html>`__"
+"You can also create a *Request for Quotation* from the classic RFQ Menu and "
+"link them with an existing *Blanket Order*"
 msgstr ""
-"Для отримання додаткової інформації про найкращий спосіб використання, будь "
-"ласка, прочитайте розділ `Запит на комерційну пропозицію, тендер на "
-"закупівлю або замовлення на "
-"купівлю?<https://www.odoo.com/documentation/user/11.0/purchase/overview/process/difference.html>`__"
 
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:17
-msgid "Activate the Purchase Tender function"
-msgstr "Активуйте функцію тендерної пропозиції"
+#: ../../purchase/purchases/tender/call_for_tender.rst:3
+msgid "Manage Call for Tender"
+msgstr ""
 
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:19
+#: ../../purchase/purchases/tender/call_for_tender.rst:5
 msgid ""
-"By default, the Purchase Tender is not activated. To be able to use PTs, you"
-" must first activate the option."
+"A Call for Tender is a special procedure to request offers from multiple "
+"vendors to obtain the most interesting price."
 msgstr ""
-"За замовчуванням Тендер на купівлю не активований. Щоб мати можливість "
-"використовувати ТНП, спершу потрібно активувати цю опцію."
 
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:22
+#: ../../purchase/purchases/tender/call_for_tender.rst:11
 msgid ""
-"In the Purchases module, open the Configuration menu and click on Settings. "
-"In the Purchase Order section, locate the **Calls for Tenders** and tick the"
-" box Allow using call for tenders... (advanced), then click on **Apply**."
+"For this feature to work, go to :menuselection:`Purchases --> Configuration "
+"--> Settings` and activate the *Purchase Agreements* feature."
 msgstr ""
-"У модулі Купівлі відкрийте меню Налаштування та натисніть Налаштування. У "
-"розділі Замовлення на купівлю знайдіть **Запрошення на проведення торгів** і"
-" поставте прапорець Дозволити використання запрошення на проведення торгів "
-"(розширений), а потім натисніть **Застосувати**."
 
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:31
-msgid "Create a Purchase Tender"
-msgstr "Створіть тендер на купівлю"
+#: ../../purchase/purchases/tender/call_for_tender.rst:19
+msgid "Create a Call for Tender"
+msgstr ""
 
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:33
+#: ../../purchase/purchases/tender/call_for_tender.rst:23
 msgid ""
-"To create a new Purchase Tender, open :menuselection:`Purchase --> Purchase "
-"Agreements (PA)`."
+"Create a new purchase agreement, access the *Agreement Type* drop down menu "
+"and select *Call for Tender*."
 msgstr ""
-"Щоб створити новий Тендер на купівлю, відкрийте :menuselection:`Купівлі --> "
-"Угода про купівлю (УПК)`."
 
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:42
-msgid "In the **Agreement Type** field, choose Purchase Tender."
-msgstr "У полі **Тип угоди** виберіть Тендер на купівлю."
-
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:44
+#: ../../purchase/purchases/tender/call_for_tender.rst:26
 msgid ""
-"The **Agreement Deadline** field tells the vendors when to have their offers"
-" submitted."
+"When you are satisfied with your purchase agreement, confirm it will move "
+"from *Draft* to *Confirmed* and a new *RFQs/Orders* appeared in the top "
+"right corner of the document."
 msgstr ""
-"У полі **Термін угоди** вказуються постачальники, коли вони мають подати "
-"свої пропозиції."
 
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:46
+#: ../../purchase/purchases/tender/call_for_tender.rst:34
+msgid "Request new quotations from the Call for Tender"
+msgstr ""
+
+#: ../../purchase/purchases/tender/call_for_tender.rst:36
 msgid ""
-"The **Ordering Date** field tells the vendors when we will submit a purchase"
-" order to the chosen vendor."
+"From the Call for Tender, Odoo will auto-fill the RFQ with the product(s) "
+"from your Call for Tender."
 msgstr ""
-"Поле **Дата замовлення** вказує постачальникам, коли ми надішлемо замовлення"
-" на купівлю вибраному постачальнику."
 
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:48
+#: ../../purchase/purchases/tender/call_for_tender.rst:40
+msgid "Select the best offer"
+msgstr ""
+
+#: ../../purchase/purchases/tender/call_for_tender.rst:42
 msgid ""
-"The **Delivery Date** field tells the vendors when the product will have to "
-"be delivered."
+"The various RFQs and orders linked to the Call for Tenders will be under the"
+" *RFQs/Orders* button where you can select and confirm the best offer."
 msgstr ""
-"Поле **Дата доставки** повідомляє продавців, коли товар буде поставлений."
 
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:50
-msgid "You do not have to define a **Vendor**."
-msgstr "Вам не потрібно визначати **Постачальника**."
-
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:59
-msgid "Click on **Confirm Call**."
-msgstr "Натисніть на **Підтвердити запрошення**."
-
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:61
-msgid ""
-"Now click on the button **New Quotation**. A RfQ is created with the "
-"products chosen on the PT. Choose a **Vendor** and send the RfQ to the "
-"vendor. Repeat this operation for each vendor."
+#: ../../purchase/purchases/tender/call_for_tender.rst:50
+msgid "Close the Call for Tender"
 msgstr ""
-"Тепер натисніть на кнопку **Нова пропозиція**. Запит на комерційну "
-"пропозицію створюється за допомогою товарів, вибраних на ТНК. Виберіть "
-"**Постачальника** та надішліть комерційну пропозицію постачальнику. "
-"Повторіть цю операцію для кожного постачальника."
 
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:68
-msgid "Once all the RfQs are sent, you can click on **Validate** on the PT."
+#: ../../purchase/purchases/tender/call_for_tender.rst:52
+msgid "Once you're done with your *Call for Tender* don't forget to close it."
 msgstr ""
-"Після того, як всі запити на комерційну пропозицію будуть відправлені, ви "
-"можете натиснути кнопку **Перевірити** на ТНК."
-
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:70
-msgid ""
-"The vendors will send their offers, you can update the RfQs accordingly. "
-"Then, choose the ones you want to accept by clicking on **Confirm Order** on"
-" the RfQs and **Cancel** the others."
-msgstr ""
-"Постачальники відправлять свої пропозиції, ви можете оновлювати запит на "
-"комерційну пропозицію відповідно. Потім виберіть ті, які ви хочете прийняти,"
-" натиснувши кнопку **Підтвердити замовлення** на рівні запиту на комерційну "
-"пропозицію та **Скасувати** інші."
-
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:74
-msgid "You can now click on **Done** on the PT."
-msgstr "Тепер ви можете натиснути **Готово** на Тендері на купівлю."
-
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:76
-msgid ""
-"View `Purchase Tenders "
-"<https://demo.odoo.com/?module=purchase_requisition.action_purchase_requisition>`__"
-" in our Online Demonstration."
-msgstr ""
-"Перегляньте `Тендери на закупівлю "
-"<https://demo.odoo.com/?module=purchase_requisition.action_purchase_requisition>`__"
-" у нашій демо версії онлайн."
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:3
-msgid ""
-"How to purchase partially at two vendors for the same purchase tenders?"
-msgstr ""
-"Як проводити закупівлі у двох постачальників для одного тендеру на "
-"закупівлю?"
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:5
-msgid ""
-"For some Purchase Tenders (PT), you might sometimes want to be able to "
-"select only a part of some of the offers you received. In Odoo, this is made"
-" possible through the advanced mode of the **Purchase** module."
-msgstr ""
-"Для деяких тендерних пропозицій на закупівлю іноді ви можете вибрати частину"
-" пропозицій, які ви отримали. В Odoo це стало можливим завдяки розширеному "
-"режиму модуля **Купівлі**."
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:10
-msgid ""
-"If you want to know how to handle a simple **Purchase Tender**, read the "
-"document on :doc:`manage_multiple_offers`."
-msgstr ""
-"Якщо ви хочете знати, як обробити простий **Тендер на купівлю**, ознайомтеся"
-" з документацією :doc:`manage_multiple_offers`."
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:19
-msgid "From the **Apps** menu, install the **Purchase Management** app."
-msgstr "У меню **Програми** встановіть додаток **Управління купівлями**."
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:25
-msgid "Activating the Purchase Tender and Purchase Tender advanced mode"
-msgstr "Активуйте розширений режим тендеру на купівлю"
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:27
-msgid ""
-"In order to be able to select elements of an offer, you must activate the "
-"advanced mode."
-msgstr ""
-"Щоб мати можливість вибирати елементи пропозиції, потрібно активувати "
-"розширений режим."
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:30
-msgid ""
-"To do so, go into the **Purchases** module, open the **Configuration** menu "
-"and click on **Settings**."
-msgstr ""
-"Для цього перейдіть до модуля **Купівлі**, відкрийте меню **Налаштування** "
-"та натисніть **Налаштування**."
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:33
-msgid ""
-"In the **Calls for Tenders** section, tick the option **Allow using call for"
-" tenders to get quotes from multiple suppliers(...)**, and in the **Advanced"
-" Calls for Tenders** section, tick the option **Advanced call for tender "
-"(...)** then click on **Apply**."
-msgstr ""
-"У розділі **Запрошення на участь у тендері** позначте опцію **Дозволити "
-"використання тендерних пропозицій для отримання комерційних пропозицій від "
-"декількох постачальників (...)**, а в розділі **Розширені запрошення на "
-"участь у тендері** виберіть опцію **Додаткове запрошення на участь у тендері"
-" (...)**, потім натисніть кнопку **Застосувати**."
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:42
-msgid "Selecting elements of a RFQ/Bid"
-msgstr "Вибір елементів Запит на комерційну пропозицію/Пропозиція"
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:44
-msgid ""
-"Go to :menuselection:`Purchase --> Purchase Tenders`. Create a purchase "
-"tender containing several products, and follow the usual sequence all the "
-"way to the **Bid Selection** status."
-msgstr ""
-"Перейдіть до :menuselection:`Купівлі --> Тендер на купівлі`. Створіть тендер"
-" на купівлі, який містить кілька товарів, і дотримуйтесь звичайної "
-"послідовності до етапу **Вибору пропозиції**."
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:49
-msgid ""
-"When you closed the call, click on **Choose Product Lines** to access the "
-"list of products and the bids received for all of them."
-msgstr ""
-"Коли ви закрили запрошення, натисніть **Вибрати рядки товарів**, щоб "
-"отримати доступ до списку товарів та пропозицій, отриманих для всіх."
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:55
-msgid ""
-"Unroll the list of offers you received for each product, and click on the "
-"*v* symbol (**Confirm order**) next to the offers you wish to proceed with. "
-"The lines for which you've confirmed the order turn blue. When you're "
-"finished, click on **Generate PO** to create a purchase order for each "
-"product and supplier."
-msgstr ""
-"Розгорніть список пропозицій, які ви отримали для кожного товару, і "
-"натисніть на символ *v* (**Підтвердити замовлення**) біля пропозицій, які ви"
-" хочете продовжити. Рядки, для яких ви підтвердили замовлення, стають "
-"синіми. Коли ви закінчите, натисніть кнопку **Генерувати PO**, щоб створити "
-"замовлення на купівлю для кожного товару та постачальника"
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:64
-msgid ""
-"When you come back to you purchase tender, you can see that the status has "
-"switched to **PO Created** and that the **Requests for Quotations** now have"
-" a status of **Purchase Order** or **Cancelled**."
-msgstr ""
-"Коли ви повернетеся до купівлі, ви можете побачити, що статус перейшов на "
-"**PO Створено** і що **Запити на пропозиції** тепер мають статус "
-"**Замовлення на купівлю** або **Скасовано**."
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:72
-msgid ""
-"From there, follow the documentation "
-":doc:`../../overview/process/from_po_to_invoice` to proceed with the "
-"delivery and invoicing."
-msgstr ""
-"Звідти перейдіть на документацію "
-":doc:`../../overview/process/from_po_to_invoice` щоби продовжити доставку та"
-" виставлення рахунків."
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:76
-msgid ":doc:`manage_multiple_offers`"
-msgstr ":doc:`manage_multiple_offers`"
 
 #: ../../purchase/replenishment.rst:3
 msgid "Replenishment"
@@ -2934,276 +1835,152 @@ msgid "Replenishment Flows"
 msgstr "Процеси поповнення"
 
 #: ../../purchase/replenishment/flows/compute_date.rst:3
-msgid "How are the order date and scheduled dates computed?"
-msgstr "Як обчислюється дата замовлення та запланована дата в Odoo?"
+msgid "Schedule your receipts and deliveries"
+msgstr ""
 
 #: ../../purchase/replenishment/flows/compute_date.rst:5
 msgid ""
-"Scheduled dates are computed in order to be able to plan deliveries, "
-"receptions and so on. Depending on the habits of your company, Odoo "
-"automatically generates scheduled dates via the scheduler. The Odoo "
-"scheduler computes everything per line, whether it's a manufacturing order, "
-"a delivery order, a sale order, etc. The dates that are computed are "
-"dependent on the different leads times configured in Odoo."
+"To manage your supply chain scheduling, you will need to use Odoo *Lead "
+"Times*."
 msgstr ""
-"Заплановані дати обчислюються для планування постачання, прийому тощо. "
-"Залежно від звичок вашої компанії, Odoo автоматично генерує заплановані дати"
-" за допомогою планувальника. Планувальник Odoo вираховує все на кожен рядок,"
-" незалежно від того, що це замовлення на виробництво, замовлення на "
-"доставку, замовлення на продаж і т. д. Дати, які обчислюються, залежать від "
-"різних термін виконання, налаштованих в Odoo."
 
-#: ../../purchase/replenishment/flows/compute_date.rst:13
-msgid "Configuring lead times"
-msgstr "Налаштування терміну виконання"
+#: ../../purchase/replenishment/flows/compute_date.rst:8
+msgid ""
+"*Lead Times* are the expected times needed to receive, deliver or "
+"manufacture products."
+msgstr ""
+
+#: ../../purchase/replenishment/flows/compute_date.rst:12
+msgid "Configure Lead Times"
+msgstr ""
 
 #: ../../purchase/replenishment/flows/compute_date.rst:15
-msgid ""
-"Configuring **lead times** is an essential move in order to compute "
-"scheduled dates. Lead times are the delays (in term of delivery, "
-"manufacturing, ...) promised to your different partners and/or clients. "
-"Configuration of the different lead times are made as follows:"
+msgid "Vendor Lead Time"
 msgstr ""
-"Налаштування **терміну виконання** є важливим кроком для обчислення "
-"запланованих дат. Термін виконання - це строки (термін доставки, "
-"виготовлення, ...), обіцяні вашим різним партнерам та/або клієнтам. "
-"Налаштування різних термінів виконання виконується таким чином:"
 
-#: ../../purchase/replenishment/flows/compute_date.rst:21
-msgid "On a product level"
-msgstr "На рівні товару"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:24
-msgid "Supplier lead time:"
-msgstr "Термін виконання постачальника:"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:26
+#: ../../purchase/replenishment/flows/compute_date.rst:17
 msgid ""
-"The supplier lead time is the time needed for the supplier to deliver your "
-"purchased product. To configure the Supplier lead time select a product "
-"(from the Purchase module, go to :menuselection:`Purchase --> Product`), and"
-" go in the **Inventory** tab. You will have to add a **Vendor** to your "
-"product in order to select a supplier lead time."
+"The vendor lead time is the time needed by your vendor to deliver the "
+"product to you."
 msgstr ""
-"Термін виконання постачальника - це час, необхідний постачальнику для "
-"доставки вашого придбаного товару. Щоб налаштувати час доставки "
-"постачальника, виберіть товар (з модуля Купівлі перейдіть до "
-":menuselection:`Купівлі --> Товар`) і перейдіть на вкладку **Склад**. Щоб "
-"вибрати час доставки постачальника, вам доведеться додати **Постачальника** "
-"до свого товару."
 
-#: ../../purchase/replenishment/flows/compute_date.rst:36
+#: ../../purchase/replenishment/flows/compute_date.rst:20
 msgid ""
-"It is possible to add more than one vendor per product and thus different "
-"delivery lead times depending on the vendor."
+"To configure your vendor lead times, go to a product page, under the "
+"purchase tab, click on a *Vendor* once there you can change the delivery "
+"lead time for that Vendor & Product."
 msgstr ""
-"Можна додати більше одного постачальника на товар, а отже, і інший час "
-"доставки в залежності від постачальника."
 
-#: ../../purchase/replenishment/flows/compute_date.rst:39
+#: ../../purchase/replenishment/flows/compute_date.rst:28
+msgid "Customer Lead Time"
+msgstr "Термін поставки"
+
+#: ../../purchase/replenishment/flows/compute_date.rst:30
 msgid ""
-"Once a vendor is selected, click on it to open its form and indicate its "
-"delivery lead time."
+"The customer lead time, on the other hand, is the time you need to deliver "
+"the product to your customer."
 msgstr ""
-"Коли вибрано постачальника, натисніть на нього, щоб відкрити його форму та "
-"вказати час його доставки."
 
-#: ../../purchase/replenishment/flows/compute_date.rst:46
+#: ../../purchase/replenishment/flows/compute_date.rst:33
 msgid ""
-"In this case security days have no influence, the scheduled delivery days "
-"will be equal to: Date of the purchase order + Delivery Lead Time."
+"To configure your customer lead time open a product and go under the "
+"*Inventory* tab. You can then add how many days you need."
 msgstr ""
-"У цьому випадку дні безпеки не мають впливу, заплановані дні доставки будуть"
-" дорівнювати: Дата замовлення на купівлю + Час виконання доставки."
 
-#: ../../purchase/replenishment/flows/compute_date.rst:50
-msgid "Customer lead time"
-msgstr "Час виконання клієнта"
+#: ../../purchase/replenishment/flows/compute_date.rst:40
+msgid "Manufacturing lead time"
+msgstr ""
+
+#: ../../purchase/replenishment/flows/compute_date.rst:42
+msgid ""
+"The manufacturing lead time is the time you need to manufacture the product."
+msgstr ""
+
+#: ../../purchase/replenishment/flows/compute_date.rst:45
+msgid ""
+"To configure your manufacturing lead time open a product and go under the "
+"*Inventory* tab. You can then add how many days you need."
+msgstr ""
 
 #: ../../purchase/replenishment/flows/compute_date.rst:52
-msgid ""
-"The customer lead time is the time needed to get your product from your "
-"store/warehouse to your customer. It can be configured for any product. "
-"Simply select a product (from the **Sales** module, go to "
-":menuselection:`Sales --> Product`), and go into the **Sales** tab to "
-"indicate your customer lead time."
+msgid "Configure Security Lead Times"
 msgstr ""
-"Час виконання клієнта - це час, необхідний для отримання товару від вашого "
-"магазину/складу для вашого клієнта. Він може бути налаштований для будь-"
-"якого товару. Просто виберіть товар (з модуля **Продажі**, перейдіть до "
-"розділу  :menuselection:`Продажі --> Товар`) і перейдіть на вкладку "
-"**Продажі**, щоби вказати час вашого замовника."
 
-#: ../../purchase/replenishment/flows/compute_date.rst:62
-msgid "On the company level"
-msgstr "На рівні компанії"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:64
+#: ../../purchase/replenishment/flows/compute_date.rst:54
 msgid ""
-"On company level, it is possible to parameter **security days** in order to "
-"cope with eventual delays and to be sure to meet your engagements. The idea "
-"is to subtract **backup** days from the computed scheduled date in case of "
-"delays."
+"Odoo also lets you configure *Security Days* allowing you to cope with "
+"potential delays along the supply chain and make sure you meet your "
+"engagements."
 msgstr ""
-"На рівні компанії можна вказати **дні безпеки**, щоби впоратися з можливими "
-"затримками та бути впевненим у виконанні ваших завдань. Ідея полягає в тому,"
-" щоб вилучити **резервні** дні з обчисленої запланованої дати у разі "
-"затримки."
 
-#: ../../purchase/replenishment/flows/compute_date.rst:70
-msgid "Sales Safety days"
-msgstr "Дні безпеки продажів"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:72
+#: ../../purchase/replenishment/flows/compute_date.rst:58
 msgid ""
-"Sales Safety days are **back-up** days to ensure you will be able to deliver"
-" your clients engagements on time. They are margins of errors for delivery "
-"lead times. Security days are the same logic as the early wristwatch, in "
-"order to arrive on time. The idea is to subtract the numbers of security "
-"days from the calculation and thus to compute a scheduled date earlier than "
-"the one you promised to your client. That way you are sure to be able to "
-"keep your commitment."
+"The easiest way is to go to *Settings* from any module and type **Lead "
+"Time** in the search bar. From there, tick each box and configure your "
+"various *Security Lead Time* for your needs."
 msgstr ""
-"Дні безпеки продажів - це **резервні** дні, щоб гарантувати, що ви зможете "
-"своєчасно доставити свої зобов'язання клієнтів. Вони є межами помилок для "
-"терміну виконання доставки. Безпечні дні - це та сама логіка, що наручний "
-"годинник, який вказує час раніше, щоби прибути вчасно. Ідея полягає в тому, "
-"щоби вирахувати числа днів безпеки і таким чином обчислювати заплановану "
-"дату раніше, ніж та, яку ви обіцяли своєму клієнтові. Таким чином ви "
-"впевнені, що зможете зберегти свою прихильність."
 
-#: ../../purchase/replenishment/flows/compute_date.rst:80
+#: ../../purchase/replenishment/flows/compute_date.rst:65
 msgid ""
-"To set up your security dates, go to the app :menuselection:`Settings --> "
-"General settings`, and click on **Configure your company data**."
+"Alternatively, you can go in the settings of the *Inventory* module and "
+"*Manufacturing* module to configure those settings."
+msgstr ""
+
+#: ../../purchase/replenishment/flows/compute_date.rst:69
+msgid "Lead & security times in a use case"
+msgstr ""
+
+#: ../../purchase/replenishment/flows/compute_date.rst:71
+msgid ""
+"For example you sell a car today (January 1st), that is purchased on order, "
+"and you promise to deliver your customer within 20 days (January 20). Here "
+"is your product’s configuration:"
+msgstr ""
+
+#: ../../purchase/replenishment/flows/compute_date.rst:75
+msgid "Security lead time for sales : 1 day"
+msgstr ""
+
+#: ../../purchase/replenishment/flows/compute_date.rst:77
+msgid "Security lead time for purchase : 1 day"
+msgstr ""
+
+#: ../../purchase/replenishment/flows/compute_date.rst:79
+msgid "Vendor delivery lead time : 9 days"
+msgstr ""
+
+#: ../../purchase/replenishment/flows/compute_date.rst:81
+msgid ""
+"In such a scenario, the scheduler will trigger the following events based on"
+" your configuration."
+msgstr ""
+
+#: ../../purchase/replenishment/flows/compute_date.rst:84
+msgid ""
+"January 19: scheduled delivery date (20th January - 1 day of security lead "
+"time for Sales)"
 msgstr ""
-"Щоб налаштувати дати безпеки, перейдіть до модуля "
-":menuselection:`Налаштування --> Загальні налаштування`, та натисніть "
-"**Налаштувати дані вашої компанії**."
 
 #: ../../purchase/replenishment/flows/compute_date.rst:87
-msgid "Go the **Configuration** tab to indicate the number of safety days"
-msgstr ""
-"Перейдіть на вкладку **Налаштування**, щоби вказати кількість днів безпеки"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:93
 msgid ""
-"Note that you can in this menu configure a default **Manufacturing** lead "
-"time."
+"January 18: scheduled receipt date (19th January - 1 day of security lead "
+"time for Purchase)"
 msgstr ""
-"Зауважте, що в цьому меню можна налаштувати час очікування **Виробництва** "
-"за замовчуванням."
 
-#: ../../purchase/replenishment/flows/compute_date.rst:97
-msgid "Purchase days"
-msgstr "Дні купівлі"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:99
-msgid "Purchase days response to the same logic than sales security days."
-msgstr "Відповідь на дні купівлі відповідає тій же логіці, що й дні продажу."
-
-#: ../../purchase/replenishment/flows/compute_date.rst:101
+#: ../../purchase/replenishment/flows/compute_date.rst:90
 msgid ""
-"They are margins of error for vendor lead times. When the system generates "
-"purchase orders for procuring products, they will be scheduled in order to "
-"cope with unexpected vendor delays. Purchase lead time can be found in the "
-"same menu as the sales safety days (see screenshot above)."
+"January 10: order date = deadline to order from your vendor (19th January - "
+"9 days of vendor lead time)"
 msgstr ""
-"Вони є межами помилки для терміну виконання постачальника. Коли система "
-"генерує замовлення на закупівлю для закупівлі товарів, вони будуть "
-"заплановані, щоби справитися з несподіваними затримками постачальників. "
-"Термін виконання купівлі можна знайти в тому ж меню, що й дні безпеки для "
-"продажів (див. Знімок екрану вище)."
-
-#: ../../purchase/replenishment/flows/compute_date.rst:108
-msgid "On route level"
-msgstr "На рівні маршруту"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:110
-msgid ""
-"The internal transfers due to the movement of stocks can also influence the "
-"computed date."
-msgstr ""
-"Внутрішні переміщення за рахунок складських переміщень також можуть вплинути"
-" на обчислену дату."
-
-#: ../../purchase/replenishment/flows/compute_date.rst:113
-msgid ""
-"The delays due to internal transfers can be specified in the **Inventory** "
-"module when creating a new push rule for a new route."
-msgstr ""
-"Затримки через внутрішні переміщення можна вказати в модулі **Склад** при "
-"створенні нового правила натискання нового маршруту."
-
-#: ../../purchase/replenishment/flows/compute_date.rst:117
-msgid ""
-"Read the documentation "
-":doc:`../../../../inventory/routes/concepts/push_rule` to learn more."
-msgstr ""
-"Прочитайте документацію "
-":doc:`../../../../inventory/routes/concepts/push_rule`, щоб дізнатися "
-"більше."
-
-#: ../../purchase/replenishment/flows/compute_date.rst:125
-msgid "On document level:"
-msgstr "На рівні документа:"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:128
-msgid "Requested date"
-msgstr "Запитувана дата"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:130
-msgid ""
-"Odoo offers the possibility to indicate a requested date by the client "
-"straight on the sale order, under the tab **Other information**. If this "
-"date is earlier than the theoretically computed date, Odoo will "
-"automatically display a warning."
-msgstr ""
-"Odoo пропонує можливість вказати запитану дату клієнтом прямо в замовленні "
-"на продаж, під вкладкою **Інша інформація**. Якщо ця дата раніше, ніж "
-"теоретично обчислена дата, Odoo буде автоматично відображати попередження."
-
-#: ../../purchase/replenishment/flows/compute_date.rst:141
-msgid ""
-"As an example, you may sell a car today (January 1st), that is purchased on "
-"order, and you promise to deliver your customer within 20 days (January 20)."
-" In such a scenario, the scheduler may trigger the following events, based "
-"on your configuration:"
-msgstr ""
-"Як приклад, ви можете продати автомобіль сьогодні (1 січня), який придбаний "
-"за замовленням, і ви обіцяєте доставити своєму клієнту протягом 20 днів (20 "
-"січня). У такому випадку планувальник може ініціювати наступні дії, виходячи"
-" з вашої конфігурації:"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:146
-msgid "January 19: actual scheduled delivery (1 day of Sales Safety days)"
-msgstr "19 січня: фактична запланована доставка (1 день безпеки продажу)"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:148
-msgid ""
-"January 18: receive the product from your supplier (1 day of Purchase days)"
-msgstr "18 січня: отримуйте товар від свого постачальника (1 день купівлі)"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:151
-msgid ""
-"January 10: deadline to order at your supplier (9 days of supplier delivery "
-"lead time)"
-msgstr ""
-"10 січня: крайній термін замовлення у вашого постачальника (9 днів терміну "
-"доставки постачальника)"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:154
-msgid ""
-"January 8: trigger a purchase request to your purchase team, since the team "
-"needs on average 2 days to find the right supplier and order."
-msgstr ""
-"8 січня: запустіть запит на купівлю в команду покупців, оскільки команда "
-"потребує в середньому 2 дні, щоби знайти потрібного постачальника та "
-"замовлення."
 
 #: ../../purchase/replenishment/flows/dropshipping.rst:3
-msgid "How to setup drop-shipping?"
-msgstr "Як встановити дропшипінг?"
+msgid "Setup drop-shipping"
+msgstr ""
+
+#: ../../purchase/replenishment/flows/dropshipping.rst:6
+#: ../../purchase/replenishment/multicompany/setup.rst:6
+msgid "Overview"
+msgstr "Загальний огляд"
 
 #: ../../purchase/replenishment/flows/dropshipping.rst:8
 msgid ""
@@ -3269,630 +2046,144 @@ msgstr ""
 "рахунка-фактури вашого товару в **Замовленій кількості**. "
 
 #: ../../purchase/replenishment/flows/purchase_triggering.rst:3
-msgid "How to trigger the purchase of products based on sales?"
-msgstr "Як запустити купівлю товарів на основі продажів?"
+msgid "Trigger purchase of products based on sales (Make to Order)"
+msgstr ""
+
+#: ../../purchase/replenishment/flows/purchase_triggering.rst:5
+msgid ""
+"If you don't keep stock of your products, you may need to trigger purchase "
+"orders on each sale you make."
+msgstr ""
 
 #: ../../purchase/replenishment/flows/purchase_triggering.rst:8
 msgid ""
-"When you work in just-in-time, you don't manage stock so you directly order "
-"the product you need from your vendor."
+"Thanks to being a fully integrated solution, Odoo lets you do that easily in"
+" just one step."
 msgstr ""
-"Коли ви працюєте у своєчасному режимі, ви не керуєте складом, тому ви "
-"безпосередньо замовляєте потрібний товар у свого постачальника."
 
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:11
-msgid "The usual flow is:"
-msgstr "Звичайний процес:"
+#: ../../purchase/replenishment/flows/purchase_triggering.rst:12
+msgid "Configure the product"
+msgstr ""
 
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:13
-msgid "Create a sale order"
-msgstr "Створіть замовлення на продаж"
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:15
-msgid "Purchase the product"
-msgstr "Купіть товар"
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:17
-msgid "Receive and pay the bill"
-msgstr "Отримуйте та сплачуйте рахунок"
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:19
-msgid "Deliver your product"
-msgstr "Доставте ваш товар"
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:21
-msgid "Invoice your customer"
-msgstr "Виставте рахунок вашому клієнту"
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:24
-msgid "Product configuration"
-msgstr "Налаштування товару"
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:26
+#: ../../purchase/replenishment/flows/purchase_triggering.rst:14
 msgid ""
-"In the purchases application, open the **Purchase** menu and click on "
-"**Products**. Open the product on which you want to do your purchases based "
-"on sales."
+"Open a product form and, under the inventory tab, tick the routes *Buy* and "
+"*Make To Order*."
 msgstr ""
-"У додатку Купівля відкрийте меню **Купівля** та натисніть **Товари**. "
-"Відкрийте товар, на якому ви хочете здійснити ваші купівлі на основі "
-"продажів."
 
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:30
+#: ../../purchase/replenishment/flows/purchase_triggering.rst:20
+msgid "Don't forget to also set a vendor under the *Purchase* tab."
+msgstr ""
+
+#: ../../purchase/replenishment/flows/purchase_triggering.rst:23
 msgid ""
-"Next to Routes, tick **Buy** and **Make to order** as a procurement method. "
-"When you are generating sales order, Odoo will automatically reorder the "
-"same quantity through procurement."
+"The *Inventory*, *Sales* and *Purchases* modules have to be installed in "
+"Odoo for this feature to work."
 msgstr ""
-"Поруч із маршрутами виберіть опцію **Купити** та **Зробити на замовлення** "
-"як метод купівлі. Коли ви створюєте замовлення на продаж, Odoo автоматично "
-"дозамовляє таку ж кількість через закупівлю."
 
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:37
-msgid "Don't forget to set a vendor otherwise the rule won't be triggered."
-msgstr "Не забудьте встановити постачальника, інакше правило не спрацює."
+#: ../../purchase/replenishment/flows/purchase_triggering.rst:27
+msgid "Create a sales order using Buy & MTO"
+msgstr ""
 
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:39
+#: ../../purchase/replenishment/flows/purchase_triggering.rst:29
 msgid ""
-"You can also configure minimum stock rules that will trigger the purchase "
-"orders."
+"Create a new sales order with your product. When you confirm the order, a "
+"delivery order is created with the status *Waiting for another operation*."
 msgstr ""
-"Ви також можете налаштувати правило мінімального запасу, яке ініціює "
-"замовлення на купівлю."
 
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:43
+#: ../../purchase/replenishment/flows/purchase_triggering.rst:33
 msgid ""
-"To know how to configure a minimum stock rule, please read the document "
-":doc:`setup_stock_rule`."
+"A new RfQ will automatically be created in your *Purchases* module. Note "
+"that you can see for which SO this RfQ has been created thanks to the "
+"*Source Document* field, visible on the RfQ."
 msgstr ""
-"Щоб дізнатися, як налаштувати правило мінімального запасу, прочитайте "
-"документацію :doc:`setup_stock_rule`."
 
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:50
-msgid "Sale order"
-msgstr "Замовлення на продаж"
+#: ../../purchase/replenishment/flows/purchase_triggering.rst:40
+msgid ""
+"When you confirm the RfQ into a purchase order, a receipt is automatically "
+"created and directly accessible from your purchase order with the use of the"
+" *Shipment* button."
+msgstr ""
+
+#: ../../purchase/replenishment/flows/purchase_triggering.rst:47
+msgid ""
+"You can validate the receipt of your products. When you will go back to the "
+"delivery order, you will see that the products are now ready to be shipped."
+msgstr ""
 
 #: ../../purchase/replenishment/flows/purchase_triggering.rst:52
 msgid ""
-"To create a sale order, go to the **Sales** application, "
-":menuselection:`Sales --> Sales order` and create a new sale order."
+"As long as your RfQ is not confirmed, Odoo will keep adding PO Lines "
+"automatically under it."
 msgstr ""
-"Щоб створити замовлення на продаж, перейдіть до додатку **Продажі**, "
-"натисніть, :menuselection:`Продажі --> Замовлення на продаж` та створіть "
-"нове замовлення на продаж."
 
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:58
-msgid ""
-"After confirming it, you will see one **Delivery** associated with this sale"
-" order on the **button** on the top of it."
+#: ../../purchase/replenishment/flows/purchase_triggering.rst:57
+msgid ":doc:`../../../purchase/replenishment/flows/setup_stock_rule`"
 msgstr ""
-"Після підтвердження, ви побачите одну **Доставку**, пов'язану з цим "
-"замовленням на продаж, на **кнопці** вгорі."
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:64
-msgid ""
-"Click on the **Delivery** button to see the transfer order. The status of "
-"the outgoing shipment is **Waiting Another Operation**. It won't be done "
-"until the purchase order is confirmed and received."
-msgstr ""
-"Натисніть кнопку **Доставка**, щоб побачити замовлення на переміщення. "
-"Статус вихідної відправки - **Очікування іншої операції**. Це не буде "
-"зроблено, поки замовлення на купівлю не буде підтверджено та отримано."
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:69
-msgid "Purchase order"
-msgstr "Замовлення на купівлю"
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:71
-msgid ""
-"The purchase order is automatically created. Go to the **Purchase** "
-"application :menuselection:`Purchase --> Request for Quotation`. The source "
-"document is the sale order that triggered the procurement."
-msgstr ""
-"Замовлення на купівлю створюється автоматично. Перейдіть до програми "
-"**Купівлі**, натисніть :menuselection:`Купівлі --> Запит на комерційну "
-"пропозицію`. Початковий документ - це замовлення на продаж, яке спричинило "
-"закупівлю."
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:79
-msgid ""
-"If you make some more sales that trigger procurements to the same vendor, it"
-" will be added to the existing request for quotation. Once it is confirmed, "
-"the next procurements will create a new request for quotation."
-msgstr ""
-"Якщо ви здійснюєте ще кілька продажів, які ініціюють закупівлі для того ж "
-"постачальника, він буде доданий до існуючого запиту на комерційну "
-"пропозицію. Після підтвердження, наступні закупівлі створять новий запит на "
-"комерційну пропозицію."
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:85
-msgid "Receipt and delivery"
-msgstr "Квитанція та доставка"
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:87
-msgid ""
-"Go the the **Inventory** application. Click on **# To Receive** on the "
-"**Receipts** tile."
-msgstr ""
-"Перейдіть до програми **Склад**. Натисніть **# Отримати** на **Вхідні "
-"поставки**."
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:93
-msgid "Select the receipt from your vendor and **Validate** it."
-msgstr "Виберіть квитанцію від свого постачальника та **Перевірте** її."
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:98
-msgid ""
-"Go back to the **Inventory** dashboard. In the delivery order, click on **# "
-"To Do**. The delivery order is now ready to ship."
-msgstr ""
-"Поверніться на інформаційну панель **Склад**. У замовленні на доставку "
-"натисніть **# Зробити**. Замовлення на доставку вже готове доставляти."
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:104
-msgid ""
-"The status of the delivery changed from **Waiting Availability** to "
-"**Available**. Validate the transfer to confirm the delivery."
-msgstr ""
-"Статус доставки змінився з **Очікування доступності** на **Доступний**. "
-"Перевірте переміщення, щоб підтвердити доставку."
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:111
-msgid ":doc:`setup_stock_rule`"
-msgstr ":doc:`setup_stock_rule`"
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:112
-msgid ":doc:`warning_triggering`"
-msgstr ":doc:`warning_triggering`"
 
 #: ../../purchase/replenishment/flows/setup_stock_rule.rst:3
-msgid "How to setup a minimum stock rule?"
-msgstr "Як встановити правило мінімального запасу?"
+msgid "Don’t run out of stock thanks to Reordering Rules"
+msgstr ""
 
 #: ../../purchase/replenishment/flows/setup_stock_rule.rst:5
 msgid ""
-"For some items you hold in stock, it might be useful to have rules making "
-"sure you never run out of stocks (for example, products with a high demand, "
-"or large items requiring a lot of storage space meaning they're harder to "
-"stock)."
+"To make sure you never run out of stock, you might want to define "
+"*Reordering Rules* on products. Thanks to reordering rules, Odoo will help "
+"you to replenish your stock when it reaches a minimum stock level."
 msgstr ""
-"Для деяких товарів, які ви тримаєте на складі, може бути корисно мати "
-"правила, які гарантують, що ви ніколи не вичерпаєте запас (наприклад, товари"
-" з великим попитом або великі товари, що потребують великої кількості "
-"вільного місця для зберігання)."
 
 #: ../../purchase/replenishment/flows/setup_stock_rule.rst:10
-msgid ""
-"Odoo allows you to set up rules so that an automatic replenishment for those"
-" items is made, based on minimum stocks available."
+msgid "Set a reordering rule"
 msgstr ""
-"Odoo дозволяє встановлювати правила для автоматичного поповнення запасів на "
-"основі наявних мінімальних запасів."
 
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:14
-msgid "When should I use Reordering Rules?"
-msgstr "Коли потрібно використовувати правила дозамовлення?"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:16
-msgid ""
-"Reordering Rules work best for items that have a high demand and high flow. "
-"It will relieve you from a lot of work to focus on the rest of your "
-"activities knowing that stocks will always be right."
+#: ../../purchase/replenishment/flows/setup_stock_rule.rst:12
+msgid "Open a stockable product, you'll find the *Reordering Rules* tab."
 msgstr ""
-"Правила дозамовлення найкраще працюють для товарів, які мають високий попит "
-"та високий потік. Це звільнить вас від великої роботи, щоб зосередити увагу "
-"на решті вашої діяльності, знаючи, що запаси завжди будуть правильними."
 
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:20
+#: ../../purchase/replenishment/flows/setup_stock_rule.rst:15
 msgid ""
-"It can also be used when you have limited storage space and you need to keep"
-" large items in stock. In this case, you can keep as little as 1 item in "
-"stock, and have a new one ordered as a stock replenishment as soon as the "
-"item in stock is sold."
+"You can also access all your reordering rules from :menuselection:`Inventory"
+" --> Master Data --> Reordering Rules`."
 msgstr ""
-"Правило також може використовуватися, коли у вас є обмежене місце на "
-"зберігання, і ви повинні зберігати великі товари на складі. У такому випадку"
-" ви можете зберегти лише 1 товар на складі та мати новий, замовлений як "
-"поповнення запасу, як тільки товар буде проданий."
 
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:26
-msgid "When should I avoid Reordering Rules?"
-msgstr "Коли слід уникати правил дозамовлення?"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:28
+#: ../../purchase/replenishment/flows/setup_stock_rule.rst:21
 msgid ""
-"If you are offering a new product and don't know yet how fast it will go, "
-"you should handle stocks yourself first, and setup reordering rules only a "
-"few months into the sale to have better forecasts of the demand."
+"Once in the next menu, you can create the reordering rules linked to your "
+"product. From now on, every time this product reaches the minimum quantity "
+"it will replenish your stock to your **maximum quantity**."
 msgstr ""
-"Якщо ви пропонуєте новий товар і не знаєте, як швидко він буде, ви повинні "
-"спершу справитися із запасами і встановити правила дозамовлення лише через "
-"декілька місяців після продажу, щоб мати кращі прогнози попиту."
 
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:32
+#: ../../purchase/replenishment/flows/setup_stock_rule.rst:29
 msgid ""
-"If you sell items that have a limited lifetime, such as fashion items, "
-"technology items, or products working together with a system that is meant "
-"to evolve, you have to be very well informed on when to stop automated "
-"replenishments, in order to avoid having to sell these items at a price that"
-" will not allow you to break even."
-msgstr ""
-"Якщо ви продаєте товари, які мають обмежений термін використання, такі як "
-"товари моди, технології або продукти, які працюють разом із системою, яка "
-"має розвиватися, ви повинні бути дуже добре поінформовані про те, коли "
-"зупинити автоматичне поповнення, щоб уникнути продажу цих товарів за ціною, "
-"яка не дозволить вам розбитись."
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:41
-msgid ""
-"My company sells modern furniture. We sell a set of table and chairs that "
-"are available in 4 seatings and 6 seatings."
-msgstr ""
-"Наша компанія продає сучасні меблі. Ми продаємо набір столів і стільців, які"
-" доступні на 4 сидіння і 6 сидячих місць."
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:44
-msgid ""
-"To keep things simple, we stock tables and chairs separately, but sell them "
-"all together to our clients as a kit. In order to make sure we can always "
-"deliver a complete set of table and chairs, I setup a Reordering Rule for "
-"the chairs to make sure I always have at least 10 chairs in stock, but no "
-"more than 20. This way, I can sell up to 5 sets of table at once while "
-"keeping my stock low enough not to eat up all my storage space."
-msgstr ""
-"Щоб тримати все простіше, ми зберігаємо столики та стільці окремо, проте "
-"продаємо їх усі разом своїм клієнтам у комплекті. Щоби переконатися, що ми "
-"завжди можемо доставити комплект столів та стільців, ми встановлюємо правило"
-" дозамовлення для стільців, щоби переконатися, що в нас завжди є щонайменше "
-"10 стільців, але не більше 20. Таким чином, ми можемо продати одночасно до 5"
-" наборів, зберігаючи наш запас досить низьким, щоб не використати все наше "
-"місце для зберігання."
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:52
-msgid ""
-"The last table I sold was a 4 seatings, and there were 12 chairs left in my "
-"stock. Because the stock in chairs is now only 8 chairs, Odoo will "
-"automatically order 12 new chairs to fill up my stock to the maximum amount."
-msgstr ""
-"Останній стіл, який ми продали, складався з 4 сидячих місць, а на нашому "
-"складі залишилося 12 стільців. Оскільки запас складає лише 8 стільців, Odoo "
-"автоматично замовить 12 нових стільців, щоб заповнити нашу суму до "
-"максимального розміру."
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:61
-msgid "Set up your product"
-msgstr "Налаштуйте ваш товар"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:63
-msgid ""
-"In the Purchases module, open the Purchase menu and click on Products. Open "
-"the product to which you would like to add a Reordering Rule (or create a "
-"new one)."
-msgstr ""
-"У модулі Купівля відкрийте меню Купівля та натисніть кнопку Товари. "
-"Відкрийте товар, до якого ви хочете додати правило дозамовлення (або "
-"створіть новий)."
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:67
-msgid "3 conditions for correct reordering rule :"
-msgstr "Три умови для коректного правила дозамовлення:"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:69
-msgid ""
-"In :menuselection:`General information --> Product type`, make the product "
-"stockable (as soon as this is done, the icon \"Reordering rule will appear)"
-msgstr ""
-"У :menuselection:`Загальна інформація --> Тип товару`, зробіть товар наявним"
-" на складі (як тільки це буде зроблено, з'явиться значок \"Правило "
-"дозамовлення)"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:71
-msgid ""
-"In :menuselection:`Inventory --> route`, tick the \"Buy\" box (and untick "
-"the Make To Order box)"
-msgstr ""
-"У :menuselection:`Склад --> маршрут`, позначте поле \"Купити\" (і зніміть "
-"поле Зробити під замовлення)"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:73
-msgid ""
-"Select a vendor (don't forget to put a minimal quantity greater than 0)"
-msgstr ""
-"Виберіть постачальника (не забувайте вказувати мінімальну кількість більше, "
-"ніж 0)"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:76
-msgid "Create a reordering rule"
-msgstr "Створіть правило дозамовлення"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:78
-msgid "Click on the Reordering Rules tab, click on Create. A new page opens."
-msgstr ""
-"Натисніть Правило дозамовлення, натисніть кнопку Створити. Відкриється нова "
-"сторінка."
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:83
-msgid ""
-"By default, Reordering Rules in Odoo are named as \"OP/XXXXX\" but you are "
-"free to use any nomenclature. You can modify it via the **Name** field."
-msgstr ""
-"За замовчуванням правила дозамовлення в Odoo називаються \"OP/XXXXX\", але "
-"ви можете використовувати будь-яку номенклатуру. Ви можете змінити його за "
-"допомогою поля **Назва**."
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:86
-msgid "The **Product** field is the product you are creating the rule for."
-msgstr "Поле **Товар** - це товар, для якого ви створюєте правило."
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:88
-msgid ""
-"Select the warehouse to which the product should be delivered in the "
-"**Warehouse** field."
-msgstr "Виберіть склад, на який буде доставлено товар, у полі **Склад**."
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:91
-msgid ""
-"If you have configured multiple warehouses and location, specify the "
-"location in which the product will be stored in the **Location** field."
-msgstr ""
-"Якщо ви налаштували кілька складів і місцезнаходження, вкажіть місце, в "
-"якому товар буде зберігатися в полі **Місцезнаходження**."
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:96
-msgid ""
-":doc:`../../../inventory/settings/warehouses/difference_warehouse_location`"
-msgstr ""
-":doc:`../../../inventory/settings/warehouses/difference_warehouse_location`"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:102
-msgid ""
-"In the **Minimum Quantity** field, insert the quantity to which the system "
-"will trigger a new order for replenishment."
-msgstr ""
-"У полі **Мінімальне число** введіть кількість, до якої система буде "
-"викликати нове замовлення для поповнення."
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:105
-msgid ""
-"In the **Maximum Quantity** field, insert the maximum of items that has to "
-"be stocked. The replenishing order will be based on that quantity to "
-"reorder."
-msgstr ""
-"У полі **Максимальне кількість** вкажіть максимальну кількість товарів, яку "
-"потрібно мати в запасі. Поповнення замовлення буде засноване на кількості "
-"для дозамовлення."
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:109
-msgid ""
-"The **Quantity Multiple** is the lowest number of items that can be ordered "
-"at once. For instance, some items may be only available for purchase in a "
-"set of 2."
-msgstr ""
-"**Кілька кількостей** є найменшою кількістю товарів, які можна замовити "
-"одночасно. Наприклад, деякі товари можуть бути доступні лише для покупки в "
-"наборі 2."
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:113
-msgid ""
-"In the Misc section, the **Active** box allows you to activate or deactivate"
-" the rule."
-msgstr ""
-"У розділі Різне **Активне** поле дозволяє активувати або деактивувати "
-"правило."
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:116
-msgid "In the **Lead Time** section, you can enter:"
-msgstr "У розділі **Провідний час** ви можете ввести:"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:118
-msgid ""
-"the number of Day(s) to purchase: correspond to the number of days for the "
-"supplier to receive the order"
-msgstr ""
-"кількість днів для купівлі: відповідає кількості днів, протягом яких "
-"постачальник отримує замовлення"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:120
-msgid "the number of Day(s) to get the products"
-msgstr "кількість днів, щоб отримати товари"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:122
-msgid ""
-"By default, the lead times are in calendar days. You can change that in "
-":menuselection:`Inventory --> Configuration --> Settings --> Minimum Stock "
-"Rules`"
-msgstr ""
-"За замовчуванням, час очікування відбувається за календарними днями. Ви "
-"можете змінити це в :menuselection:`Склад --> Налаштування --> Налаштування "
-"--> Правило мінімального запасу`"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:125
-msgid "When you have entered all the info, click on Save."
-msgstr "Коли ви введете всю інформацію, натисніть Зберегти."
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:127
-msgid ""
-"From now on, every time a product with a reordering rule reaches the minimum"
-" stock, the system will automatically send a RfQ to your supplier based on "
-"your maximum quantity to replenish your stock."
-msgstr ""
-"Відтепер кожен раз, коли товар з правилом дозамовлення досягає мінімального "
-"запасу, система автоматично надсилатиме вашому постачальнику запит на "
-"комерційну пропозицію на основі вашої максимальної кількості, щоб поповнити "
-"запас."
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:131
-msgid ""
-"The replenishments will take place when the scheduler in the Inventory "
+"The replenishments will take place when the scheduler in the *Inventory* "
 "module runs. By default in Odoo, the schedulers will run every night at "
 "12:00PM."
 msgstr ""
-"Поповнення відбудеться після запуску планувальника модуля Склад. За "
-"замовчуванням в Odoo планувальники працюватимуть щоночі о 00:00."
 
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:135
+#: ../../purchase/replenishment/flows/setup_stock_rule.rst:33
+msgid "See also: :doc:`../../../inventory/management/misc/schedulers`"
+msgstr ""
+
+#: ../../purchase/replenishment/flows/setup_stock_rule.rst:35
 msgid ""
-"To know how to configure and run the schedulers manually, read the document "
-"on :doc:`../../../inventory/management/misc/schedulers`"
+"From now on, every time a product with a reordering rule reaches the minimum"
+" stock, the system will automatically see how to fulfill that need based on "
+"the product configuration (e.g create an RfQ, create an MO, etc.)."
 msgstr ""
-"Щоб знати, як налаштувати та запустити планувальники вручну, прочитайте "
-"документацію :doc:`../../../inventory/management/misc/schedulers`"
 
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:140
-msgid ":doc:`../../../inventory/management/misc/schedulers`"
-msgstr ":doc:`../../../inventory/management/misc/schedulers`"
+#: ../../purchase/replenishment/flows/setup_stock_rule.rst:41
+msgid "Troubleshooting"
+msgstr "Вирішення проблем"
 
-#: ../../purchase/replenishment/flows/warning_triggering.rst:3
-#: ../../purchase/replenishment/flows/warning_triggering.rst:69
-msgid "How to trigger a warning when purchasing at a specific vendor?"
-msgstr ""
-"Як викликати попередження під час купівлі у конкретного постачальника?"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:8
+#: ../../purchase/replenishment/flows/setup_stock_rule.rst:43
 msgid ""
-"The **Warning Messages and Alerts** module allow you to configure alerts on "
-"the customers and vendors or products."
+"For your reordering rules to work, your product needs to be correctly "
+"configured. If you are using *Buy* route, you need a vendor on the product. "
+"If you are using *Manufacturing* route you will been a BoM on the product. "
+"If the product is not fully configured or there is a mistake in your routes,"
+" a next activity will be logged on the product informing you there is an "
+"issue with the configuration."
 msgstr ""
-"Модуль **Попереджень та сповіщень** дозволяє налаштувати сповіщення для "
-"клієнтів та постачальників або товарів."
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:11
-msgid ""
-"You can select the following types of warnings and create different warnings"
-" for purchases and sales:"
-msgstr ""
-"Ви можете вибрати такі типи попереджень та створювати різні попередження для"
-" купівель і продажів:"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:14
-msgid ""
-"Warning: This option displays the warning message during the process, but "
-"allows the user to continue."
-msgstr ""
-"Попередження: цей параметр відображає попередження під час процесу, але "
-"дозволяє користувачеві продовжувати."
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:17
-msgid ""
-"Blocking Message: The message displays a warning message, but the user "
-"cannot continue the process further."
-msgstr ""
-"Повідомлення блокування: з'являється попереджувальне повідомлення, але "
-"користувач не може продовжувати процес далі."
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:24
-msgid "Module Installation"
-msgstr "Встановлення модуля"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:26
-msgid ""
-"First, you need to install the **Warning Messages and Alerts** module. Go to"
-" **Apps** and look for it (don't forget to remove the **Apps** filter)."
-msgstr ""
-"По-перше, вам потрібно встановити модуль **Попереджень та сповіщень**. "
-"Перейдіть до **Додатків** і знайдіть модуль (не забудьте видалити фільтр "
-"**Додатків**)."
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:33
-msgid "Vendor or Customer warnings"
-msgstr "Попередження постачальника чи клієнта"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:35
-msgid ""
-"Go to :menuselection:`Purchases --> Vendors` or to :menuselection:`Sales -->"
-" Customers`."
-msgstr ""
-"Перейдіть до :menuselection:`Купівлі --> Постачальники` або до "
-":menuselection:`Продажі --> Клієнти`."
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:37
-msgid "Open the vendor or the customer and click on the **Warnings** tab."
-msgstr ""
-"Відкрийте постачальника або клієнта та натисніть вкладку **Попередження**."
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:42
-#: ../../purchase/replenishment/flows/warning_triggering.rst:62
-msgid "The available warnings are:"
-msgstr "Доступні попередження:"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:44
-msgid "Warning on the **Sales Order**"
-msgstr "Попередження в **Замовленні на продаж**"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:46
-msgid "Warning on the **Purchase Order**"
-msgstr "Попередження в **Замовленні на купівлю**"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:48
-msgid "Warning on the **Picking**"
-msgstr "Попередження в **Комплектуванні**"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:50
-msgid "Warning on the **Invoice**"
-msgstr "Попередження в **Рахунку-фактурі**"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:53
-msgid "Product Warnings"
-msgstr "Попередження товару"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:55
-msgid ""
-"Go to :menuselection:`Purchases --> Products` or to :menuselection:`Sales "
-"--> Products`."
-msgstr ""
-"Перейдіть до :menuselection:`Купівлі --> Товари` або до "
-":menuselection:`Продажі --> Товари`."
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:57
-msgid "Open the product and click on the **Notes** tab."
-msgstr "Відкрийте товар та натисніть вкладку **Нотатки**."
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:64
-msgid "Warning when selling this product."
-msgstr "Попередження під час продажу цього товару."
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:66
-msgid "Warning when Purchasing this product."
-msgstr "Попередження під час придбання цього товару."
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:71
-msgid ""
-"Go to the Purchases application, click on :menuselection:`Purchase --> "
-"Vendors`. Go to the **Warnings** tab."
-msgstr ""
-"Перейдіть до програми Купівлі, натисніть :menuselection:`Купівлі --> "
-"Постачальники`. Перейдіть до вкладки **Попередження**."
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:74
-msgid ""
-"Under **Warning on the Purchase Order**, choose **Warning** and write your "
-"warning."
-msgstr ""
-"У розділі **Попередження в Замовленні на купівлю** виберіть **Попередження**"
-" та напишіть своє попередження."
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:80
-msgid ""
-"Create a **Request for Quotation**. Go to :menuselection:`Purchase --> "
-"Request for Quotation` and click on **Create**. Choose the vendor on which a"
-" warning was set."
-msgstr ""
-"Створіть **Запит на комерційну пропозицію**. Перейдіть до  "
-":menuselection:`Купівлі --> Запит на комерційну пропозицію` та натисніть "
-"кнопку **Створити**. Виберіть постачальника, на якому було встановлено "
-"попередження."
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:84
-msgid "When choosing the vendor, the warning will appear."
-msgstr "Вибравши постачальника, з'явиться попередження."
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:90
-msgid ""
-"If you set a blocking message instead of a warning message, you won't be "
-"able to choose the vendor."
-msgstr ""
-"Якщо ви встановите повідомлення блокування замість попередження, ви не "
-"зможете вибрати постачальника."
 
 #: ../../purchase/replenishment/multicompany.rst:3
 msgid "Multi-Companies"
@@ -3983,83 +2274,3 @@ msgid ""
 msgstr ""
 "Щоб мати можливість керувати правилами між компаніями, переконайтеся, що ваш"
 " користувач має право керувати компаніями."
-
-#: ../../purchase/replenishment/trouble_shooting.rst:3
-msgid "Trouble-Shooting"
-msgstr "Вирішення проблем"
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:3
-msgid "How to check that everything is working fine?"
-msgstr "Як перевірити, що все працює добре?"
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:6
-msgid "Vendor Bills"
-msgstr "Рахунки постачальників"
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:8
-msgid ""
-"Even if you don't have the rights to the accounting application, you can "
-"still control the vendor bills."
-msgstr ""
-"Навіть якщо у вас немає прав на бухоблік, ви все одно можете керувати "
-"рахунками постачальника."
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:11
-msgid ""
-"Go to the **Purchases** application: :menuselection:`Control --> Vendor "
-"Bills`."
-msgstr ""
-"Перейдіть у програму **Купівлі**: :menuselection:`Контроль --> Рахунки "
-"постачальників`."
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:17
-msgid "Incoming Products"
-msgstr "Вхідні товари"
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:19
-msgid ""
-"Even if you don't have the rights to the inventory application, you can "
-"still control the incoming products."
-msgstr ""
-"Навіть якщо у вас немає прав на програму склад, ви все одно можете "
-"контролювати вхідні товари."
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:22
-msgid ""
-"Go to the **Purchases** application: :menuselection:`Control --> Incoming "
-"Products`."
-msgstr ""
-"Перейдіть до модуля **Купівлі**: :menuselection:`Контроль --> Вхідні "
-"товари`."
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:28
-msgid "Procurements exceptions"
-msgstr "Проблеми забезпечення"
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:30
-msgid "Here, you need the **Inventory Manager** access rights."
-msgstr "Тут потрібні права доступу до **Управління складом**."
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:32
-msgid ""
-"Go to the **Inventory** application: :menuselection:`Control --> Procurement"
-" Exceptions`."
-msgstr ""
-"Перейдіть до модуля **Склад**: :menuselection:`Контроль --> Проблеми "
-"забезпечення`."
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:37
-msgid ""
-"To understand why the procurement is not running, open the exception and "
-"check the message in the chatter."
-msgstr ""
-"Щоб зрозуміти, чому закупівлі не виконуються, відкрийте проблеми "
-"забезпечення та перевірте повідомлення в чатах."
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:43
-msgid ""
-"Usually, the problem is located on the procurement rules. Either there are "
-"no stock rules, or there are no vendor associated to a product."
-msgstr ""
-"Зазвичай проблема знаходиться в правилах закупівлі. Або жодних складських "
-"правил не існує, або ж немає постачальників, пов'язаних із товаром."
diff --git a/locale/uk/LC_MESSAGES/sales.po b/locale/uk/LC_MESSAGES/sales.po
index 000931b3f..c16007235 100644
--- a/locale/uk/LC_MESSAGES/sales.po
+++ b/locale/uk/LC_MESSAGES/sales.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-23 12:10+0200\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018\n"
 "Language-Team: Ukrainian (https://www.transifex.com/odoo/teams/41243/uk/)\n"
@@ -279,825 +279,569 @@ msgstr ""
 msgid "Invoicing Method"
 msgstr "Метод виставлення рахунку"
 
-#: ../../sales/invoicing/services.rst:3
-msgid "Services"
-msgstr "Послуги"
+#: ../../sales/invoicing/down_payment.rst:3
+msgid "Request a down payment"
+msgstr "Запит на передоплату"
 
-#: ../../sales/invoicing/services/milestones.rst:3
-msgid "How to invoice milestones of a project?"
-msgstr "Як розробити рахунок-фактуру для проекту?"
-
-#: ../../sales/invoicing/services/milestones.rst:5
+#: ../../sales/invoicing/down_payment.rst:5
 msgid ""
-"There are different kind of service sales: prepaid volume of hours/days "
-"(e.g. support contract), billing based on time and material (e.g. billing "
-"consulting hours) or a fixed price contract (e.g. a project)."
+"A down payment is an initial, partial payment, with the agreement that the "
+"rest will be paid later. For expensive orders or projects, it is a way to "
+"protect yourself and make sure your customer is serious."
 msgstr ""
-"Існують різні види послуг продажу: обсяг попередньо оплачених годин/днів "
-"(наприклад, контракт підтримки), платіж на основі часу та матеріалу "
-"(наприклад, час консультаційного рахунку) або договір про фіксовану ціну "
-"(наприклад, проект)."
+"Передоплата - початкова, часткова оплата, за умови, що решта буде сплачена "
+"пізніше. Для дорогих замовлень або проектів це спосіб захистити себе та "
+"переконатися, що ваш клієнт є серйозним."
 
-#: ../../sales/invoicing/services/milestones.rst:9
+#: ../../sales/invoicing/down_payment.rst:10
+msgid "First time you request a down payment"
+msgstr "Перший раз ви запитуєте передоплату"
+
+#: ../../sales/invoicing/down_payment.rst:12
 msgid ""
-"In this section, we will have a look at how to invoice milestones of a "
-"project."
+"When you confirm a sale, you can create an invoice and select a down payment"
+" option. It can either be a fixed amount or a percentage of the total "
+"amount."
 msgstr ""
-"У цьому розділі ми ознайомимось з тим, як вирахувати рахунок-фактуру на "
-"кожен етап проекту."
+"Підтверджуючи продаж, ви можете створити рахунок-фактуру та вибрати варіант "
+"передоплати. Це може бути або фіксована сума, або відсоток від загальної "
+"суми."
 
-#: ../../sales/invoicing/services/milestones.rst:12
+#: ../../sales/invoicing/down_payment.rst:16
 msgid ""
-"Milestone invoicing can be used for expensive or large scale projects, with "
-"each milestone representing a clear sequence of work that will incrementally"
-" build up to the completion of the contract. For example, a marketing agency"
-" hired for a new product launch could break down a project into the "
-"following milestones, each of them considered as one service with a fixed "
-"price on the sale order :"
+"The first time you request a down payment you can select an income account "
+"and a tax setting that will be reused for next down payments."
 msgstr ""
-"Виставлення рахунків за версію може використовуватися для дорогих або "
-"масштабних проектів, при цьому кожен етап представляє собою чітку "
-"послідовність робіт, яка буде поступово нарощуватись до завершення "
-"контракту. Наприклад, агентство з маркетингу, яке найняте для запуску нового"
-" проекту, могло б розбити його на наступні етапи, кожен з яких вважається "
-"однією послугою з фіксованою ціною на замовлення продажу:"
+"У перший раз, коли ви запитуєте передоплату, ви можете вибрати рахунок "
+"доходу та налаштування податку, яке буде використано для подальших "
+"передоплат."
 
-#: ../../sales/invoicing/services/milestones.rst:19
-msgid "Milestone 1 : Marketing strategy audit - 5 000 euros"
-msgstr "Крок 1: Аудит маркетингової стратегії - 5 000 євро"
+#: ../../sales/invoicing/down_payment.rst:22
+msgid "You will then see the invoice for the down payment."
+msgstr "Після цього ви побачите рахунок-фактуру для передоплати."
 
-#: ../../sales/invoicing/services/milestones.rst:21
-msgid "Milestone 2 : Brand Identity - 10 000 euros"
-msgstr "Крок 2: ідентифікація бренду - 10 000 євро"
-
-#: ../../sales/invoicing/services/milestones.rst:23
-msgid "Milestone 3 : Campaign launch & PR - 8 500 euros"
-msgstr "Крок 3: запуск кампанії та PR - 8 500 євро"
-
-#: ../../sales/invoicing/services/milestones.rst:25
+#: ../../sales/invoicing/down_payment.rst:27
 msgid ""
-"In this case, an invoice will be sent to the customer each time a milestone "
-"will be successfully reached. That invoicing method is comfortable both for "
-"the company which is ensured to get a steady cash flow throughout the "
-"project lifetime and for the client who can monitor the project's progress "
-"and pay in several times."
+"On the subsequent or final invoice, any prepayment made will be "
+"automatically deducted."
 msgstr ""
-"У такому випадку рахунок-фактура буде відправлятися клієнту кожного разу, "
-"коли буде успішно досягнутий етап. Цей метод виставлення рахунків є зручним "
-"як для компанії, яка забезпечує стійкий грошовий потік протягом усього "
-"терміну дії проекту, так і для клієнта, який може контролювати прогрес "
-"проекту та платити у кілька етапів."
+"На наступному або останньому рахунку-фактурі будь-яка передоплата буде "
+"автоматично відрахована."
 
-#: ../../sales/invoicing/services/milestones.rst:32
+#: ../../sales/invoicing/down_payment.rst:34
+msgid "Modify the income account and customer taxes"
+msgstr "Змініть рахунок доходу та податки клієнта"
+
+#: ../../sales/invoicing/down_payment.rst:36
+msgid "From the products list, search for *Down Payment*."
+msgstr "З переліку товарів знайдіть *Передоплату*."
+
+#: ../../sales/invoicing/down_payment.rst:41
 msgid ""
-"You can also use milestones to invoice percentages of the entire project. "
-"For example, for a million euros project, your company might require a 15% "
-"upfront payment, 30% at the midpoint and the balance at the contract "
-"conclusion. In that case, each payment will be considered as one milestone."
+"You can then edit it, under the invoicing tab you will be able to change the"
+" income account & customer taxes."
 msgstr ""
-"Ви також можете використовувати етапи для відсотків рахунку всього проекту. "
-"Наприклад, для проекту на мільйон євро ваша компанія може вимагати 15% -вий "
-"авансовий платіж, 30% на середньому етапі та залишок на момент укладення "
-"договору. У цьому випадку кожен платіж розглядатиметься як один етап."
+"Після цього ви зможете змінити це, на вкладці виставлення рахунків ви "
+"зможете змінити рахунок доходу та податки клієнта."
 
-#: ../../sales/invoicing/services/milestones.rst:39
-#: ../../sales/invoicing/services/reinvoice.rst:26
-#: ../../sales/invoicing/services/reinvoice.rst:95
-#: ../../sales/invoicing/services/support.rst:17
-#: ../../sales/send_quotations/quote_template.rst:10
-msgid "Configuration"
-msgstr "Налаштування"
+#: ../../sales/invoicing/expense.rst:3
+msgid "Re-invoice expenses to customers"
+msgstr "Включення витрат у рахунки клієнтів"
 
-#: ../../sales/invoicing/services/milestones.rst:42
-msgid "Install the Sales application"
-msgstr "Встановіть додаток Продажі"
-
-#: ../../sales/invoicing/services/milestones.rst:44
-#: ../../sales/invoicing/services/reinvoice.rst:28
-msgid ""
-"In order to sell services and to send invoices, you need to install the "
-"**Sales** application, from the **Apps** icon."
-msgstr ""
-"Для того, щоб продавати послуги та надсилати рахунки-фактури, потрібно "
-"встановити додаток **Продажі**, натиснувши значок **Додатки**."
-
-#: ../../sales/invoicing/services/milestones.rst:51
-msgid "Create products"
-msgstr "Створіть товари"
-
-#: ../../sales/invoicing/services/milestones.rst:53
-msgid ""
-"In Odoo, each milestone of your project is considered as a product. From the"
-" **Sales** application, use the menu :menuselection:`Sales --> Products`, "
-"create a new product with the following setup:"
-msgstr ""
-"В Odoo кожен етап вашого проекту розглядається як товар. У додатку Продажі "
-"скористайтеся меню :menuselection:`продажі --> Товари`, створіть новий товар"
-" із наступним налаштуванням:"
-
-#: ../../sales/invoicing/services/milestones.rst:57
-msgid "**Name**: Strategy audit"
-msgstr "**Назва**: Стратегічний аудит"
-
-#: ../../sales/invoicing/services/milestones.rst:59
-#: ../../sales/invoicing/services/support.rst:50
-msgid "**Product Type**: Service"
-msgstr "**Тип товару**: Послуга"
-
-#: ../../sales/invoicing/services/milestones.rst:61
-msgid ""
-"**Invoicing Policy**: Delivered Quantities, since you will invoice your "
-"milestone after it has been delivered"
-msgstr ""
-"**Політика щодо виставлення рахунків**: доставлена кількість, оскільки ви "
-"будете виставляти рахунки за основний етап проекту"
-
-#: ../../sales/invoicing/services/milestones.rst:64
-msgid ""
-"**Track Service**: Manually set quantities on order, as you complete each "
-"milestone, you will manually update their quantity from the **Delivered** "
-"tab on your sale order"
-msgstr ""
-"**Служба відстеження**: вручну встановлюйте кількість замовлення, після "
-"завершення кожного етапу ви будете вручну оновлювати їх кількість з вкладки "
-"**Доставлено** у своєму замовленні на продаж"
-
-#: ../../sales/invoicing/services/milestones.rst:72
-msgid "Apply the same configuration for the others milestones."
-msgstr "Застосовуйте те саме налаштування для інших основних етапів. "
-
-#: ../../sales/invoicing/services/milestones.rst:75
-msgid "Managing your project"
-msgstr "Управління проектом"
-
-#: ../../sales/invoicing/services/milestones.rst:78
-msgid "Quotations and sale orders"
-msgstr "Комерційні пропозиції та замовлення на продаж"
-
-#: ../../sales/invoicing/services/milestones.rst:80
-msgid ""
-"Now that your milestones (or products) are created, you can create a "
-"quotation or a sale order with each line corresponding to one milestone. For"
-" each line, set the **Ordered Quantity** to ``1`` as each milestone is "
-"completed once. Once the quotation is confirmed and transformed into a sale "
-"order, you will be able to change the delivered quantities when the "
-"corresponding milestone has been achieved."
-msgstr ""
-"Тепер, коли ваші етапи (або продукти) створені, ви можете створити "
-"комерційну пропозицію або замовлення на продаж з кожного рядка, який "
-"відповідає одному етапу. Для кожного рядка встановіть **Замовлену "
-"кількість** до ``1``, оскільки кожен етап завершується один раз. Після того,"
-" як комерційна пропозиція буде підтверджена та перетворена в замовлення на "
-"продаж, ви зможете змінити поставлені кількості після досягнення "
-"відповідного етапу."
-
-#: ../../sales/invoicing/services/milestones.rst:91
-msgid "Invoice milestones"
-msgstr "Етапи рахунку-фактури"
-
-#: ../../sales/invoicing/services/milestones.rst:93
-msgid ""
-"Let's assume that your first milestone (the strategy audit) has been "
-"successfully delivered and you want to invoice it to your customer. On the "
-"sale order, click on **Edit** and set the **Delivered Quantity** of the "
-"related product to ``1``."
-msgstr ""
-"Давайте припустимо, що ваш перший етап (стратегічний аудит) був успішно "
-"доставлений, і ви хочете надіслати рахунок своєму клієнтові. У замовленні на"
-" продаж натисніть **Редагувати** та встановіть **Кількість доставки** "
-"відповідного товару на ``1``."
-
-#: ../../sales/invoicing/services/milestones.rst:99
-msgid ""
-"As soon as the above modification has been saved, you will notice that the "
-"color of the line has changed to blue, meaning that the service can now be "
-"invoiced. In the same time, the invoice status of the SO has changed from "
-"**Nothing To Invoice** to **To Invoice**"
-msgstr ""
-"Як тільки зазначена вище зміна буде збережена, ви помітите, що колір рядка "
-"змінився на синій, це означає, що для послуги тепер можна виставити рахунок-"
-"фактуру. У той же час статус рахунка-фактури SO змінився з **Нічого в "
-"рахунку-фактурі** на **Рахунок-фактуру**"
-
-#: ../../sales/invoicing/services/milestones.rst:104
-msgid ""
-"Click on **Create invoice** and, in the new window that pops up, select "
-"**Invoiceable lines** and validate. It will create a new invoice (in draft "
-"status) with only the **strategy audit** product as invoiceable."
-msgstr ""
-"Натисніть **Створити рахунок-фактуру**, а в новому вікні, що з'явиться, "
-"виберіть **Лише рахунки-фактури** та перевірте. Він створить новий рахунок-"
-"фактуру (у статусі чернетки), причому на рахунок буде виставлений лише товар"
-" **стратегічного аудиту**."
-
-#: ../../sales/invoicing/services/milestones.rst:112
-msgid ""
-"In order to be able to invoice a product, you need to set up the "
-"**Accounting** application and to configure an accounting journal and a "
-"chart of account. Click on the following link to learn more: "
-":doc:`../../../accounting/overview/getting_started/setup`"
-msgstr ""
-"Щоб мати змогу виставляти рахунки за товар, потрібно налаштувати програму "
-"**бухгалтерського обліку** та налаштувати бухгалтерський журнал та план "
-"рахунку. Натисніть на посилання, щоб дізнатися більше: "
-":doc:`../../../accounting/overview/getting_started/setup`"
-
-#: ../../sales/invoicing/services/milestones.rst:117
-msgid ""
-"Back on your sale order, you will notice that the **Invoiced** column of "
-"your order line has been updated accordingly and that the **Invoice Status**"
-" is back to **Nothing to Invoice**."
-msgstr ""
-"Повернувшись до замовлення на продаж, ви помітите, що стовпець **Рахунок-"
-"фактура** у рядку замовлення оновлено відповідно, і **статус рахунка-"
-"фактури** повертається до **Нічого в рахунку-фактурі**."
-
-#: ../../sales/invoicing/services/milestones.rst:121
-msgid "Follow the same workflow to invoice your remaining milestones."
-msgstr ""
-"Виконуйте один і той самий робочий процес, щоб виставляти рахунки за останні"
-" етапи."
-
-#: ../../sales/invoicing/services/milestones.rst:124
-msgid ":doc:`reinvoice`"
-msgstr ":doc:`reinvoice`"
-
-#: ../../sales/invoicing/services/milestones.rst:125
-#: ../../sales/invoicing/services/reinvoice.rst:185
-msgid ":doc:`support`"
-msgstr ":doc:`support`"
-
-#: ../../sales/invoicing/services/reinvoice.rst:3
-msgid "How to re-invoice expenses to your customers?"
-msgstr "Як виставити рахунок-фактуру клієнту за додаткові витрати?"
-
-#: ../../sales/invoicing/services/reinvoice.rst:5
+#: ../../sales/invoicing/expense.rst:5
 msgid ""
 "It often happens that your employees have to spend their personal money "
 "while working on a project for your client. Let's take the example of an "
-"employee paying a parking spot for a meeting with your client. As a company,"
+"consultant paying an hotel to work on the site of your client. As a company,"
 " you would like to be able to invoice that expense to your client."
 msgstr ""
 "Часто буває, що ваші співробітники повинні витрачати особисті гроші під час "
-"роботи над проектом для вашого клієнта. Давайте розглянемо приклад того, як "
-"працівник платить за паркування для зустрічі з вашим клієнтом. Будучи "
-"компанією, ви хотіли б, аби ваш клієнт виплачував такі витрати."
+"роботи над проектом для вашого клієнта. Давайте приведемо прикладу "
+"консультанта, який оплачує готель для роботи з вашим клієнтом. Будучи "
+"компанією, ви хотіли б мати таку суму у рахунку для свого клієнта."
 
-#: ../../sales/invoicing/services/reinvoice.rst:11
+#: ../../sales/invoicing/expense.rst:12
+#: ../../sales/invoicing/time_materials.rst:64
+msgid "Expenses configuration"
+msgstr "Налаштування витрат"
+
+#: ../../sales/invoicing/expense.rst:14
+#: ../../sales/invoicing/time_materials.rst:66
 msgid ""
-"In this documentation we will see two use cases. The first, very basic, "
-"consists of invoicing a simple expense to your client like you would do for "
-"a product. The second, more advanced, will consist of invoicing expenses "
-"entered in your expense system by your employees directly to your customer."
+"To track & invoice expenses, you will need the expenses app. Go to "
+":menuselection:`Apps --> Expenses` to install it."
 msgstr ""
-"У цій документації ми побачимо два випадки подібного використання. Перший, "
-"дуже простий, складається з виставлення рахунків за прості витрати для "
-"вашого клієнта, такі як за товар. Другий, більш складний, складатиметься із "
-"виставлення рахунків на витрати, внесених у систему витрат безпосередньо "
-"вашими працівниками."
+"Для відстеження витрат та виставлення по ним рахунків-фактур вам знадобиться"
+" додаток витрат. Перейдіть до :menuselection:`Додатків --> Витрати`, щоби "
+"встановити його."
 
-#: ../../sales/invoicing/services/reinvoice.rst:18
-msgid "Use case 1: Simple expense invoicing"
-msgstr "Використання 1 способу: Просте виставлення рахунків"
-
-#: ../../sales/invoicing/services/reinvoice.rst:20
+#: ../../sales/invoicing/expense.rst:17
+#: ../../sales/invoicing/time_materials.rst:69
 msgid ""
-"Let's take the following example. You are working on a promotion campaign "
-"for one of your customers (``Agrolait``) and you have to print a lot of "
-"copies. Those copies are an expense for your company and you would like to "
-"invoice them."
+"You should also activate the analytic accounts feature to link expenses to "
+"the sales order, to do so, go to :menuselection:`Invoicing --> Configuration"
+" --> Settings` and activate *Analytic Accounting*."
 msgstr ""
-"Давайте розглянемо наступний приклад. Ви працюєте над рекламною кампанією "
-"для одного з ваших клієнтів (``Agrolait``), і вам потрібно надрукувати "
-"багато копій. Ці копії є витратами для вашої компанії, і ви хотіли б "
-"нарахувати ці витрати вашому клієнту."
+"Ви також повинні активізувати функцію аналітичних рахунків, щоби пов'язати "
+"витрати із замовленням на продаж. Аби це зробити, перейдіть до розділу "
+":menuselection:`Виставлення рахунків --> Налаштування --> Налаштування` та "
+"активувати *Аналітичний облік*."
 
-#: ../../sales/invoicing/services/reinvoice.rst:35
-msgid "Create product to be expensed"
-msgstr "Створіть товар, який буде витрачено"
+#: ../../sales/invoicing/expense.rst:22
+#: ../../sales/invoicing/time_materials.rst:74
+msgid "Add expenses to your sales order"
+msgstr "Додайте витрати до замовлення на продаж"
 
-#: ../../sales/invoicing/services/reinvoice.rst:37
-msgid "You will need now to create a product called ``Copies``."
-msgstr "Тепер вам потрібно буде створити товар під назвою ``Копії``."
-
-#: ../../sales/invoicing/services/reinvoice.rst:39
-#: ../../sales/invoicing/services/reinvoice.rst:112
+#: ../../sales/invoicing/expense.rst:24
+#: ../../sales/invoicing/time_materials.rst:76
 msgid ""
-"From your **Sales** module, go to :menuselection:`Sales --> Products` and "
-"create a product as follows:"
+"From the expense app, you or your consultant can create a new one, e.g. the "
+"hotel for the first week on the site of your customer."
 msgstr ""
-"З вашого модуля **Продажі**, перейдіть до :menuselection:`Продажі --> "
-"Товари` та створіть товар наступним чином:"
+"З додатка витрат ви або ваш консультант можете створити нові витрати, "
+"наприклад, готель на перший тиждень роботи з вашим клієнтом."
 
-#: ../../sales/invoicing/services/reinvoice.rst:42
-msgid "**Product type**: consumable"
-msgstr "**Тип товару**: витратний"
-
-#: ../../sales/invoicing/services/reinvoice.rst:44
+#: ../../sales/invoicing/expense.rst:27
+#: ../../sales/invoicing/time_materials.rst:79
 msgid ""
-"**Invoicing policy**: on delivered quantities (you will manually set the "
-"quantities to invoice on the sale order)"
+"You can then enter a relevant description and select an existing product or "
+"create a new one from right there."
 msgstr ""
-"**Політика щодо виставлення рахунків**: на поставлених величинах (ви вручну "
-"встановлюєте кількість в рахунку-фактурі в порядку продажу)."
+"Потім ви можете ввести відповідний опис і вибрати існуючий товар або "
+"створити новий прямо там."
 
-#: ../../sales/invoicing/services/reinvoice.rst:51
-msgid "Create a sale order"
-msgstr "Створіть замовлення на продаж"
+#: ../../sales/invoicing/expense.rst:33
+#: ../../sales/invoicing/time_materials.rst:85
+msgid "Here, we are creating a *Hotel* product:"
+msgstr "Тут ми створюємо товар *Готель*:"
 
-#: ../../sales/invoicing/services/reinvoice.rst:53
+#: ../../sales/invoicing/expense.rst:38
 msgid ""
-"Now that your product is correctly set up, you can create a sale order for "
-"that product (from the menu :menuselection:`Sales --> Sales Orders`) with "
-"the ordered quantities set to 0. Click on **Confirm the Sale** to create the"
-" sale order. You will be able then to manually change the delivered "
-"quantities on the sale order to reinvoice the copies to your customer."
+"Under the invoicing tab, select *Delivered quantities* and either *At cost* "
+"or *Sales price* as well depending if you want to invoice the cost of your "
+"expense or a previously agreed on sales price."
 msgstr ""
-"Тепер, коли ваш товар правильно налаштовано, ви можете створити замовлення "
-"на продаж для цього товару (з меню :menuselection:`Продажі --> Замовлення на"
-" продаж`) із замовленими значеннями, встановленими на 0. Натисніть "
-"**Підтвердити продаж**, щоб створити замовлення на продаж. Після цього ви "
-"зможете вручну змінити поставлене значення в порядку продажу, щоб повторно "
-"висилати копії своїм клієнтам."
+"Під вкладкою виставлення рахунків виберіть *Доставлені кількості* або *За "
+"вартістю* або *Ціна продажу*, якщо ви хочете нарахувати вартість своїх "
+"витрат або раніше узгоджену ціну продажу."
 
-#: ../../sales/invoicing/services/reinvoice.rst:64
-#: ../../sales/invoicing/services/reinvoice.rst:177
-msgid "Invoice expense to your client"
-msgstr "Рахунок-фактура для вашого клієнта"
-
-#: ../../sales/invoicing/services/reinvoice.rst:66
+#: ../../sales/invoicing/expense.rst:45
+#: ../../sales/invoicing/time_materials.rst:97
 msgid ""
-"At the end of the month, you have printed ``1000`` copies on behalf of your "
-"client and you want to re-invoice them. From the related sale order, click "
-"on **Delivered Quantities**, manually enter the correct amount of copies and"
-" click on **Save**. Your order line will turn blue, meaning that it is ready"
-" to be invoiced. Click on **Create invoice**."
+"To modify or create more products go to :menuselection:`Expenses --> "
+"Configuration --> Expense products`."
 msgstr ""
-"Наприкінці місяця ви надрукували ``1000`` копій від імені свого клієнта, і "
-"ви хочете перерахувати їх за рахунком. З відповідного замовлення продажу, "
-"натисніть на **Доставлена кількість**, вручну введіть правильну кількість "
-"копій та натисніть **Зберегти**. Лінія вашого замовлення стане синьою, це "
-"означає, що він готовий до виставлення рахунку. Натисніть **Створити "
-"рахунок-фактуру**."
+"Щоби змінити або створити більше товарів, перейдіть на сторінку "
+":menuselection:`Витрати --> Налаштування --> Витратні товари`."
 
-#: ../../sales/invoicing/services/reinvoice.rst:73
+#: ../../sales/invoicing/expense.rst:48
+#: ../../sales/invoicing/time_materials.rst:100
 msgid ""
-"The total amount on your sale order will be of 0 as it is computed on the "
-"ordered quantities. It is your invoice which will compute the correct amount"
-" due by your customer."
+"Back on the expense, add the original sale order in the expense to submit."
 msgstr ""
-"Загальна сума замовлення на продаж складатиме 0, оскільки вона обчислюється "
-"за замовленими величинами. Це ваш рахунок-фактура, який обчислює правильну "
-"суму, яку має сплатити ваш клієнт. "
+"Поверніться на витрати, додайте оригінальне замовлення на продаж у витратах "
+"для відправлення."
 
-#: ../../sales/invoicing/services/reinvoice.rst:77
+#: ../../sales/invoicing/expense.rst:54
+#: ../../sales/invoicing/time_materials.rst:106
+msgid "It can then be submitted to the manager, approved and finally posted."
+msgstr ""
+"Потім він може бути переданий менеджеру, його можна затвердити та остаточно "
+"розмістити."
+
+#: ../../sales/invoicing/expense.rst:65
+#: ../../sales/invoicing/time_materials.rst:117
+msgid "It will then be in the sales order and ready to be invoiced."
+msgstr "Він буде у замовленні на продаж і готовий до виставлення рахунку."
+
+#: ../../sales/invoicing/invoicing_policy.rst:3
+msgid "Invoice based on delivered or ordered quantities"
+msgstr "Виставлення рахунку на основі замовленої або доставленої кількості"
+
+#: ../../sales/invoicing/invoicing_policy.rst:5
 msgid ""
-"The invoice generated is in draft, so you can always control the quantities "
-"and change the amount if needed. You will notice that the amount to be "
-"invoiced is based here on the delivered quantities."
+"Depending on your business and what you sell, you have two options for "
+"invoicing:"
 msgstr ""
-"Сформований рахунок-фактура знаходиться в проекті, тому ви завжди можете "
-"контролювати кількість та змінювати суму, якщо це потрібно. Ви помітите, що "
-"сума, що підлягає виставленню рахунку, базується тут на поставлених "
-"кількостях."
+"Залежно від вашого бізнесу та того, що ви продаєте, у вас є два варіанти "
+"виставлення рахунків:"
 
-#: ../../sales/invoicing/services/reinvoice.rst:84
-msgid "Click on validate to issue the payment to your customer."
-msgstr "Натисніть на підтвердження, щоб видати платіж своєму клієнту."
-
-#: ../../sales/invoicing/services/reinvoice.rst:87
-msgid "Use case 2: Invoice expenses via the expense module"
-msgstr "Використання 2 способу: Витрати на рахунки за допомогою модуля витрат"
-
-#: ../../sales/invoicing/services/reinvoice.rst:89
+#: ../../sales/invoicing/invoicing_policy.rst:8
 msgid ""
-"To illustrate this case, let's imagine that your company sells some "
-"consultancy service to your customer ``Agrolait`` and both parties agreed "
-"that the distance covered by your consultant will be re-invoiced at cost."
+"Invoice on ordered quantity: invoice the full order as soon as the sales "
+"order is confirmed."
 msgstr ""
-"Щоб проілюструвати цей випадок, давайте уявимо, що ваша компанія продає "
-"консультаційні послуги вашому клієнту ``Agrolait``, і обидві сторони "
-"погоджуються, що відстань, на яку витрачається ваш консультант, буде "
-"сплачена у виставленому рахунку."
+"Рахунок на замовлену кількість: рахунок-фактура повного замовлення, як "
+"тільки буде підтверджено замовлення на продаж."
 
-#: ../../sales/invoicing/services/reinvoice.rst:97
-msgid "Here, you will need to install two more modules:"
-msgstr "Тут вам потрібно буде встановити ще два модулі:"
-
-#: ../../sales/invoicing/services/reinvoice.rst:99
-msgid "Expense Tracker"
-msgstr "Відслідковування витрат"
-
-#: ../../sales/invoicing/services/reinvoice.rst:101
+#: ../../sales/invoicing/invoicing_policy.rst:10
 msgid ""
-"Accounting, where you will need to activate the analytic accounting from the"
-" settings"
+"Invoice on delivered quantity: invoice on what you delivered even if it's a "
+"partial delivery."
 msgstr ""
-"Облік, де вам потрібно буде активувати аналітичний облік із налаштувань"
+"Рахунок-фактура на доставлену кількість: рахунок-фактура на те, що ви "
+"доставили, навіть якщо це часткова доставка."
 
-#: ../../sales/invoicing/services/reinvoice.rst:108
-msgid "Create a product to be expensed"
-msgstr "Створіть товар, який буде витрачено"
+#: ../../sales/invoicing/invoicing_policy.rst:13
+msgid "Invoice on ordered quantity is the default mode."
+msgstr "Рахунок-фактура на замовлену кількість є режимом за замовчуванням."
 
-#: ../../sales/invoicing/services/reinvoice.rst:110
-msgid "You will now need to create a product called ``Kilometers``."
-msgstr "Тепер вам потрібно створити товар під назвою ``Кілометри``."
-
-#: ../../sales/invoicing/services/reinvoice.rst:115
-msgid "Product can be expensed"
-msgstr "Товар може бути витрачений"
-
-#: ../../sales/invoicing/services/reinvoice.rst:117
-msgid "Product type: Service"
-msgstr "Тип товару: Послуга"
-
-#: ../../sales/invoicing/services/reinvoice.rst:119
-msgid "Invoicing policy: invoice based on time and material"
-msgstr ""
-"Політика щодо виставлення рахунків: рахунок-фактура на основі часу та "
-"матеріалів"
-
-#: ../../sales/invoicing/services/reinvoice.rst:121
-msgid "Expense invoicing policy: At cost"
-msgstr "Політика виставлення рахунків: За вартістю"
-
-#: ../../sales/invoicing/services/reinvoice.rst:123
-msgid "Track service: manually set quantities on order"
-msgstr "Служба відстеження: вручну встановлюйте кількість за замовленням"
-
-#: ../../sales/invoicing/services/reinvoice.rst:129
-msgid "Create a sales order"
-msgstr "Створіть замовлення на продаж"
-
-#: ../../sales/invoicing/services/reinvoice.rst:131
+#: ../../sales/invoicing/invoicing_policy.rst:15
 msgid ""
-"Still from the Sales module, go to :menuselection:`Sales --> Sales Orders` "
-"and add your product **Consultancy** on the order line."
+"The benefits of using *Invoice on delivered quantity* depends on your type "
+"of business, when you sell material, liquids or food in large quantities the"
+" quantity might diverge a little bit and it is therefore better to invoice "
+"the actual delivered quantity."
 msgstr ""
-"З модуля продаж, перейдіть до :menuselection:`Продажі --> Замовлення на "
-"продаж` і додайте свій товар **Консультування** на рядок замовлення."
+"Переваги використання *рахунку-фактури на доставлену кількість* залежать від"
+" вашого виду бізнесу, коли ви продаєте матеріал, рідину або їжу у великій "
+"кількості, кількість може дещо зменшитись, і тому краще нараховувати "
+"фактичну доставлену кількість."
 
-#: ../../sales/invoicing/services/reinvoice.rst:135
+#: ../../sales/invoicing/invoicing_policy.rst:21
 msgid ""
-"If your product doesn't exist yet, you can configure it on the fly from the "
-"SO. Just type the name on the **product** field and click on **Create and "
-"edit** to configure it."
+"You also have the ability to invoice manually, letting you control every "
+"options: invoice ready to invoice lines, invoice a percentage (advance), "
+"invoice a fixed advance."
 msgstr ""
-"Якщо ваш товар ще не існує, ви можете налаштувати його на льоту з SO. Просто"
-" введіть назву в полі **товару** та натисніть **Створити та редагувати**, "
-"щоб налаштувати його. "
+"Ви також маєте можливість виставляти рахунки вручну, дозволяючи контролювати"
+" кожен параметр: готові до виставлення рядки рахунків-фактур, виставлення "
+"рахунку-фактури на відсоток (заздалегідь), рахунок-фактура з фіксованою "
+"передоплатою."
 
-#: ../../sales/invoicing/services/reinvoice.rst:139
+#: ../../sales/invoicing/invoicing_policy.rst:26
+msgid "Decide the policy on a product page"
+msgstr "Визначіть політику на сторінці товару"
+
+#: ../../sales/invoicing/invoicing_policy.rst:28
 msgid ""
-"Depending on your product configuration, an **Analytic Account** may have "
-"been generated automatically. If not, you can easily create one in order to "
-"link your expenses to the sale order. Do not forget to confirm the sale "
-"order."
+"From any products page, under the invoicing tab you will find the invoicing "
+"policy and select the one you want."
 msgstr ""
-"Залежно від налаштування вашого товару **аналітичний рахунок** може бути "
-"створено автоматично. Якщо ні, ви можете легко створити його, щоб пов'язати "
-"свої витрати з замовленням на продаж. Не забудьте підтвердити замовлення на "
-"продаж."
+"На сторінці будь-якої продукції під вкладкою виставлення рахунків знайдіть "
+"політику виставлення рахунків та виберіть потрібну."
 
-#: ../../sales/invoicing/services/reinvoice.rst:148
+#: ../../sales/invoicing/invoicing_policy.rst:35
+msgid "Send the invoice"
+msgstr "Надішліть рахунок-фактуру"
+
+#: ../../sales/invoicing/invoicing_policy.rst:37
 msgid ""
-"Refer to the documentation :doc:`../../../accounting/others/analytic/usage` "
-"to learn more about that concept."
+"Once you confirm the sale, you can see your delivered and invoiced "
+"quantities."
 msgstr ""
-"Зверніться до документації :doc:`../../../accounting/others/analytic/usage`,"
-" щоб дізнатись більше про цю концепцію."
+"Після того, як ви підтвердите продаж, ви зможете побачити ваші доставлені та"
+" виставлені кількості."
 
-#: ../../sales/invoicing/services/reinvoice.rst:152
-msgid "Create expense and link it to SO"
-msgstr "Створіть витрати та пов'яжіть їх з SO"
-
-#: ../../sales/invoicing/services/reinvoice.rst:154
+#: ../../sales/invoicing/invoicing_policy.rst:43
 msgid ""
-"Let's assume that your consultant covered ``1.000km`` in October as part of "
-"his consultancy project. We will create a expense for it and link it to the "
-"related sales order thanks to the analytic account."
+"If you set it in ordered quantities, you can invoice as soon as the sale is "
+"confirmed. If however you selected delivered quantities, you will first have"
+" to validate the delivery."
 msgstr ""
-"Давайте припустимо, що ваш консультант покрив ``1.000км`` у жовтні в рамках "
-"свого проекту консультацій. Ми створимо для нього витрати та зв'яжемо їх з "
-"відповідним замовленням на продаж за допомогою аналітичного облікового "
-"запису."
+"Якщо ви встановите це в замовлених кількостях, ви зможете виставляти "
+"рахунок, як тільки продаж буде підтверджено. Якщо ж ви обрали доставлені "
+"кількості, вам спочатку доведеться підтвердити доставку."
 
-#: ../../sales/invoicing/services/reinvoice.rst:158
+#: ../../sales/invoicing/invoicing_policy.rst:47
 msgid ""
-"Go to the **Expenses** module and click on **Create**. Record your expense "
-"as follows:"
+"Once the products are delivered, you can invoice your customer. Odoo will "
+"automatically add the quantities to invoiced based on how many you delivered"
+" if you did a partial delivery."
 msgstr ""
-"Перейдіть до модуля **Витрати** та натисніть **Створити**. Запишіть свої "
-"витрати таким чином:"
+"Після того, як товари будуть доставлені, ви можете виставляти рахунки вашому"
+" клієнту. Odoo буде автоматично додавати кількості до рахунку-фактури на "
+"основі того, скільки ви доставили, якщо ви здійснили часткову доставку."
 
-#: ../../sales/invoicing/services/reinvoice.rst:161
-msgid "**Expense description**: Kilometers October 2015"
-msgstr "**Опис витрат**: кілометри за жовтень 2015 року"
+#: ../../sales/invoicing/milestone.rst:3
+msgid "Invoice project milestones"
+msgstr "Виставлення рахунків за етапами проекту"
 
-#: ../../sales/invoicing/services/reinvoice.rst:163
-msgid "**Product**: Kilometers"
-msgstr "**Товар**: Кілометри"
-
-#: ../../sales/invoicing/services/reinvoice.rst:165
-msgid "**Quantity**: 1.000"
-msgstr "**Кількість**: 1.000"
-
-#: ../../sales/invoicing/services/reinvoice.rst:167
-msgid "**Analytic account**: SO0019 - Agrolait"
-msgstr "**Аналітичний рахунок**: SO0019 - Агролайт"
-
-#: ../../sales/invoicing/services/reinvoice.rst:172
+#: ../../sales/invoicing/milestone.rst:5
 msgid ""
-"Click on **Submit to manager**. As soon as the expense has been validated "
-"and posted to the journal entries, a new line corresponding to the expense "
-"will automatically be generated on the sale order."
+"Milestone invoicing can be used for expensive or large-scale projects, with "
+"each milestone representing a clear sequence of work that will incrementally"
+" build up to the completion of the contract. This invoicing method is "
+"comfortable both for the company which is ensured to get a steady cash flow "
+"throughout the project lifetime and for the client who can monitor the "
+"project's progress and pay in several installments."
 msgstr ""
-"Натисніть **Надіслати менеджеру**. Щойно ці витрати будуть перевірені та "
-"розміщені в журнальних записах, в порядку продажу буде автоматично "
-"генеруватися новий рядок, що відповідає витратам."
+"Виставлення рахунків за етапами може використовуватися для дорогих або "
+"масштабних проектів, при цьому кожен етап представляє собою чітку "
+"послідовність робіт, яка поступово зростатиме до завершення контракту. Цей "
+"метод виставлення рахунків є зручним як для компанії, яка забезпечує "
+"постійний грошовий потік упродовж усього терміну дії проекту, так і для "
+"клієнта, який може контролювати досягнення проекту та сплачувати його в "
+"декілька разів."
 
-#: ../../sales/invoicing/services/reinvoice.rst:179
-msgid "You can now invoice the invoiceable lines to your customer."
-msgstr "Тепер ви можете нарахувати рахунки-фактури для вашого клієнта."
+#: ../../sales/invoicing/milestone.rst:13
+msgid "Create milestone products"
+msgstr "Створіть поетапні товари"
 
-#: ../../sales/invoicing/services/reinvoice.rst:186
-msgid ":doc:`milestones`"
-msgstr ":doc:`milestones`"
-
-#: ../../sales/invoicing/services/support.rst:3
-msgid "How to invoice a support contract (prepaid hours)?"
-msgstr "Як виставити рахунок на контрактну підтримки (передплачені години)?"
-
-#: ../../sales/invoicing/services/support.rst:5
+#: ../../sales/invoicing/milestone.rst:15
 msgid ""
-"There are different kinds of service sales: prepaid volume of hours/days "
-"(e.g. support contract), billing based on time and material (e.g. billing "
-"consulting hours) and a fixed price contract (e.g. a project)."
+"In Odoo, each milestone of your project is considered as a product. To "
+"configure products to work this way, go to any product form."
 msgstr ""
-"Існують різні види послуг продажу: попередньо оплачений обсяг годин/днів "
-"(наприклад, контракт підтримки), виставлення рахунків у залежності від часу "
-"та матеріалу (наприклад, час консультації з рахунками) та договір про "
-"фіксовану ціну (наприклад, проект)."
+"В Odoo кожен етап вашого проекту розглядається як товар. Щоби налаштувати "
+"товари таким чином, перейдіть до будь-якої форми товару."
 
-#: ../../sales/invoicing/services/support.rst:9
+#: ../../sales/invoicing/milestone.rst:18
 msgid ""
-"In this section, we will have a look at how to sell and keep track of a pre-"
-"paid support contract."
+"You have to set the product type as *Service* under general information and "
+"select *Milestones* in the sales tab."
 msgstr ""
-"У цьому розділі ми подивимося, як продати та відстежувати договір за "
-"попередньо оплачену підтримку."
+"Ви повинні встановити тип товару як *Послуга* за загальною інформацією та "
+"вибрати *Основні етапи* на вкладці продажу."
 
-#: ../../sales/invoicing/services/support.rst:12
+#: ../../sales/invoicing/milestone.rst:25
+msgid "Invoice milestones"
+msgstr "Виставлення рахунку-фактури за етапами"
+
+#: ../../sales/invoicing/milestone.rst:27
 msgid ""
-"As an example, you may sell a pack of ``50 Hours`` of support at "
-"``$25,000``. The price is fixed and charged initially. But you want to keep "
-"track of the support service you did for the customer."
+"From the sales order, you can manually edit the quantity delivered as you "
+"complete a milestone."
 msgstr ""
-"Наприклад, ви можете продати ``50-годинну`` підтримку в розмірі ``$25 000``."
-" Ціна фіксується та сплачується спочатку. Але ви хочете стежити за "
-"підтримкою, яку ви зробили для клієнта."
+"Із замовлення на продаж ви можете вручну змінити доставлену кількість після "
+"завершення етапу."
 
-#: ../../sales/invoicing/services/support.rst:20
-msgid "Install the Sales and Timesheet applications"
-msgstr "Встановіть дадатки Продажі та Табель"
+#: ../../sales/invoicing/milestone.rst:33
+msgid "You can then invoice that first milestone."
+msgstr "Ви можете потім виставити рахунок за перший етап."
 
-#: ../../sales/invoicing/services/support.rst:22
+#: ../../sales/invoicing/proforma.rst:3 ../../sales/invoicing/proforma.rst:22
+msgid "Send a pro-forma invoice"
+msgstr "Надсилання проформи рахунку"
+
+#: ../../sales/invoicing/proforma.rst:5
 msgid ""
-"In order to sell services, you need to install the **Sales** application, "
-"from the **Apps** icon. Install also the **Timesheets** application if you "
-"want to track support services you worked on every contract."
+"A pro-forma invoice is an abridged or estimated invoice in advance of a "
+"delivery of goods. It notes the kind and quantity of goods, their value, and"
+" other important information such as weight and transportation charges. Pro-"
+"forma invoices are commonly used as preliminary invoices with a quotation, "
+"or for customs purposes in importation. They differ from a normal invoice in"
+" not being a demand or request for payment."
 msgstr ""
-"Для того, щоб продавати послуги, вам потрібно встановити додаток **Продажі**"
-" з меню **Додатки**. Встановіть також додаток **Табелі**, якщо хочете "
-"відслідковувати службу підтримки, яку ви надавали по кожному контракту."
+"Проформа рахунку - скорочений або орієнтовний рахунок-фактура перед "
+"виставленням рахунку на доставлений товар. Він зазначає вид та кількість "
+"товарів, їх вартість та іншу важливу інформацію, таку як вага та транспортні"
+" витрати. Файли проформи зазвичай використовуються як попередні рахунки-"
+"фактури з комерційною пропозицією, або для митних цілей при імпорті. Вони "
+"відрізняються від звичайного рахунку-фактури, оскільки не є вимогою або "
+"запитом на оплату."
 
-#: ../../sales/invoicing/services/support.rst:33
-msgid "Create Products"
-msgstr "Створіть товари"
+#: ../../sales/invoicing/proforma.rst:13
+#: ../../sales/send_quotations/different_addresses.rst:10
+msgid "Activate the feature"
+msgstr "Активуйте цю функцію"
 
-#: ../../sales/invoicing/services/support.rst:35
+#: ../../sales/invoicing/proforma.rst:15
 msgid ""
-"By default, products are sold by number of units. In order to sell services "
-"``per hour``, you must allow using multiple unit of measures. From the "
-"**Sales** application, go to the menu :menuselection:`Configuration --> "
-"Settings`. From this screen, activate the multiple **Unit of Measures** "
-"option."
+"Go to :menuselection:`SALES --> Configuration --> Settings` and activate the"
+" *Pro-Forma Invoice* feature."
 msgstr ""
-"За замовчуванням товари продаються за кількістю одиниць. Для того, щоби "
-"продавати послуги ``за годину``, потрібно дозволити використання декількох "
-"одиниць вимірювань. У додатку **Продажі** перейдіть до меню "
-":menuselection:`Налаштування --> Налаштування`. З цього екрана активуйте "
-"параметри кількох **одиниць вимірювань**."
+"Перейдіть до :menuselection:`Продажі --> Налаштування --> Налаштування` та "
+"активуйте функцію *Проформа рахунку-фактури*."
 
-#: ../../sales/invoicing/services/support.rst:44
+#: ../../sales/invoicing/proforma.rst:24
 msgid ""
-"In order to sell a support contract, you must create a product for every "
-"support contract you sell. From the **Sales** application, use the menu "
-":menuselection:`Sales --> Products`, create a new product with the following"
-" setup:"
+"From any quotation or sales order, you know have an option to send a pro-"
+"forma invoice."
 msgstr ""
-"Щоб продати контракт на підтримку, ви повинні створити товар для кожного "
-"контракту про підтримку, який ви продаєте. У додатку **Продажі** "
-"скористайтеся меню :menuselection:`Продажі --> Товари`, створіть новий товар"
-" із наступним налаштуванням:"
+"З будь-якої комерційної пропозиції або замовлення на продаж ви маєте "
+"можливість надіслати проформу рахунка-фактури."
 
-#: ../../sales/invoicing/services/support.rst:48
-msgid "**Name**: Technical Support"
-msgstr "**Назва**: Технічна підтримка"
-
-#: ../../sales/invoicing/services/support.rst:52
-msgid "**Unit of Measure**: Hours"
-msgstr "**Одиниця виміру**: години"
-
-#: ../../sales/invoicing/services/support.rst:54
+#: ../../sales/invoicing/proforma.rst:30
 msgid ""
-"**Invoicing Policy**: Ordered Quantities, since the service is prepaid, we "
-"will invoice the service based on what has been ordered, not based on "
-"delivered quantities."
+"When you click on send, Odoo will send an email with the pro-forma invoice "
+"in attachment."
 msgstr ""
-"**Політика щодо виставлення рахунків**: замовлені кількості, оскільки "
-"послуга попередньо сплачена, ми сплачуватимемо рахунок за послуги на "
-"замовлення, а не на основі поставлених величин."
+"Коли ви натисните на Відправити, Odoo надішле електронний лист із проформою "
+"рахунку-фактури у вкладенні."
 
-#: ../../sales/invoicing/services/support.rst:58
+#: ../../sales/invoicing/subscriptions.rst:3
+msgid "Sell subscriptions"
+msgstr "Продаж підписок"
+
+#: ../../sales/invoicing/subscriptions.rst:5
 msgid ""
-"**Track Service**: Timesheet on contracts. An analytic account will "
-"automatically be created for every order containing this service so that you"
-" can track hours in the related account."
+"Selling subscription products will give you predictable revenue, making "
+"planning ahead much easier."
 msgstr ""
-"**Відслідковування служби**: розклад на контрактах. Аналітичний обліковий "
-"запис буде автоматично створено для кожного замовлення, що містить цю "
-"послугу, щоб ви могли відстежувати години у пов'язаному рахунку."
+"Продаж товарів підписки дасть вам прогнозований дохід, що значно полегшить "
+"планування."
 
-#: ../../sales/invoicing/services/support.rst:66
+#: ../../sales/invoicing/subscriptions.rst:9
+msgid "Make a subscription from a sales order"
+msgstr "Зробіть підписку із замовлення на продаж"
+
+#: ../../sales/invoicing/subscriptions.rst:11
 msgid ""
-"There are different ways to track the service related to a sales order or "
-"product sold. With the above configuration, you can only sell one support "
-"contract per order. If your customer orders several service contracts on "
-"timesheet, you will have to split the quotation into several orders."
+"From the sales app, create a quotation to the desired customer, and select "
+"the subscription product your previously created."
 msgstr ""
-"Є різні способи відстеження служби підтримки, пов'язаної і замовленням на "
-"продаж чи товаром, що продається. За допомогою наведеного вище налаштування "
-"можна продати лише один контракт підтримки на замовлення. Якщо ваш клієнт "
-"замовляє декілька сервісних контрактів за розкладом, вам доведеться "
-"розділити ціну на кілька замовлень."
+"У додатку для продажів створіть комерційну пропозицію бажаному клієнту та "
+"виберіть раніше створений товар підписки."
 
-#: ../../sales/invoicing/services/support.rst:72
+#: ../../sales/invoicing/subscriptions.rst:14
 msgid ""
-"Note that you can sell in different unit of measure than hours, example: "
-"days, pack of 40h, etc. To do that, just create a new unit of measure in the"
-" **Unit of Measure** category and set a conversion ratio compared to "
-"**Hours** (example: ``1 day = 8 hours``)."
+"When you confirm the sale the subscription will be created automatically. "
+"You will see a direct link from the sales order to the Subscription in the "
+"upper right corner."
 msgstr ""
-"Зауважте, що ви можете продавати в різних одиницях вимірювання, не тільки "
-"години, наприклад: дні, пакет 40 годин, тощо. Для цього просто створіть нову"
-" одиницю вимірювання в категорії **Одиниця вимірювання** та встановіть "
-"коефіцієнт конверсії у порівнянні з **годинами** (приклад : ``1 день = 8 "
-"годин``)."
+"Підтверджуючи продаж, підписку буде створено автоматично. У верхньому "
+"правому куті ви побачите пряме посилання із замовлення на продаж на "
+"підписку."
 
-#: ../../sales/invoicing/services/support.rst:78
-msgid "Managing support contract"
-msgstr "Управління контрактом на підтримку"
+#: ../../sales/invoicing/time_materials.rst:3
+msgid "Invoice based on time and materials"
+msgstr "Виставлення рахунку на основі часу та матеріалів"
 
-#: ../../sales/invoicing/services/support.rst:81
-msgid "Quotations and Sales Orders"
-msgstr "Комерційні пропозиції та замовлення на продаж"
-
-#: ../../sales/invoicing/services/support.rst:83
+#: ../../sales/invoicing/time_materials.rst:5
 msgid ""
-"Once the product is created, you can create a quotation or a sales order "
-"with the related product. Once the quotation is confirmed and transformed "
-"into a sales order, your users will be able to record services related to "
-"this support contract using the timesheet application."
+"Time and Materials is generally used in projects in which it is not possible"
+" to accurately estimate the size of the project, or when it is expected that"
+" the project requirements would most likely change."
 msgstr ""
-"Після створення продукту можна створити комерційну пропозицію або замовлення"
-" на продаж з відповідним товаром. Коли комерційна пропозиція буде "
-"підтверджена та перетворена у замовлення на продаж, ваші користувачі зможуть"
-" записувати послуги, пов'язані з цим контрактом на підтримку, за допомогою "
-"програми розкладу."
+"Час та матеріали, як правило, використовуються у проектах, в яких неможливо "
+"точно оцінити розмір проекту або коли очікується, що вимоги проекту, швидше "
+"за все, зміняться."
 
-#: ../../sales/invoicing/services/support.rst:93
-msgid "Timesheets"
-msgstr "Табелі"
-
-#: ../../sales/invoicing/services/support.rst:95
+#: ../../sales/invoicing/time_materials.rst:9
 msgid ""
-"To track the service you do on a specific contract, you should use the "
-"timesheet application. An analytic account related to the sale order has "
-"been automatically created (``SO009 - Agrolait`` on the screenshot here "
-"above), so you can start tracking services as soon as it has been sold."
+"This is opposed to a fixed-price contract in which the owner agrees to pay "
+"the contractor a lump sum for the fulfillment of the contract no matter what"
+" the contractors pay their employees, sub-contractors, and suppliers."
 msgstr ""
-"Щоб відстежувати послугу, яку ви виконуєте за конкретним контрактом, слід "
-"використовувати додаток табелі. Автоматично створюється аналітичний рахунок,"
-" пов'язаний із замовленням продажу (``SO009 - Agrolait`` на знімку вікна, "
-"наведеному вище), щоб ви могли почати відстежувати послуги, як тільки вони "
-"будуть продані."
+"Це протистоїть контракту з фіксованою ціною, за яким власник погоджується "
+"виплатити підряднику одноразову суму за виконання контракту незалежно від "
+"того, що контрактори платять своїм працівникам, субпідрядникам та "
+"постачальникам."
 
-#: ../../sales/invoicing/services/support.rst:104
-msgid "Control delivered support on the sales order"
-msgstr "Контроль доставляє підтримку за замовленням на продаж"
-
-#: ../../sales/invoicing/services/support.rst:106
+#: ../../sales/invoicing/time_materials.rst:14
 msgid ""
-"From the **Sales** application, use the menu :menuselection:`Sales --> Sales"
-" Orders`  to control the progress of every order. On the sales order line "
-"related to the support contract, you should see the **Delivered Quantities**"
-" that are updated automatically, based on the number of hours in the "
-"timesheet."
+"For this documentation I will use the example of a consultant, you will need"
+" to invoice their time, their various expenses (transport, lodging, ...) and"
+" purchases."
 msgstr ""
-"У додатку **Продажі** скористайтеся меню :menuselection:`Продажі --> "
-"Замовлення на продаж` для контролю прогресу кожного замовлення. У рядку "
-"замовлення на продаж, пов'язаного з контрактом на підтримку, ви повинні "
-"побачити **Доставлену кількість**, яка оновлюється автоматично, залежно від "
-"кількості годин у розкладі."
+"Для цієї документації я буду використовувати приклад консультанта, вам "
+"потрібно буде врахувати свій час, різні витрати (транспорт, проживання, ...)"
+" та купівлі."
 
-#: ../../sales/invoicing/services/support.rst:116
-msgid "Upselling and renewal"
-msgstr "Допродаж та оновлення"
+#: ../../sales/invoicing/time_materials.rst:19
+msgid "Invoice time configuration"
+msgstr "Налаштування виставлення рахунку-фактури за часом"
 
-#: ../../sales/invoicing/services/support.rst:118
+#: ../../sales/invoicing/time_materials.rst:21
 msgid ""
-"If the number of hours you performed on the support contract is bigger or "
-"equal to the number of hours the customer purchased, you are suggested to "
-"sell an extra contract to the customer since they used all their quota of "
-"service. Periodically (ideally once every two weeks), you should check the "
-"sales order that are in such a case. To do so, go to :menuselection:`Sales "
-"--> Invoicing --> Orders to Upsell`."
+"To keep track of progress in the project, you will need the *Project* app. "
+"Go to :menuselection:`Apps --> Project` to install it."
 msgstr ""
-"Якщо кількість годин, які ви виконували у контракті підтримки, більша або "
-"дорівнює кількості годин, куплених клієнтом, вам пропонується продати "
-"додатковий договір клієнту, оскільки він використовує всю свою квоту послуг."
-" Періодично (в ідеалі раз на два тижні), ви повинні перевірити порядок "
-"продажу у такому випадку. Для цього перейдіть до :menuselection:`Продажі -->"
-" Виставлення рахунку --> Замовлення на збільшення продажів`."
+"Щоби відстежувати прогрес у проекті, вам знадобиться додаток *Проект*. "
+"Перейдіть на :menuselection:`Додатки --> Проект`, щоби встановити його."
 
-#: ../../sales/invoicing/services/support.rst:127
+#: ../../sales/invoicing/time_materials.rst:24
 msgid ""
-"If you use Odoo CRM, a good practice is to create an opportunity for every "
-"sale order in upselling invoice status so that you easily track your "
-"upselling effort."
+"In *Project* you will use timesheets, to do so go to :menuselection:`Project"
+" --> Configuration --> Settings` and activate the *Timesheets* feature."
 msgstr ""
-"Якщо ви користуєтеся CRM системою Odoo, найкращою практикою є створення "
-"нагоду для кожного замовлення на продаж у статусі рахунку-фактури, щоб ви "
-"могли легко відстежувати свої продажі. "
+"У *Проекті* ви будете використовувати табелі, щоби зробити це, перейдіть до "
+":menuselection:`Проекту --> Налаштування --> Налаштування` та активуйте "
+"функцію *Табелі*."
 
-#: ../../sales/invoicing/services/support.rst:131
+#: ../../sales/invoicing/time_materials.rst:32
+msgid "Invoice your time spent"
+msgstr "Виставлення рахунку за витрачений час"
+
+#: ../../sales/invoicing/time_materials.rst:34
 msgid ""
-"If you sell an extra support contract, you can either add a new line on the "
-"existing sales order (thus, you continue to timesheet on the same order) or "
-"create a new order (thus, people will timesheet their hours on the new "
-"contract). To unmark the sales order as **Upselling**, you can set the sales"
-" order as done and it will disappear from your upselling list."
+"From a product page set as a service, you will find two options under the "
+"invoicing tab, select both *Timesheets on tasks* and *Create a task in a new"
+" project*."
 msgstr ""
-"Якщо ви продаєте додатковий контракт на підтримку, ви можете додати новий "
-"рядок до існуючого замовлення клієнта (таким чином, ви продовжуєте "
-"показувати розклад у тому ж порядку) або створювати нове замовлення (таким "
-"чином, люди будуть перераховувати свої години на новий контракт) . Щоб "
-"відмітити замовлення клієнта як **Збільшення продажів**, ви можете "
-"встановити замовлення клієнта як завершене, і він зникне зі списку "
-"завантажень."
+"Зі сторінки товару, де встановлена послуга, ви знайдете дві функції на "
+"вкладці виставлення рахунків, обидва *Табелі на завданнях* та *Створення "
+"завдання у новому проекті*."
 
-#: ../../sales/invoicing/services/support.rst:138
-msgid "Special Configuration"
-msgstr "Спеціальне налаштування"
+#: ../../sales/invoicing/time_materials.rst:41
+msgid "You could also add the task to an existing project."
+msgstr "Ви також можете додати завдання до існуючого проекту."
 
-#: ../../sales/invoicing/services/support.rst:140
+#: ../../sales/invoicing/time_materials.rst:43
 msgid ""
-"When creating the product form, you may set a different approach to track "
-"the service:"
+"Once confirming a sales order, you will now see two new buttons, one for the"
+" project overview and one for the current task."
 msgstr ""
-"Під час створення форми товару ви можете встановити інший підхід для "
-"відстеження послуги:"
+"Після підтвердження замовлення на продаж ви побачите дві нові кнопки, один "
+"для огляду проекту та один для поточного завдання."
 
-#: ../../sales/invoicing/services/support.rst:143
+#: ../../sales/invoicing/time_materials.rst:49
 msgid ""
-"**Create task and track hours**: in this mode, a task is created for every "
-"sales order line. Then when you do the timesheet, you don't record hours on "
-"a sales order/contract, but you record hours on a task (that represents the "
-"contract). The advantage of this solution is that it allows to sell several "
-"service contracts within the same sales order."
+"You will directly be in the task if you click on it, you can also access it "
+"from the *Project* app."
 msgstr ""
-"**Створіть завдання та відстежувати години**: у цьому режимі створюється "
-"завдання для кожного рядка замовлення клієнта. Потім, коли ви робите "
-"розклад, ви не записуєте години замовлення/контракту на продаж, але ви "
-"записуєте години завдання (це являє собою контракт). Перевага цього рішення "
-"полягає в тому, що вона дозволяє продавати кілька сервісних контрактів у "
-"рамках одного замовлення на продаж."
+"Якщо ви натиснете на нього, ви будете безпосередньо перебувати в роботі, ви "
+"також можете отримати доступ до нього з програми *Проект*."
 
-#: ../../sales/invoicing/services/support.rst:150
+#: ../../sales/invoicing/time_materials.rst:52
 msgid ""
-"**Manually**: you can use this mode if you don't record timesheets in Odoo. "
-"The number of hours you worked on a specific contract can be recorded "
-"manually on the sales order line directly, in the delivered quantity field."
+"Under timesheets, you can assign who works on it. You can or they can add "
+"how many hours they worked on the project so far."
 msgstr ""
-"**Вручну**: ви можете скористатися цим режимом, якщо ви не реєструєте "
-"розклади в Odoo. Кількість годин, за якими ви працювали за конкретним "
-"контрактом, можна вручну замовити безпосередньо у рядку замовлення клієнта, "
-"у полі поставленого значення."
+"Під табелями ви можете призначити того, хто працює на проекті. Ви можете або"
+" вони можуть додати, скільки годин вони відпрацювали над проектом."
 
-#: ../../sales/invoicing/services/support.rst:156
-msgid ":doc:`../../../inventory/settings/products/uom`"
-msgstr ":doc:`../../../inventory/settings/products/uom`"
+#: ../../sales/invoicing/time_materials.rst:58
+msgid "From the sales order, you can then invoice those hours."
+msgstr "Із замовлення на продаж можна зарахувати ці години."
+
+#: ../../sales/invoicing/time_materials.rst:90
+msgid ""
+"under the invoicing tab, select *Delivered quantities* and either *At cost* "
+"or *Sales price* as well depending if you want to invoice the cost of your "
+"expense or a previously agreed on sales price."
+msgstr ""
+"під вкладкою виставлення рахунків виберіть *Доставлені кількості* або *За "
+"вартістю* або *Ціна продажу*, якщо ви хочете нарахувати вартість своїх "
+"витрат або раніше узгоджену ціну продажу."
+
+#: ../../sales/invoicing/time_materials.rst:120
+msgid "Invoice purchases"
+msgstr "Виставлення рахунків-фактур на купівлю"
+
+#: ../../sales/invoicing/time_materials.rst:122
+msgid ""
+"The last thing you might need to add to the sale order is purchases made for"
+" it."
+msgstr "Останнє, що потрібно додати до замовлення продаж - це купівлі."
+
+#: ../../sales/invoicing/time_materials.rst:125
+msgid ""
+"You will need the *Purchase Analytics* feature, to activate it, go to "
+":menuselection:`Invoicing --> Configuration --> Settings` and select "
+"*Purchase Analytics*."
+msgstr ""
+"Вам знадобиться функція *Аналітики купівель*. Щоби активізувати її, "
+"перейдіть до розділу :menuselection:`Виставлення рахунків --> Налаштування "
+"--> Налаштування` та виберіть *Аналітика купівель*."
+
+#: ../../sales/invoicing/time_materials.rst:129
+msgid ""
+"While making the purchase order don't forget to add the right analytic "
+"account."
+msgstr ""
+"При оформленні замовлення на купівлю не забудьте додати правильний "
+"аналітичний рахунок."
+
+#: ../../sales/invoicing/time_materials.rst:135
+msgid ""
+"Once the PO is confirmed and received, you can create the vendor bill, this "
+"will automatically add it to the SO where you can invoice it."
+msgstr ""
+"Після того, як SO буде підтверджено та отримано, ви можете створити рахунок "
+"постачальника, що автоматично додасть його до SО, де ви можете виставити "
+"рахунок."
 
 #: ../../sales/products_prices.rst:3
 msgid "Products & Prices"
@@ -1612,10 +1356,6 @@ msgstr ""
 "рахунків. Це є ключовим, не всі матимуть однакове місце для доставки, як "
 "місце розташування рахунка-фактури."
 
-#: ../../sales/send_quotations/different_addresses.rst:10
-msgid "Activate the feature"
-msgstr "Активуйте цю функцію"
-
 #: ../../sales/send_quotations/different_addresses.rst:12
 msgid ""
 "Go to :menuselection:`SALES --> Configuration --> Settings` and activate the"
@@ -1873,6 +1613,10 @@ msgstr ""
 "шаблон, ви можете надіслати заповнену комерційну пропозицію в найкоротші "
 "терміни."
 
+#: ../../sales/send_quotations/quote_template.rst:10
+msgid "Configuration"
+msgstr "Налаштування"
+
 #: ../../sales/send_quotations/quote_template.rst:12
 msgid ""
 "For this feature to work, go to :menuselection:`Sales --> Configuration --> "
diff --git a/locale/uk/LC_MESSAGES/website.po b/locale/uk/LC_MESSAGES/website.po
index 6d8b0e070..52084a767 100644
--- a/locale/uk/LC_MESSAGES/website.po
+++ b/locale/uk/LC_MESSAGES/website.po
@@ -1465,8 +1465,8 @@ 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 ""
-"Ви можете порівняти, ваш веб-сайт з точки зору SEO, з Odoo, використовуючи "
-"безкоштовні послуги WooRank: `https://www.woorank.com "
+"Ви можете порівняти ваш веб-сайт з точки зору SEO, в той час як Odoo "
+"використовує безкоштовні послуги WooRank: `https://www.woorank.com "
 "<https://www.woorank.com>`__"
 
 #: ../../website/publish.rst:3
@@ -1698,7 +1698,7 @@ msgstr ""
 
 #: ../../website/publish/translate.rst:12
 msgid "Process"
-msgstr "Процес"
+msgstr "Обробити"
 
 #: ../../website/publish/translate.rst:14
 msgid ""
diff --git a/locale/zh_CN/LC_MESSAGES/accounting.po b/locale/zh_CN/LC_MESSAGES/accounting.po
index ae18725b1..821a4fbb3 100644
--- a/locale/zh_CN/LC_MESSAGES/accounting.po
+++ b/locale/zh_CN/LC_MESSAGES/accounting.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-27 11:08+0200\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: John Lin <linyinhuan@139.com>, 2018\n"
+"Last-Translator: yuan wenpu <1140021222@qq.com>, 2018\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../../accounting.rst:5 ../../accounting/localizations/mexico.rst:281
+#: ../../accounting.rst:5 ../../accounting/localizations/mexico.rst:283
 msgid "Accounting"
 msgstr "会计"
 
@@ -28,7 +28,7 @@ msgstr "银行及现金"
 
 #: ../../accounting/bank/feeds.rst:3
 msgid "Bank Feeds"
-msgstr "银行回单"
+msgstr "银行费用"
 
 #: ../../accounting/bank/feeds/coda.rst:3
 msgid "Import Coda statement files (Belgium only)"
@@ -54,8 +54,8 @@ msgid ""
 "<https://drive.google.com/file/d/0B5BDHVRYo-"
 "q5UVVMbGRxUmtpVDg/view?usp=sharing>`__"
 msgstr ""
-"现在测试功能 `CODA 示例文件<https ://drive.google.com/file/d/0B5BDHVRYo-"
-"q5UVVMbGRxUmtpVDg/view?usp=sharing>` __"
+"现在测试功能 `CODA 示例文件 <https://drive.google.com/file/d/0B5BDHVRYo-"
+"q5UVVMbGRxUmtpVDg/view?usp=sharing>`__"
 
 #: ../../accounting/bank/feeds/coda.rst:17
 #: ../../accounting/bank/feeds/manual.rst:12
@@ -68,6 +68,7 @@ msgstr ""
 #: ../../accounting/bank/reconciliation/use_cases.rst:20
 #: ../../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
@@ -85,12 +86,10 @@ msgstr ""
 #: ../../accounting/payables/pay/sepa.rst:26
 #: ../../accounting/payables/supplier_bills/bills_or_receipts.rst:30
 #: ../../accounting/payables/supplier_bills/manage.rst:31
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:15
 #: ../../accounting/receivables/customer_invoices/cash_rounding.rst:19
 #: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:24
 #: ../../accounting/receivables/customer_invoices/installment_plans.rst:20
 #: ../../accounting/receivables/customer_invoices/payment_terms.rst:19
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:31
 #: ../../accounting/receivables/customer_payments/check.rst:39
 #: ../../accounting/receivables/customer_payments/check.rst:103
 #: ../../accounting/receivables/customer_payments/credit_cards.rst:40
@@ -222,7 +221,7 @@ msgstr "手工登记银行对账单"
 #: ../../accounting/others/reporting/customize.rst:6
 #: ../../accounting/overview.rst:3
 msgid "Overview"
-msgstr "概述"
+msgstr "概览"
 
 #: ../../accounting/bank/feeds/manual.rst:8
 msgid ""
@@ -352,8 +351,8 @@ msgid ""
 "Test now the feature `with this sample OFX file "
 "<https://drive.google.com/file/d/0B5BDHVRYo-q5Mmg4T3oxTWszeEk/view>`__"
 msgstr ""
-"现在测试OFX文件的功能\n"
-"<https ://drive.google.com/file/d/0B5BDHVRYo-q5Mmg4T3oxTWszeEk/view> `__"
+"现在测试OFX文件的功能 <https://drive.google.com/file/d/0B5BDHVRYo-"
+"q5Mmg4T3oxTWszeEk/view>`__"
 
 #: ../../accounting/bank/feeds/ofx.rst:20
 msgid ""
@@ -591,8 +590,8 @@ msgid ""
 "<https://www.odoo.com/page/accounting-features>`__"
 msgstr ""
 "Odoo能够每4小时直接获得所有银行对账单并自动导入Odoo, 与你的银行同步。在做这步之前, "
-"你应该检查你的银行是否对予支持。你可以从“Odoo会计中找到相关功能<https ://www.odoo.com/page/accounting-"
-"features> `__"
+"你应该检查你的银行是否对予支持。你可以从“Odoo会计中找到相关功能 <https://www.odoo.com/page/accounting-"
+"features>`__"
 
 #: ../../accounting/bank/feeds/synchronize.rst:13
 msgid ""
@@ -647,11 +646,11 @@ msgstr "你可能需要检查一下, 没有防火墙/代理屏蔽以下地址"
 
 #: ../../accounting/bank/feeds/synchronize.rst:44
 msgid "https://onlinesync.odoo.com/"
-msgstr "https ://onlinesync.odoo.com/"
+msgstr "https://onlinesync.odoo.com/"
 
 #: ../../accounting/bank/feeds/synchronize.rst:45
 msgid "https://api.plaid.com/"
-msgstr "https ://api.plaid.com/"
+msgstr "https://api.plaid.com/"
 
 #: ../../accounting/bank/feeds/synchronize.rst:49
 msgid "Sync your bank feeds"
@@ -689,7 +688,7 @@ msgid ""
 msgstr "一旦你填写了你的凭证,你的银行订阅将会每4小时进行一次同步。"
 
 #: ../../accounting/bank/feeds/synchronize.rst:73
-#: ../../accounting/localizations/mexico.rst:531
+#: ../../accounting/localizations/mexico.rst:533
 msgid "FAQ"
 msgstr "常问问题"
 
@@ -705,12 +704,13 @@ msgid ""
 "there is a cron that is running every 4 hours to fetch the information from "
 "Yodlee."
 msgstr ""
+"Yodlee每天尝试从银行账户中获取数据一次。然而，这种情况并不总是同时发生的。有时候这个过程可能会失败。在这种情况下，Yodlee会在一两个小时后再试一次。这就是为什么在Odoo有一个cron每4小时运行一次，从Yodlee获取信息。"
 
 #: ../../accounting/bank/feeds/synchronize.rst:83
 msgid ""
 "You can however force this synchronization by clicking on the button "
 "\"Synchronize now\" from the accounting dashboard."
-msgstr ""
+msgstr "但是, 您可以通过单击按钮 \"立即同步 \" 从会计仪表板强制此同步。"
 
 #: ../../accounting/bank/feeds/synchronize.rst:86
 msgid ""
@@ -719,13 +719,15 @@ msgid ""
 " status \"pending\" and not the status \"posted\". In that case, Yodlee "
 "won't import it, you will have to wait that the status changes."
 msgstr ""
+"此外, 交易可以在您的银行帐户中可见, 但不能被 Yodlee 提取。实际上, 您的银行帐户中的交易记录可以具有状态 \"挂起 \", 而不是状态 "
+"\"已过帐 \"。在这种情况下, Yodlee 不会导入它, 您将不得不等待状态更改。"
 
 #: ../../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."
-msgstr ""
+msgstr "值得记住的是, Yodlee 不是实时获取事务的服务。这是一项有助于在数据库中导入银行对帐单的服务。"
 
 #: ../../accounting/bank/feeds/synchronize.rst:95
 msgid "Is the Yodlee feature included in my contract?"
@@ -759,6 +761,7 @@ msgid ""
 " may need a bit more time to have a 100% working synchronization. "
 "Unfortunately, there is not much to do about except being patient."
 msgstr ""
+"这意味着Yodlee目前只致力于开发与该银行的同步。同步可能已经开始工作，或者可能需要更多的时间来实现100%的工作同步。不幸的是，除了耐心之外，没有什么可做的。"
 
 #: ../../accounting/bank/feeds/synchronize.rst:110
 msgid "All my past transactions are not in Odoo, why?"
@@ -1156,7 +1159,7 @@ msgstr ""
 #: ../../accounting/others/reporting/main_reports.rst:153
 #: ../../accounting/overview/main_concepts/memento.rst:177
 msgid "Bank Reconciliation"
-msgstr "银行调节"
+msgstr "银行对账"
 
 #: ../../accounting/bank/reconciliation/configure.rst:3
 msgid "Configure model of entries"
@@ -1452,6 +1455,17 @@ msgid ""
 "accounts from another company."
 msgstr "如果你在多公司环境内工作, 如你添加、编辑或删除银行账号, 需要在首选项中切换公司。"
 
+#: ../../accounting/bank/setup/create_bank_account.rst:0
+#: ../../accounting/bank/setup/manage_cash_register.rst:0
+#: ../../accounting/others/configuration/account_type.rst:0
+msgid "Type"
+msgstr "类型"
+
+#: ../../accounting/bank/setup/create_bank_account.rst:0
+msgid ""
+"Bank account type: Normal or IBAN. Inferred from the bank account number."
+msgstr "银行账户类型：正常或IBAN。从银行账号推断。"
+
 #: ../../accounting/bank/setup/create_bank_account.rst:0
 msgid "ABA/Routing"
 msgstr "ABA/路由"
@@ -1460,6 +1474,16 @@ msgstr "ABA/路由"
 msgid "American Bankers Association Routing Number"
 msgstr "美国银行家协会路由号码"
 
+#: ../../accounting/bank/setup/create_bank_account.rst:0
+msgid "Account Holder Name"
+msgstr "账户持有人名称"
+
+#: ../../accounting/bank/setup/create_bank_account.rst:0
+msgid ""
+"Account holder name, in case it is different than the name of the Account "
+"Holder"
+msgstr "帐户持有人姓名，不同于帐户持有人的名称"
+
 #: ../../accounting/bank/setup/create_bank_account.rst:49
 msgid "View *Bank Account* in our Online Demonstration"
 msgstr "在我们的在线演示查看 *银行帐户*"
@@ -1692,11 +1716,6 @@ msgstr "有效"
 msgid "Set active to false to hide the Journal without removing it."
 msgstr "设置为无效，可以隐藏日记账而不用删除它。"
 
-#: ../../accounting/bank/setup/manage_cash_register.rst:0
-#: ../../accounting/others/configuration/account_type.rst:0
-msgid "Type"
-msgstr "类型"
-
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Select 'Sale' for customer invoices journals."
 msgstr "在客户发票日记账中选择‘销售’。"
@@ -1731,7 +1750,7 @@ msgstr "公司"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Company related to this journal"
-msgstr "此日记账相关的公司"
+msgstr "日记账相关的公司"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Short Code"
@@ -1739,7 +1758,7 @@ msgstr "简码"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "The journal entries of this journal will be named using this prefix."
-msgstr "这个日记账中的日记账分录会被用这个前缀命名"
+msgstr "这个日记账中的日记账分录会被用这个前缀命名."
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Next Number"
@@ -1747,7 +1766,7 @@ msgstr "下一号码"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "The next sequence number will be used for the next invoice."
-msgstr "下一号码将用于下一张发票"
+msgstr "下一号码将用于下一张发票."
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Entry Sequence"
@@ -1757,29 +1776,29 @@ msgstr "分录序列"
 msgid ""
 "This field contains the information related to the numbering of the journal "
 "entries of this journal."
-msgstr "这个字段包含和这个日记中日记账分录数量相关的信息"
+msgstr "这个字段包含和这个日记中日记账分录数量相关的信息."
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Dedicated Credit Note Sequence"
-msgstr "退款专用序列"
+msgstr "专用的信用证序列"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid ""
 "Check this box if you don't want to share the same sequence for invoices and"
 " credit notes made from this journal"
-msgstr "勾选此框，则此日记账下的会计发票或退款不使用同一个序列。"
+msgstr "勾选此框，则此日记账下的会计发票或信用证不使用同一个序列。"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Credit Notes: Next Number"
-msgstr "退款：下一号码"
+msgstr "信用证：下一号码"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "The next sequence number will be used for the next credit note."
-msgstr "下一号码将用于下一张退款单"
+msgstr "下一号码将用于下一张退款单."
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Credit Note Entry Sequence"
-msgstr "退款分录序列"
+msgstr "信用证分录序列"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid ""
@@ -1809,7 +1828,7 @@ msgstr "币种"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "The currency used to enter statement"
-msgstr "货币用来输入状态"
+msgstr "用来输入对账单的币种"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Debit Methods"
@@ -1835,10 +1854,11 @@ msgid ""
 " are suggested to reconcile the transaction with the batch deposit. Enable "
 "this option from the settings."
 msgstr ""
+"批量存款：通过生成一批存款，并提交给你的银行，将几个客户的支票同时包裹起来。在用Odoo编码银行结单时，建议您将交易与批量存款对账。从设置中启用此选项。"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Payment Methods"
-msgstr "付款方式"
+msgstr "付款方法"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Manual:Pay bill by cash or any other method outside of Odoo."
@@ -1846,13 +1866,13 @@ msgstr "手动：通过现金，支票或Odoo以外的任何其他方式进行
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Check:Pay bill by check and print it from Odoo."
-msgstr ""
+msgstr "支票: 通过支票支付账单, 并从 Odoo 打印。"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid ""
 "SEPA Credit Transfer: Pay bill from a SEPA Credit Transfer file you submit "
 "to your bank. Enable this option from the settings."
-msgstr ""
+msgstr "sepa 信用转移: 从您提交到您的银行的 SEPA 信用转移文件支付账单。从设置中启用此选项。"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Group Invoice Lines"
@@ -1862,7 +1882,7 @@ msgstr "分组发票明细行"
 msgid ""
 "If this box is checked, the system will try to group the accounting lines "
 "when generating them from invoices."
-msgstr "如果这个框已被检查,系统会集成行来生成发票。"
+msgstr "如果勾选此项, 系统将试图对生成的发票分组"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Profit Account"
@@ -1886,7 +1906,7 @@ msgstr "现金登记的期末余额与系统计算的有差异时候用来登记
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Show journal on dashboard"
-msgstr "在工作台显示日记账"
+msgstr "在仪表板显示日记账"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Whether this journal should be displayed on the dashboard or not"
@@ -1934,15 +1954,15 @@ msgstr "创建银行对账单"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "This field is used for the online synchronization:"
-msgstr ""
+msgstr "此字段用于联机同步:"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "depending on the option selected, newly fetched transactions"
-msgstr ""
+msgstr "根据所选选项, 新提取的事务"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "will be put inside previous statement or in a new one"
-msgstr ""
+msgstr "将被放在前面的语句或新的一个"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:0
 msgid "Amount Authorized Difference"
@@ -1954,9 +1974,7 @@ msgid ""
 " and the theoretical cash when closing a session, for non-POS managers. If "
 "this maximum is reached, the user will have an error message at the closing "
 "of his session saying that he needs to contact his manager."
-msgstr ""
-"在关闭期间时, 这个字段描述了现金期末余额和理论之间所允许的最大区别, 用于non-POS经理。如达到最大时,用户在关闭期间时将收到一个错误消息: "
-"需要联系他的经理。"
+msgstr "该字段定义了在关闭一个会话时候理论的余额和实际余额的最大差额如果达到该最大值，用户就会得到一个错误信息告知他需要联系他的经理"
 
 #: ../../accounting/bank/setup/manage_cash_register.rst:25
 msgid "Usage"
@@ -2024,6 +2042,310 @@ msgstr "该交易将被添加到当前的现金支付登记。"
 msgid "Localizations"
 msgstr "本地化"
 
+#: ../../accounting/localizations/colombia.rst:3
+msgid "Colombia"
+msgstr "哥伦比亚"
+
+#: ../../accounting/localizations/colombia.rst:6
+#: ../../accounting/localizations/mexico.rst:14
+#: ../../accounting/others/taxes/B2B_B2C.rst:63
+msgid "Introduction"
+msgstr "介绍"
+
+#: ../../accounting/localizations/colombia.rst:8
+msgid ""
+"Electronic invoicing for Colombia is available from Odoo 12 and requires the"
+" next modules:"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:11
+msgid ""
+"**l11n_co**: All the basic data to manage the accounting module, contains "
+"the default setup for: chart of accounts, taxes, retentions, identification "
+"document types"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:14
+msgid ""
+"**l10n_co_edi**: This module includes all the extra fields that are required"
+" for the Integration with Carvajal T&S and generate the electronic invoice, "
+"based on the DIAN legal requirements."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:19
+msgid "Workflow"
+msgstr "工作流"
+
+#: ../../accounting/localizations/colombia.rst:28
+msgid "1. Install the Colombian localization modules"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:30
+msgid ""
+"For this, go in Apps and search for Colombia. Then click Install for the "
+"first two modules."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:37
+msgid "2. Configure credentials for Carvajal T&S web service"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:39
+msgid ""
+"Once that the modules are installed, in order to be able to connect with "
+"Carvajal T&S Web Service, it's necessary to configure the user and "
+"credentials, this information will be provided by Carvajal T&S."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:43
+#: ../../accounting/localizations/colombia.rst:64
+msgid ""
+"Go to :menuselection:`Accounting --> Configuration --> Settings` and look "
+"for the *Colombian Electronic Invoice* section."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:49
+msgid ""
+"Using the Testing mode it is possible to connect with a Carvajal T&S testing"
+" environment. This allows users to test the complete workflow and "
+"integration with the CEN Financiero portal, which is accessible here: "
+"https://cenfinancierolab.cen.biz"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:54
+msgid ""
+"Once that Odoo and Carvajal T&S is fully configured and ready for production"
+" the testing environment can be disabled."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:58
+msgid "3. Configure your report data"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:60
+msgid ""
+"As part of the configurable information that is sent in the XML, you can "
+"define the data for the fiscal section and the bank information in the PDF."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:71
+msgid "4. Configure data required in the XML"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:74
+msgid "4.1 Partner"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:77
+msgid "4.1.1 Identification"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:79
+msgid ""
+"As part of the Colombian Localization, the document types defined by the "
+"DIAN are now available on the Partner form. Colombian partners have to have "
+"their identification number and document type set:"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:86
+msgid ""
+"When the document type is RUT the identification number needs to be "
+"configured in Odoo including the verification digit, Odoo will split this "
+"number when the data to the third party vendor is sent."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:92
+msgid "4.1.2 Fiscal structure (RUT)"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:94
+msgid ""
+"The partner's responsibility codes (section 53 in the RUT document) are "
+"included as part of the electronic invoice module given that is part of the "
+"information required by the DIAN ."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:98
+msgid ""
+"These fields can be found in :menuselection:`Partner --> Sales & Purchase "
+"Tab --> Fiscal Information`"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:104
+msgid ""
+"Additionally two booleans fields were added in order to specify the fiscal "
+"regimen of the partner."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:108
+msgid "4.2 Taxes"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:110
+msgid ""
+"If your sales transactions include products with taxes, it's important to "
+"consider that an extra field *Value Type* needs to be configured per tax. "
+"This option is located in the Advanced Options tab."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:117
+msgid ""
+"Retention tax types (ICA, IVA, Fuente) are also included in the options to "
+"configure your taxes. This configuration is used in order to correctly "
+"display taxes in the invoice PDF."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:125
+msgid "4.3 Journals"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:127
+msgid ""
+"Once the DIAN has assigned the official sequence and prefix for the "
+"electronic invoice resolution, the Sales journals related to your invoice "
+"documents need to be updated in Odoo.  The sequence can be accessed using "
+"developer mode: :menuselection:`Accounting --> Settings --> Configuration "
+"Setting --> Journals`."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:136
+msgid ""
+"Once that the sequence is opened, the Prefix and Next Number fields should "
+"be configured and synchronized with the CEN Financiero."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:143
+msgid "4.4 Users"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:145
+msgid ""
+"The default template that is used by Odoo on the invoice PDF includes the "
+"job position of the salesperson, so these fields should be configured:"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:153
+#: ../../accounting/localizations/mexico.rst:196
+msgid "Usage and testing"
+msgstr "用法和测试"
+
+#: ../../accounting/localizations/colombia.rst:156
+msgid "1. Invoice"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:158
+msgid ""
+"When all your master data and credentials has been configured, it's possible"
+" to start testing the electronic invoice workflow."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:162
+msgid "1.1 Invoice creation"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:164
+msgid ""
+"The functional workflow that takes place before an invoice validation "
+"doesn't change. The main changes that are introduced with the electronic "
+"invoice are the next fields:"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:171
+msgid "There are three types of documents:"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:173
+msgid ""
+"**Factura Electronica**: This is the regular type of document and its "
+"applicable for Invoices, Credit Notes and Debit Notes."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:175
+msgid ""
+"**Factura de Importación**: This should be selected for importation "
+"transactions."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:177
+msgid ""
+"**Factura de contingencia**: This is an exceptional type that is used as a "
+"manual backup in case that the company is not able to use the ERP and it's "
+"necessary to generate the invoice manually, when this invoice is added to "
+"the ERP, this invoice type should be selected."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:184
+msgid "1.2 Invoice validation"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:186
+msgid ""
+"After the invoice is validated an XML file is created and sent automatically"
+" to Carvajal, this file is displayed in the chatter."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:192
+msgid ""
+"An extra field is now displayed in \"Other Info\" tab with the name of the "
+"XML file. Additionally there is a second extra field that is displayed with "
+"the Electronic Invoice status, with the initial value \"In progress\":"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:201
+msgid "1.3 Reception of legal XML and PDF"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:203
+msgid ""
+"The electronic invoice vendor receives the XML file and proceeds to validate"
+" the structure and the information in it, if everything is correct the "
+"invoice status changes to \"Validated\" after using the \"Check Carvajal "
+"Status\" button in the Action dropdown. They then proceed to generate a "
+"Legal XML which includes a digital signature and a unique code (CUFE), a PDF"
+" invoice that includes a QR code and the CUFE is also generated."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:211
+msgid "After this:"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:213
+msgid ""
+"A ZIP containing the legal XML and the PDF is downloaded and displayed in "
+"the invoice chatter:"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:222
+msgid "The Electronic Invoice status changes to \"Accepted\""
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:225
+msgid "1.4 Common errors"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:227
+msgid ""
+"During the XML validation the most common errors are usually related to "
+"missing master data. In such cases, error messages are shown in the chatter "
+"after updating the electronic invoice status."
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:234
+msgid ""
+"After the master data is corrected, it's possible to reprocess the XML with "
+"the new data and send the updated version, using the following button:"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:245
+msgid "2. Additional use cases"
+msgstr ""
+
+#: ../../accounting/localizations/colombia.rst:247
+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/france.rst:3
 msgid "France"
 msgstr "法国"
@@ -2043,33 +2365,33 @@ msgstr "如果你已经安装了法国会计，你将能下载FEC。为此，可
 msgid ""
 "If you do not see the submenu **FEC**, go in **Apps** and search for the "
 "module called **France-FEC** and verify if it is well installed."
-msgstr ""
+msgstr "如果您看不到子菜单 **, 请进入 ** 应用程序 ** 并搜索名为 ** 法国-FEC ** 的模块, 并验证它是否安装良好。"
 
 #: ../../accounting/localizations/france.rst:16
 msgid "French Accounting Reports"
-msgstr ""
+msgstr "法国会计报告"
 
 #: ../../accounting/localizations/france.rst:18
 msgid ""
 "If you have installed the French Accounting, you will have access to some "
 "accounting reports specific to France:"
-msgstr ""
+msgstr "如果您安装了法国会计, 您将可以访问特定于法国的一些会计报告:"
 
 #: ../../accounting/localizations/france.rst:20
 msgid "Bilan comptable"
-msgstr ""
+msgstr "会计余额"
 
 #: ../../accounting/localizations/france.rst:21
 msgid "Compte de résultats"
-msgstr ""
+msgstr "结果帐户"
 
 #: ../../accounting/localizations/france.rst:22
 msgid "Plan de Taxes France"
-msgstr ""
+msgstr "法国税收计划"
 
 #: ../../accounting/localizations/france.rst:25
 msgid "Get the VAT anti-fraud certification with Odoo"
-msgstr ""
+msgstr "通过 Odoo 获得增值税反欺诈认证"
 
 #: ../../accounting/localizations/france.rst:27
 msgid ""
@@ -2079,38 +2401,40 @@ msgid ""
 "data. These legal requirements are implemented in Odoo, version 9 onward, "
 "through a module and a certificate of conformity to download."
 msgstr ""
+"截至 2018年1月1日, 法国和 DOM-TOM 实施了一项新的反欺诈立法。这一新立法规定了有关销售数据的 "
+"inalterability、安全、存储和归档的某些标准。这些法律要求在 Odoo 中实施, 版本9继续, 通过模块和合格证书下载。"
 
 #: ../../accounting/localizations/france.rst:34
 msgid "Is my company required to use an anti-fraud software?"
-msgstr ""
+msgstr "我的公司是否需要使用反欺诈软件？"
 
 #: ../../accounting/localizations/france.rst:36
 msgid ""
 "Your company is required to use an anti-fraud cash register software like "
 "Odoo (CGI art. 286, I. 3° bis) if:"
-msgstr ""
+msgstr "您的公司需要使用一个反欺诈现金登记软件, 如 Odoo (CGI 艺术 286, i. 3° bis) 如果:"
 
 #: ../../accounting/localizations/france.rst:39
 msgid "You are taxable (not VAT exempt) in France or any DOM-TOM,"
-msgstr ""
+msgstr "您在法国或任何 DOM-汤姆应纳税 (不含增值税),"
 
 #: ../../accounting/localizations/france.rst:40
 msgid "Some of your customers are private individuals (B2C)."
-msgstr ""
+msgstr "您的一些客户是个人 (B2C)。"
 
 #: ../../accounting/localizations/france.rst:42
 msgid ""
 "This rule applies to any company size. Auto-entrepreneurs are exempted from "
 "VAT and therefore are not affected."
-msgstr ""
+msgstr "此规则适用于任何公司规模。自动创业者免征增值税, 因此不受影响。"
 
 #: ../../accounting/localizations/france.rst:46
 msgid "Get certified with Odoo"
-msgstr ""
+msgstr "获得 Odoo 认证"
 
 #: ../../accounting/localizations/france.rst:48
 msgid "Getting compliant with Odoo is very easy."
-msgstr ""
+msgstr "与 Odoo 的兼容是非常容易的。"
 
 #: ../../accounting/localizations/france.rst:50
 msgid ""
@@ -2122,32 +2446,38 @@ msgid ""
 "<https://www.odoo.com/documentation/online/setup/enterprise.html>`__ or "
 "contact your Odoo service provider."
 msgstr ""
+"税务管理部门要求贵公司提供合格证书, 证明您的软件符合反欺诈法规。此证书由 odoo SA 授予 odoo 企业用户 \" "
+"<https://www.odoo.com/my/contract/french-certification/>`__.。如果您使用 odoo 社区, "
+"您应该 \"升级到 odoo "
+"企业版<https://www.odoo.com/documentation/online/setup/enterprise.html>\" __ "
+"或联系您的 odoo 服务提供商."
 
 #: ../../accounting/localizations/france.rst:58
 msgid "In case of non-conformity, your company risks a fine of €7,500."
-msgstr ""
+msgstr "如果不符合规定, 您的公司将面临7500欧元的罚款。"
 
 #: ../../accounting/localizations/france.rst:60
 msgid "To get the certification just follow the following steps:"
-msgstr ""
+msgstr "要获得认证, 只需按照以下步骤操作:"
 
 #: ../../accounting/localizations/france.rst:62
 msgid ""
 "Install the anti-fraud module fitting your Odoo environment from the *Apps* "
 "menu:"
-msgstr ""
+msgstr "从 * 应用程序 * 菜单中安装适合您 Odoo 环境的反欺诈模块:"
 
 #: ../../accounting/localizations/france.rst:65
 msgid ""
 "if you use Odoo Point of Sale: *l10n_fr_pos_cert*: France - VAT Anti-Fraud "
 "Certification for Point of Sale (CGI 286 I-3 bis)"
 msgstr ""
+"如果您使用 Odoo 销售点: * l10n_fr_pos_cert *: 法国-销售点的增值税反欺诈认证 (CGI 286 I-3 bis)"
 
 #: ../../accounting/localizations/france.rst:67
 msgid ""
 "in any other case: *l10n_fr_certification*: France - VAT Anti-Fraud "
 "Certification (CGI 286 I-3 bis)"
-msgstr ""
+msgstr "在任何其他情况下: * l10n_fr_certification *: 法国-增值税反欺诈认证 (CGI 286 I-3 bis)"
 
 #: ../../accounting/localizations/france.rst:68
 msgid ""
@@ -2156,12 +2486,16 @@ msgid ""
 ":menuselection:`Settings --> Users & Companies --> Companies`. Select a "
 "country from the list; Do not create a new country."
 msgstr ""
+"确保您的公司设置了一个国家/地区, 否则您的条目将不会被加密 inalterability 检查。要编辑您公司的数据, 请转到: "
+"menuselection: \"设置->> 用户和公司->> 公司\"。从列表中选择一个国家/地区;不要创建一个新的国家。"
 
 #: ../../accounting/localizations/france.rst:72
 msgid ""
 "Download the mandatory certificate of conformity delivered by Odoo SA `here "
 "<https://www.odoo.com/my/contract/french-certification/>`__."
 msgstr ""
+"下载 Odoo SA ' 这里 ' 提供的强制性合格证书<https://www.odoo.com/my/contract/french-"
+"certification/>`__."
 
 #: ../../accounting/localizations/france.rst:74
 msgid ""
@@ -2170,12 +2504,14 @@ msgid ""
 "the *Settings* menu. Then go to the *Apps* menu and press *Update Modules "
 "List* in the top-menu."
 msgstr ""
+"要在2017年12月18日之前创建的任何系统中安装该模块, 应更新 \"模块\" 列表。为此, 请从 * 设置 * 菜单中激活开发人员模式。然后转到 *"
+" 应用程序 * 菜单, 然后在顶部菜单中按 * 更新模块列表 *。"
 
 #: ../../accounting/localizations/france.rst:78
 msgid ""
 "In case you run Odoo on-premise, you need to update your installation and "
 "restart your server beforehand."
-msgstr ""
+msgstr "如果您在本地运行 Odoo, 您需要更新您的安装并提前重新启动服务器。"
 
 #: ../../accounting/localizations/france.rst:80
 msgid ""
@@ -2186,30 +2522,33 @@ msgid ""
 "*Upgrade*. Finally, make sure the following module *l10n_fr_sale_closing* is"
 " installed."
 msgstr ""
+"如果您安装了反欺诈模块的初始版本 (2017年12月18日之前), 则需要对其进行更新。该模块的名称是 * 法国-会计认证 CGI 286 I-3 "
+"bis *。更新模块列表后, 在 * 应用程序 * 中搜索更新的模块 *, 选择它, 然后单击 * 升级 *。最后, 确保安装了以下模块 * "
+"l10n_fr_sale_closing *。"
 
 #: ../../accounting/localizations/france.rst:89
 msgid "Anti-fraud features"
-msgstr ""
+msgstr "反欺诈功能"
 
 #: ../../accounting/localizations/france.rst:91
 msgid "The anti-fraud module introduces the following features:"
-msgstr ""
+msgstr "反欺诈模块引入了以下功能:"
 
 #: ../../accounting/localizations/france.rst:93
 msgid ""
 "**Inalterability**: deactivation of all the ways to cancel or modify key "
 "data of POS orders, invoices and journal entries;"
-msgstr ""
+msgstr "**Inalterability**: 取消或修改 POS 订单、发票和日记帐分录的关键数据的所有方式的停用;"
 
 #: ../../accounting/localizations/france.rst:95
 msgid "**Security**: chaining algorithm to verify the inalterability;"
-msgstr ""
+msgstr "**Security**: 链算法验证 inalterability;"
 
 #: ../../accounting/localizations/france.rst:96
 msgid ""
 "**Storage**: automatic sales closings with computation of both period and "
 "cumulative totals (daily, monthly, annually)."
-msgstr ""
+msgstr "**Storage**: 自动销售结转, 计算期间和累计合计 (每日、每月、每年)。"
 
 #: ../../accounting/localizations/france.rst:100
 msgid "Inalterability"
@@ -2220,13 +2559,13 @@ msgid ""
 "All the possible ways to cancel and modify key data of paid POS orders, "
 "confirmed invoices and journal entries are deactivated, if the company is "
 "located in France or in any DOM-TOM."
-msgstr ""
+msgstr "如果公司位于法国或任何 DOM-TOM, 则取消和修改付费 POS 订单、已确认发票和日记帐分录的关键数据的所有可能方法都将被停用。"
 
 #: ../../accounting/localizations/france.rst:106
 msgid ""
 "If you run a multi-companies environment, only the documents of such "
 "companies are impacted."
-msgstr ""
+msgstr "如果您运行的是多公司环境, 则只有这些公司的文档受到影响。"
 
 #: ../../accounting/localizations/france.rst:110
 msgid "Security"
@@ -2238,6 +2577,7 @@ msgid ""
 " validation. This number (or hash) is calculated from the key data of the "
 "document as well as from the hash of the precedent documents."
 msgstr ""
+"为确保 inalterability, 每个订单或日记帐条目在验证时进行加密。此数字 (或哈希) 是从文档的关键数据以及先例文档的哈希计算得出的。"
 
 #: ../../accounting/localizations/france.rst:117
 msgid ""
@@ -2247,6 +2587,8 @@ msgid ""
 "initial ones. In case of failure, the system points out the first corrupted "
 "document recorded in the system."
 msgstr ""
+"该模块引入一个接口来测试数据 inalterability。如果文档在验证后修改了任何信息, 则测试将失败。算法重新计算所有哈希值, "
+"并将它们与初始值进行比较。在出现故障时, 系统会指出系统中记录的第一个损坏的文档。"
 
 #: ../../accounting/localizations/france.rst:123
 msgid ""
@@ -2255,6 +2597,8 @@ msgid ""
 "Statements`. For invoices or journal entries, go to "
 ":menuselection:`Invoicing/Accounting --> Reporting --> French Statements`."
 msgstr ""
+"具有 * 管理员 * 访问权限的用户可以启动 inalterability 检查。对于 POS 订单, 请转到: menuselection: "
+"\"销售点->> 报告-法国声明\"。对于发票或日记帐分录, 请转到: menuselection: \"开票/记帐->> 报告-法国声明\"。"
 
 #: ../../accounting/localizations/france.rst:130
 msgid "Storage"
@@ -2266,7 +2610,7 @@ msgid ""
 "annual basis. Such closings distinctly compute the sales total of the period"
 " as well as the cumulative grand totals from the very first sales entry "
 "recorded in the system."
-msgstr ""
+msgstr "该系统还处理每日、每月和每年的自动销售结转。此类结算会显著计算该期间的销售总额以及系统中记录的第一个销售条目的累计总计。"
 
 #: ../../accounting/localizations/france.rst:138
 msgid ""
@@ -2443,11 +2787,6 @@ msgid ""
 "\"Mexico\" set."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:14
-#: ../../accounting/others/taxes/B2B_B2C.rst:63
-msgid "Introduction"
-msgstr "介绍"
-
 #: ../../accounting/localizations/mexico.rst:16
 msgid "The mexican localization is a group of 3 modules:"
 msgstr ""
@@ -2515,11 +2854,11 @@ msgid ""
 " integrate with the normal invoicing flow in Odoo."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:66
+#: ../../accounting/localizations/mexico.rst:68
 msgid "3. Set you legal information in the company"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:68
+#: ../../accounting/localizations/mexico.rst:70
 msgid ""
 "First, make sure that your company is configured with the correct data. Go "
 "in :menuselection:`Settings --> Users --> Companies` and enter a valid "
@@ -2527,20 +2866,20 @@ msgid ""
 "position on your company’s contact."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:75
+#: ../../accounting/localizations/mexico.rst:77
 msgid ""
 "If you want use the Mexican localization on test mode, you can put any known"
 " address inside Mexico with all fields for the company address and set the "
 "vat to **ACO560518KW7**."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:83
+#: ../../accounting/localizations/mexico.rst:85
 msgid ""
 "4. Set the proper \"Fiscal Position\" on the partner that represent the "
 "company"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:85
+#: ../../accounting/localizations/mexico.rst:87
 msgid ""
 "Go In the same form where you are editing the company save the record in "
 "order to set this form as a readonly and on readonly view click on the "
@@ -2550,11 +2889,11 @@ msgid ""
 "the option)."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:92
+#: ../../accounting/localizations/mexico.rst:94
 msgid "5. Enabling CFDI Version 3.3"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:95
+#: ../../accounting/localizations/mexico.rst:97
 msgid ""
 "This steps are only necessary when you will enable the CFDI 3.3 (only "
 "available for V11.0 and above) if you do not have Version 11.0 or above on "
@@ -2562,11 +2901,11 @@ msgid ""
 "https://www.odoo.com/help."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:100
+#: ../../accounting/localizations/mexico.rst:102
 msgid "Enable debug mode:"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:105
+#: ../../accounting/localizations/mexico.rst:107
 msgid ""
 "Go and look the following technical parameter, on :menuselection:`Settings "
 "--> Technical --> Parameters --> System Parameters` and set the parameter "
@@ -2574,7 +2913,7 @@ msgid ""
 "name does not exist)."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:111
+#: ../../accounting/localizations/mexico.rst:113
 msgid ""
 "The CFDI 3.2 will be legally possible until November 30th 2017 enable the "
 "3.3 version will be a mandatory step to comply with the new `SAT "
@@ -2582,36 +2921,36 @@ msgid ""
 "the default behavior."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:120
+#: ../../accounting/localizations/mexico.rst:122
 msgid "Important considerations when yo enable the CFDI 3.3"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:122
-#: ../../accounting/localizations/mexico.rst:611
+#: ../../accounting/localizations/mexico.rst:124
+#: ../../accounting/localizations/mexico.rst:613
 msgid ""
 "Your tax which represent the VAT 16% and 0% must have the \"Factor Type\" "
 "field set to \"Tasa\"."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:130
+#: ../../accounting/localizations/mexico.rst:132
 msgid ""
 "You 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:137
+#: ../../accounting/localizations/mexico.rst:139
 msgid ""
 "All products must have for CFDI 3.3 the \"SAT code\" and the field "
 "\"Reference\" properly set, you can export them and re import them to do it "
 "faster."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:144
+#: ../../accounting/localizations/mexico.rst:146
 msgid "6. Configure the PAC in order to sign properly the invoices"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:146
+#: ../../accounting/localizations/mexico.rst:148
 msgid ""
 "To configure the EDI with the **PACs**, you can go in "
 ":menuselection:`Accounting --> Settings --> Electronic Invoicing (MX)`. You "
@@ -2619,14 +2958,14 @@ msgid ""
 "and then enter your PAC username and PAC password."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:152
+#: ../../accounting/localizations/mexico.rst:154
 msgid ""
 "Remember you must sign up in the refereed PAC before hand, that process can "
 "be done with the PAC itself on this case we will have two (2) availables "
 "`Finkok`_ and `Solución Factible`_."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:156
+#: ../../accounting/localizations/mexico.rst:158
 msgid ""
 "You must process your **Private Key (CSD)** with the SAT institution before "
 "follow this steps, if you do not have such information please try all the "
@@ -2635,163 +2974,159 @@ msgid ""
 "environment with real transactions."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:166
+#: ../../accounting/localizations/mexico.rst:168
 msgid ""
 "If you ticked the box *MX PAC test environment* there is no need to enter a "
 "PAC username or password."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:173
+#: ../../accounting/localizations/mexico.rst:175
 msgid ""
 "Here is a SAT certificate you can use if you want to use the *Test "
 "Environment* for the Mexican Accounting Localization."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:176
+#: ../../accounting/localizations/mexico.rst:178
 msgid "`Certificate`_"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:177
+#: ../../accounting/localizations/mexico.rst:179
 msgid "`Certificate Key`_"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:178
+#: ../../accounting/localizations/mexico.rst:180
 msgid "**Password :** 12345678a"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:181
+#: ../../accounting/localizations/mexico.rst:183
 msgid "7. Configure the tag in sales taxes"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:183
+#: ../../accounting/localizations/mexico.rst:185
 msgid ""
 "This tag is used to set the tax type code, transferred or withhold, "
 "applicable to the concept in the CFDI. So, if the tax is a sale tax the "
 "\"Tag\" field should be \"IVA\", \"ISR\" or \"IEPS\"."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:190
+#: ../../accounting/localizations/mexico.rst:192
 msgid ""
 "Note that the default taxes already has a tag assigned, but when you create "
 "a new tax you should choose a tag."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:194
-msgid "Usage and testing"
-msgstr "用法和测试"
-
-#: ../../accounting/localizations/mexico.rst:197
+#: ../../accounting/localizations/mexico.rst:199
 msgid "Invoicing"
 msgstr "开票"
 
-#: ../../accounting/localizations/mexico.rst:199
+#: ../../accounting/localizations/mexico.rst:201
 msgid ""
 "To use the mexican invoicing you just need to do a normal invoice following "
 "the normal Odoo's behaviour."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:202
+#: ../../accounting/localizations/mexico.rst:204
 msgid ""
 "Once you validate your first invoice a correctly signed invoice should look "
 "like this:"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:209
+#: ../../accounting/localizations/mexico.rst:211
 msgid ""
 "You can generate the PDF just clicking on the Print button on the invoice or"
 " sending it by email following the normal process on odoo to send your "
 "invoice by email."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:216
+#: ../../accounting/localizations/mexico.rst:218
 msgid ""
 "Once you send the electronic invoice by email this is the way it should "
 "looks like."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:223
+#: ../../accounting/localizations/mexico.rst:225
 msgid "Cancelling invoices"
 msgstr "取消的发票"
 
-#: ../../accounting/localizations/mexico.rst:225
+#: ../../accounting/localizations/mexico.rst:227
 msgid ""
 "The cancellation process is completely linked to the normal cancellation in "
 "Odoo."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:227
+#: ../../accounting/localizations/mexico.rst:229
 msgid "If the invoice is not paid."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:229
+#: ../../accounting/localizations/mexico.rst:231
 msgid "Go to to the customer invoice journal where the invoice belong to"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:237
+#: ../../accounting/localizations/mexico.rst:239
 msgid "Check the \"Allow cancelling entries\" field"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:242
+#: ../../accounting/localizations/mexico.rst:244
 msgid "Go back to your invoice and click on the button \"Cancel Invoice\""
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:247
+#: ../../accounting/localizations/mexico.rst:249
 msgid ""
 "For security reasons it is recommendable return the check on the to allow "
 "cancelling to false again, then go to the journal and un check such field."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:250
+#: ../../accounting/localizations/mexico.rst:252
 msgid "**Legal considerations**"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:252
+#: ../../accounting/localizations/mexico.rst:254
 msgid "A cancelled invoice will automatically cancelled on the SAT."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:253
+#: ../../accounting/localizations/mexico.rst:255
 msgid ""
 "If you retry to use the same invoice after cancelled, you will have as much "
 "cancelled CFDI as you tried, then all those xml are important to maintain a "
 "good control of the cancellation reasons."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:256
+#: ../../accounting/localizations/mexico.rst:258
 msgid ""
 "You must unlink all related payment done to an invoice on odoo before cancel"
 " such document, this payments must be cancelled to following the same "
 "approach but setting the \"Allow Cancel Entries\" in the payment itself."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:261
+#: ../../accounting/localizations/mexico.rst:263
 msgid "Payments (Just available for CFDI 3.3)"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:263
+#: ../../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."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:266
+#: ../../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\"."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:269
+#: ../../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:271
+#: ../../accounting/localizations/mexico.rst:273
 msgid "You must print the payment in order to retrieve the PDF properly."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:272
+#: ../../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 "
@@ -2800,66 +3135,66 @@ msgid ""
 "caso de anticipos recibidos**."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:277
+#: ../../accounting/localizations/mexico.rst:279
 msgid ""
 "Related to topic 4 it is blocked the possibility to create a Customer "
 "Payment without a proper invoice."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:282
+#: ../../accounting/localizations/mexico.rst:284
 msgid "The accounting for Mexico in odoo is composed by 3 reports:"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:284
+#: ../../accounting/localizations/mexico.rst:286
 msgid "Chart of Account (Called and shown as COA)."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:285
+#: ../../accounting/localizations/mexico.rst:287
 msgid "Electronic Trial Balance."
 msgstr "电算试平衡。"
 
-#: ../../accounting/localizations/mexico.rst:286
+#: ../../accounting/localizations/mexico.rst:288
 msgid "DIOT report."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:288
+#: ../../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."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:291
+#: ../../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:297
+#: ../../accounting/localizations/mexico.rst:299
 msgid "Electronic Accounting (Requires Accounting App)"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:300
+#: ../../accounting/localizations/mexico.rst:302
 msgid "Electronic Chart of account CoA"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:302
+#: ../../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)**"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:309
+#: ../../accounting/localizations/mexico.rst:311
 msgid "**How to add new accounts?**"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:311
+#: ../../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."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:314
+#: ../../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 "
@@ -2869,17 +3204,17 @@ msgid ""
 " xml."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:324
+#: ../../accounting/localizations/mexico.rst:326
 msgid "**What is the meaning of the tag?**"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:326
+#: ../../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**."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:330
+#: ../../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 "
@@ -2887,11 +3222,11 @@ msgid ""
 "is not created you can create one on the fly."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:336
+#: ../../accounting/localizations/mexico.rst:338
 msgid "Electronic Trial Balance"
 msgstr "电算试平衡"
 
-#: ../../accounting/localizations/mexico.rst:338
+#: ../../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 "
@@ -2900,28 +3235,28 @@ msgid ""
 "the previous selection of the period you want to export."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:347
+#: ../../accounting/localizations/mexico.rst:349
 msgid ""
 "All the normal auditory and analysis features are available here also as any"
 " regular Odoo Report."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:351
+#: ../../accounting/localizations/mexico.rst:353
 msgid "DIOT Report (Requires Accounting App)"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:353
+#: ../../accounting/localizations/mexico.rst:355
 msgid "**What is the DIOT and the importance of presenting it SAT**"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:355
+#: ../../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."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:358
+#: ../../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 "
@@ -2929,25 +3264,25 @@ msgid ""
 "the same, with our providers."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:363
+#: ../../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:"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:367
+#: ../../accounting/localizations/mexico.rst:369
 msgid "**When to file the DIOT and in what format?**"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:369
+#: ../../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:373
+#: ../../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 "
@@ -2955,24 +3290,24 @@ msgid ""
 "to said data."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:378
+#: ../../accounting/localizations/mexico.rst:380
 msgid "**Where the DIOT is presented?**"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:380
+#: ../../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."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:384
+#: ../../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."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:387
+#: ../../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 "
@@ -2981,18 +3316,18 @@ msgid ""
 "that you will still have these records and of course, your CD or USB."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:393
+#: ../../accounting/localizations/mexico.rst:395
 msgid "**One more fact to know: the Batch load?**"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:395
+#: ../../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:"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:399
+#: ../../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 "
@@ -3002,7 +3337,7 @@ msgid ""
 "integration for the presentation in time and form to the SAT."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:406
+#: ../../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 "
@@ -3010,41 +3345,41 @@ msgid ""
 "Third Parties."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:411
+#: ../../accounting/localizations/mexico.rst:413
 msgid "You can find the `official information here`_."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:413
+#: ../../accounting/localizations/mexico.rst:415
 msgid "**How Generate this report in odoo?**"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:415
+#: ../../accounting/localizations/mexico.rst:417
 msgid ""
 "Go to  :menuselection:`Accounting --> Reports --> Mexico --> Transactions "
 "with third partied (DIOT)`."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:420
+#: ../../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."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:426
+#: ../../accounting/localizations/mexico.rst:428
 msgid "Click on \"Export (TXT)."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:431
+#: ../../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."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:435
+#: ../../accounting/localizations/mexico.rst:437
 msgid "Important considerations on your Supplier and Invice data for the DIOT"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:437
+#: ../../accounting/localizations/mexico.rst:439
 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 "
@@ -3053,34 +3388,34 @@ msgid ""
 " suppliers."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:445
+#: ../../accounting/localizations/mexico.rst:447
 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:448
+#: ../../accounting/localizations/mexico.rst:450
 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:451
+#: ../../accounting/localizations/mexico.rst:453
 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:454
+#: ../../accounting/localizations/mexico.rst:456
 msgid ""
 "Remember this report only shows the Supplier Invoices that were actually "
 "paid."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:456
+#: ../../accounting/localizations/mexico.rst:458
 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 "
@@ -3090,26 +3425,26 @@ msgid ""
 "your partners are correctly set."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:467
+#: ../../accounting/localizations/mexico.rst:469
 msgid "Extra Recommended features"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:470
+#: ../../accounting/localizations/mexico.rst:472
 msgid "Contact Module (Free)"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:472
+#: ../../accounting/localizations/mexico.rst:474
 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:477
+#: ../../accounting/localizations/mexico.rst:479
 msgid "Multi currency (Requires Accounting App)"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:479
+#: ../../accounting/localizations/mexico.rst:481
 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"
@@ -3119,17 +3454,17 @@ msgid ""
 "information daily in the system manually."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:486
+#: ../../accounting/localizations/mexico.rst:488
 msgid "Go to settings and enable the multi currency feature."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:492
+#: ../../accounting/localizations/mexico.rst:494
 msgid ""
 "Enabling Explicit errors on the CFDI using the XSD local validator (CFDI "
 "3.3)"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:494
+#: ../../accounting/localizations/mexico.rst:496
 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 "
@@ -3137,72 +3472,72 @@ msgid ""
 "debug mode enabled)."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:499
+#: ../../accounting/localizations/mexico.rst:501
 msgid ""
 "Go to :menuselection:`Settings --> Technical --> Actions --> Server Actions`"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:500
+#: ../../accounting/localizations/mexico.rst:502
 msgid "Look for the Action called \"Download XSD files to CFDI\""
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:501
+#: ../../accounting/localizations/mexico.rst:503
 msgid "Click on button \"Create Contextual Action\""
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:502
+#: ../../accounting/localizations/mexico.rst:504
 msgid ""
 "Go to the company form :menuselection:`Settings --> Users&Companies --> "
 "Companies`"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:503
+#: ../../accounting/localizations/mexico.rst:505
 msgid "Open any company you have."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:504
-#: ../../accounting/localizations/mexico.rst:527
+#: ../../accounting/localizations/mexico.rst:506
+#: ../../accounting/localizations/mexico.rst:529
 msgid "Click on \"Action\" and then on \"Download XSD file to CFDI\"."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:509
+#: ../../accounting/localizations/mexico.rst:511
 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:514
+#: ../../accounting/localizations/mexico.rst:516
 msgid "If you see an error like this:"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:516
+#: ../../accounting/localizations/mexico.rst:518
 msgid "The cfdi generated is not valid"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:518
+#: ../../accounting/localizations/mexico.rst:520
 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:522
+#: ../../accounting/localizations/mexico.rst:524
 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:526
+#: ../../accounting/localizations/mexico.rst:528
 msgid "Go to the company in which the error occurs."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:533
+#: ../../accounting/localizations/mexico.rst:535
 msgid "**Error message** (Only applicable on CFDI 3.3):"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:535
+#: ../../accounting/localizations/mexico.rst:537
 msgid ""
 ":9:0:ERROR:SCHEMASV:SCHEMAV_CVC_MINLENGTH_VALID: Element "
 "'{http://www.sat.gob.mx/cfd/3}Concepto', attribute 'NoIdentificacion': "
@@ -3210,43 +3545,43 @@ msgid ""
 "allowed minimum length of '1'."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:537
+#: ../../accounting/localizations/mexico.rst:539
 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:540
+#: ../../accounting/localizations/mexico.rst:542
 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:543
-#: ../../accounting/localizations/mexico.rst:568
-#: ../../accounting/localizations/mexico.rst:578
-#: ../../accounting/localizations/mexico.rst:591
-#: ../../accounting/localizations/mexico.rst:602
+#: ../../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
 msgid "**Error message**:"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:545
+#: ../../accounting/localizations/mexico.rst:547
 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:547
+#: ../../accounting/localizations/mexico.rst:549
 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:550
+#: ../../accounting/localizations/mexico.rst:552
 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"
@@ -3256,20 +3591,20 @@ msgid ""
 "considerations about fiscal positions."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:557
+#: ../../accounting/localizations/mexico.rst:559
 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:565
+#: ../../accounting/localizations/mexico.rst:567
 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:570
+#: ../../accounting/localizations/mexico.rst:572
 msgid ""
 ":2:0:ERROR:SCHEMASV:SCHEMAV_CVC_ENUMERATION_VALID: Element "
 "'{http://www.sat.gob.mx/cfd/3}Comprobante', attribute 'FormaPago': [facet "
@@ -3278,11 +3613,11 @@ msgid ""
 "'26', '27', '28', '29', '30', '99'}"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:573
+#: ../../accounting/localizations/mexico.rst:575
 msgid "**Solution:** The payment method is required on your invoice."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:580
+#: ../../accounting/localizations/mexico.rst:582
 msgid ""
 ":2:0:ERROR:SCHEMASV:SCHEMAV_CVC_ENUMERATION_VALID: Element "
 "'{http://www.sat.gob.mx/cfd/3}Comprobante', attribute 'LugarExpedicion': "
@@ -3296,16 +3631,16 @@ msgid ""
 "missing."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:585
+#: ../../accounting/localizations/mexico.rst:587
 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 `3. Set you legal "
-"information in the company`."
+"the required fields for your address following the step :ref:`mx-legal-"
+"info`."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:593
+#: ../../accounting/localizations/mexico.rst:595
 msgid ""
 ":2:0:ERROR:SCHEMASV:SCHEMAV_CVC_DATATYPE_VALID_1_2_1: Element "
 "'{http://www.sat.gob.mx/cfd/3}Comprobante', attribute 'LugarExpedicion': '' "
@@ -3313,13 +3648,13 @@ msgid ""
 "'{http://www.sat.gob.mx/sitio_internet/cfd/catalogos}c_CodigoPostal'."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:596
+#: ../../accounting/localizations/mexico.rst:598
 msgid ""
 "**Solution:** The postal code on your company address is not a valid one for"
 " Mexico, fix it."
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:604
+#: ../../accounting/localizations/mexico.rst:606
 msgid ""
 ":18:0:ERROR:SCHEMASV:SCHEMAV_CVC_COMPLEX_TYPE_4: Element "
 "'{http://www.sat.gob.mx/cfd/3}Traslado': The attribute 'TipoFactor' is "
@@ -3328,7 +3663,7 @@ msgid ""
 "is required but missing.\", '')"
 msgstr ""
 
-#: ../../accounting/localizations/mexico.rst:608
+#: ../../accounting/localizations/mexico.rst:610
 msgid ""
 "**Solution:** Set the mexican name for the tax 0% and 16% in your system and"
 " used on the invoice."
@@ -3900,123 +4235,6 @@ msgstr "如果您手动创建的资产, 你仍然需要建立供应商账单这
 msgid "Explanation of the fields:"
 msgstr "字段的说明 :"
 
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Status"
-msgstr "状态"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "When an asset is created, the status is 'Draft'."
-msgstr "当资产被创建，则状态为“草稿”。"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid ""
-"If the asset is confirmed, the status goes in 'Running' and the depreciation"
-" lines can be posted in the accounting."
-msgstr "如果资产被确认,进入“运行”状态, 折旧行会自动过账。"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid ""
-"You can manually close an asset when the depreciation is over. If the last "
-"line of depreciation is posted, the asset automatically goes in that status."
-msgstr "当折旧结束时, 可以手动关闭资产。如果发布的最后一行折旧,资产自动进入那个状态。"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Category"
-msgstr "类别"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Category of asset"
-msgstr "资产类别"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Date"
-msgstr "日期"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Date of asset"
-msgstr "资产日期"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Gross Value"
-msgstr "毛值"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Gross value of asset"
-msgstr "资产的毛值"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Salvage Value"
-msgstr "剩余价值"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "It is the amount you plan to have that you cannot depreciate."
-msgstr "计划的量, 不能减少。"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Computation Method"
-msgstr "计算方法"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Choose the method to use to compute the amount of depreciation lines."
-msgstr "选择折旧的计算方式."
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid ""
-"* Linear: Calculated on basis of: Gross Value / Number of Depreciations"
-msgstr "* 线性: 计算基于 : 毛值 / 折旧数"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid ""
-"* Degressive: Calculated on basis of: Residual Value * Degressive Factor"
-msgstr "* 递减: 计算基于: 残值 * 递减因子"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Time Method Based On"
-msgstr "时间方式基于"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Choose the method to use to compute the dates and number of entries."
-msgstr ""
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid ""
-"* Number of Entries: Fix the number of entries and the time between 2 "
-"depreciations."
-msgstr ""
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid ""
-"* Ending Date: Choose the time between 2 depreciations and the date the "
-"depreciations won't go beyond."
-msgstr "*结束日期:选择2个折旧的间隔和折旧的最后期限."
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Prorata Temporis"
-msgstr "即时按比例分配"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid ""
-"Indicates that the first depreciation entry for this asset have to be done "
-"from the purchase date instead of the first January / Start date of fiscal "
-"year"
-msgstr "表明第一次折旧从购买日期开始,而不是从年度第一个月开始."
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Number of Depreciations"
-msgstr "折旧数量"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "The number of depreciations needed to depreciate your asset"
-msgstr "被折旧资产的折旧数量"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "Number of Months in a Period"
-msgstr "在一个期间内的月数"
-
-#: ../../accounting/others/adviser/assets.rst:0
-msgid "The amount of time between two depreciations, in months"
-msgstr "折旧期间，以月计算"
-
 #: ../../accounting/others/adviser/assets.rst:88
 msgid "Try creating an *Asset* in our online demonstration"
 msgstr "尝试创建一个 *资产* 我们的在线演示"
@@ -4273,22 +4491,18 @@ msgstr "关于发票和采购订单的信息请看 :"
 msgid ":doc:`../../receivables/customer_invoices/overview`"
 msgstr ":doc:`../../receivables/customer_invoices/overview` "
 
-#: ../../accounting/others/adviser/budget.rst:128
-msgid ":doc:`../../../purchase/overview/process/from_po_to_invoice`"
-msgstr ":doc:`../../../purchase/overview/process/from_po_to_invoice` "
-
-#: ../../accounting/others/adviser/budget.rst:130
+#: ../../accounting/others/adviser/budget.rst:129
 msgid "Go back in the budget list and find the Smith Project."
 msgstr "返回预算明细并且找到具体项目"
 
-#: ../../accounting/others/adviser/budget.rst:132
+#: ../../accounting/others/adviser/budget.rst:131
 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 "通过分析账户, Odoo可以计算发票行和采购发票行, 金额将显示在 **实际金额** 列。"
 
-#: ../../accounting/others/adviser/budget.rst:141
+#: ../../accounting/others/adviser/budget.rst:140
 msgid ""
 "The theoretical amount represents the amount of money you theoretically "
 "could have spend / should have received in function of the date. When your "
@@ -4453,6 +4667,37 @@ msgstr ""
 "一旦会计师/记账员创建分配 **当年利润**的日记账分录，你应该将 **锁定日期** 设置本财政年度的最后一天。确保在此之前，您确认**资产负债表** "
 "中当年度收入是否正确报告余额为0。"
 
+#: ../../accounting/others/adviser/fiscalyear.rst:93
+msgid ":doc:`../configuration/fiscal_year`"
+msgstr ""
+
+#: ../../accounting/others/adviser/reverse_entry.rst:3
+msgid "Reverse an accounting entry automatically"
+msgstr ""
+
+#: ../../accounting/others/adviser/reverse_entry.rst:5
+msgid ""
+"You may want to automatically reverse an accounting entry at a specific "
+"date."
+msgstr ""
+
+#: ../../accounting/others/adviser/reverse_entry.rst:8
+msgid ""
+"This is, for example, used when you make a provision (e.g. provision for bad"
+" debt). When making the accounting entry for the provision, the amount you "
+"entered is only an estimated amount. You will only be sure of the amount at "
+"the end of the fiscal year. That's why, at that point, you want the "
+"accounting entry to be reversed to be able to enter the real loss that "
+"occurred."
+msgstr ""
+
+#: ../../accounting/others/adviser/reverse_entry.rst:15
+msgid ""
+"For this, you just have to tick the box \"Reverse Automatically\" on the "
+"journal entry and to define a reversal date. The accounting entry will be "
+"reversed at that date."
+msgstr ""
+
 #: ../../accounting/others/analytic.rst:3
 msgid "Analytic"
 msgstr "分析"
@@ -4587,28 +4832,23 @@ msgstr "采购产品"
 #: ../../accounting/others/analytic/purchases_expenses.rst:104
 msgid ""
 "We also need to buy a software for our customers. In the purchase app create"
-" a purchase order for the software product. (please refer to the following "
-"document: :doc:`../../../purchase/overview/process/from_po_to_invoice`). "
-"Within the line we can link the product's cost with the analytical account. "
-"Specify the order line and select the correct analytical account. Confirm "
-"the sale."
+" a purchase order for the software product. Within the line we can link the "
+"product's cost with the analytical account. Specify the order line and "
+"select the correct analytical account. Confirm the sale."
 msgstr ""
-"我们还需要为我们的客户买一个软件。在购买应用程序中, 创建一个软件产品的购买订单。(请参考以下文档 "
-":doc:`../../../purchase/overview/process/from_po_to_invoice` ). 在产品行上, "
-"我们可以将成本链接到分析科目上。指定订单行, 选择正确的分析科目。确认销售。"
 
-#: ../../accounting/others/analytic/purchases_expenses.rst:114
+#: ../../accounting/others/analytic/purchases_expenses.rst:113
 msgid ""
 "Accept the delivery and enter the invoice. Once the invoice is entered the "
 "cost price (**Vendor Price** field) will be booked in the analytical "
 "account."
 msgstr "收货并登记发票。一旦在发票输入了成本价格( **供应商价格** 字段)同时将记录在分析账户。"
 
-#: ../../accounting/others/analytic/purchases_expenses.rst:118
+#: ../../accounting/others/analytic/purchases_expenses.rst:117
 msgid "Subcontracting"
 msgstr "外包"
 
-#: ../../accounting/others/analytic/purchases_expenses.rst:120
+#: ../../accounting/others/analytic/purchases_expenses.rst:119
 msgid ""
 "The purchase module can be used in the same way as seen previously to handle"
 " subcontracting. if we purchase a service from another company we can re "
@@ -4618,34 +4858,34 @@ msgstr ""
 "采购模块可以使用相同的方式, 就如之前的分包处理。如果我们从另一家公司购买服务, 我们可以重新开票到正确的分析科目, "
 "通过链接采购行。我们只是需要创建正确的供应商的产品。"
 
-#: ../../accounting/others/analytic/purchases_expenses.rst:128
+#: ../../accounting/others/analytic/purchases_expenses.rst:127
 msgid "You can also track cost with timesheets, see: :doc:`timesheets`"
 msgstr "你也可以用工时表跟踪成本, 请参阅 : : doc :`timesheets` "
 
-#: ../../accounting/others/analytic/purchases_expenses.rst:131
+#: ../../accounting/others/analytic/purchases_expenses.rst:130
 msgid "Track costs in accounting"
 msgstr "在会计中追踪成本"
 
-#: ../../accounting/others/analytic/purchases_expenses.rst:133
+#: ../../accounting/others/analytic/purchases_expenses.rst:132
 msgid ""
 "Now that everything is booked and points to the analytical account. Simply "
 "open it to check the costs related to that account."
 msgstr "现在一切都是入账并指到分析账户。只是打开它检查科目的相关成本。"
 
-#: ../../accounting/others/analytic/purchases_expenses.rst:136
+#: ../../accounting/others/analytic/purchases_expenses.rst:135
 msgid ""
 "Enter the accounting module, click on :menuselection:`Advisers --> Analytic "
 "Accounts --> Open Charts`."
 msgstr ""
 "进入会计模块, 点击 :menuselection:`Advisers --> Analytic Accounts --> Open Charts` ."
 
-#: ../../accounting/others/analytic/purchases_expenses.rst:139
+#: ../../accounting/others/analytic/purchases_expenses.rst:138
 msgid ""
 "Select \"consulting pack - Smith\" and click on the cost and revenue button "
 "to have an overview of all cost linked to the account."
 msgstr "选择“咨询包-史密斯\" , 单击成本和销售按钮, 以此来查看这个科目下的所有的成本。 "
 
-#: ../../accounting/others/analytic/purchases_expenses.rst:147
+#: ../../accounting/others/analytic/purchases_expenses.rst:146
 msgid ""
 "If you would like to have the revenue as well you should invoice the "
 "Consulting Pack in the Invoice menu and link the invoice line to this same "
@@ -4955,7 +5195,7 @@ msgstr " **工业制造公司的分析科目表**: "
 
 #: ../../accounting/others/analytic/usage.rst:41
 msgid "Marketing Department"
-msgstr "市场部门"
+msgstr "市场营销部门"
 
 #: ../../accounting/others/analytic/usage.rst:43
 msgid "Commercial Department"
@@ -5125,7 +5365,7 @@ msgstr "-3 000"
 #: ../../accounting/others/analytic/usage.rst:78
 #: ../../accounting/others/analytic/usage.rst:167
 msgid "Administrative"
-msgstr "管理"
+msgstr "行政"
 
 #: ../../accounting/others/analytic/usage.rst:78
 msgid "-1 000"
@@ -5503,7 +5743,7 @@ msgstr "非流动资产"
 
 #: ../../accounting/others/configuration/account_type.rst:37
 msgid "Prepayments"
-msgstr "预付"
+msgstr "预付账"
 
 #: ../../accounting/others/configuration/account_type.rst:39
 msgid "Fixed Assets"
@@ -5523,7 +5763,7 @@ msgstr "权益"
 
 #: ../../accounting/others/configuration/account_type.rst:47
 msgid "Current Year Earnings"
-msgstr "当年盈利"
+msgstr "当本年度收入"
 
 #: ../../accounting/others/configuration/account_type.rst:49
 msgid "Other Income"
@@ -5592,15 +5832,15 @@ msgstr "标签"
 
 #: ../../accounting/others/configuration/account_type.rst:0
 msgid "Optional tags you may want to assign for custom reporting"
-msgstr "你可能想赋予给定义报告的选项标签"
+msgstr "你可能想赋予给定义报表的选项标签"
 
 #: ../../accounting/others/configuration/account_type.rst:0
 msgid "Account Currency"
-msgstr "币种"
+msgstr "科目币种"
 
 #: ../../accounting/others/configuration/account_type.rst:0
 msgid "Forces all moves for this account to have this account currency."
-msgstr "强制这个科目所有的凭证拥有这个科目的币种"
+msgstr "强制这个科目所有的凭证拥有这个科目的币种."
 
 #: ../../accounting/others/configuration/account_type.rst:0
 msgid "Internal Type"
@@ -5611,22 +5851,62 @@ 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 "'内部类型'用于不同类型的科目: 流动性用于现金或银行账户, 应收/应付用于供应商/客户账户。"
+msgstr " '内部类型' 用于不同类型科目的功能: 流动性用于现金或银行科目, 应付/应收用于供应商/客户科目."
 
 #: ../../accounting/others/configuration/account_type.rst:0
 msgid "Allow Reconciliation"
-msgstr "允许核销"
+msgstr "允许调节"
 
 #: ../../accounting/others/configuration/account_type.rst:0
 msgid ""
 "Check this box if this account allows invoices & payments matching of "
 "journal items."
-msgstr "如果该科目允许发票和付款核销, 勾选这个选相框"
+msgstr "如果这个科目能够让发票和付款与日记账的匹配就勾选这个框"
 
 #: ../../accounting/others/configuration/account_type.rst:86
 msgid "View *Create Account* in our Online Demonstration"
 msgstr "在我们的在线演示查看 *创建科目*"
 
+#: ../../accounting/others/configuration/fiscal_year.rst:3
+msgid "Manage Fiscal Years"
+msgstr ""
+
+#: ../../accounting/others/configuration/fiscal_year.rst:5
+msgid ""
+"In most cases, the fiscal years last 12 months. If it is your case, you just"
+" have to define what is the last day of your fiscal year in the accounting "
+"settings. By default, it is set on the 31st December."
+msgstr ""
+
+#: ../../accounting/others/configuration/fiscal_year.rst:12
+msgid ""
+"However, there might be some exceptions. For example, if it is the first "
+"fiscal year of your business, it could last more or less than 12 months. In "
+"this case, some additional configuration is required."
+msgstr ""
+
+#: ../../accounting/others/configuration/fiscal_year.rst:16
+msgid ""
+"Go in :menuselection:`accounting --> configuration --> settings` and "
+"activate the fiscal years."
+msgstr ""
+
+#: ../../accounting/others/configuration/fiscal_year.rst:22
+msgid ""
+"You can then configure your fiscal years in :menuselection:`accounting --> "
+"configuration --> fiscal years`."
+msgstr ""
+
+#: ../../accounting/others/configuration/fiscal_year.rst:29
+msgid ""
+"You only have to create fiscal years if they last more or less than 12 "
+"months."
+msgstr ""
+
+#: ../../accounting/others/configuration/fiscal_year.rst:34
+msgid ":doc:`../adviser/fiscalyear`"
+msgstr ""
+
 #: ../../accounting/others/inventory.rst:3
 msgid "Inventory"
 msgstr "库存"
@@ -5707,7 +5987,7 @@ msgstr "平均成本示例"
 #: ../../accounting/others/inventory/avg_price_valuation.rst:117
 #: ../../accounting/others/inventory/avg_price_valuation.rst:144
 msgid "Operation"
-msgstr "作业"
+msgstr "操作"
 
 #: ../../accounting/others/inventory/avg_price_valuation.rst:48
 #: ../../accounting/others/inventory/avg_price_valuation.rst:82
@@ -6182,6 +6462,7 @@ msgstr "在会计设置上, 可以更改汇率差异账的设置."
 
 #: ../../accounting/others/multicurrencies/exchange.rst:109
 #: ../../accounting/payables/pay/multiple.rst:153
+#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:68
 msgid ":doc:`../../bank/reconciliation/configure`"
 msgstr ":doc:`../../bank/reconciliation/configure` "
 
@@ -6502,7 +6783,7 @@ msgstr ":doc:`how_it_works` "
 #: ../../accounting/overview/process_overview/supplier_bill.rst:124
 #: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:106
 msgid "Reporting"
-msgstr "报告"
+msgstr "报表"
 
 #: ../../accounting/others/reporting/customize.rst:3
 msgid "How to create a customized reports with your own formulas?"
@@ -7405,7 +7686,7 @@ msgstr "当你对比发票和付款时，生成了以下条目："
 
 #: ../../accounting/others/taxes/cash_basis_taxes.rst:72
 msgid "Tax Cash Basis Journal"
-msgstr "税金现金收付制日记账"
+msgstr "税率现金收付制日记账"
 
 #: ../../accounting/others/taxes/cash_basis_taxes.rst:78
 msgid "Tax Received Account $15"
@@ -8872,7 +9153,6 @@ msgid "15"
 msgstr "15"
 
 #: ../../accounting/overview/process_overview/customer_invoice.rst:117
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:89
 msgid "Payment"
 msgstr "付款"
 
@@ -9646,7 +9926,7 @@ msgstr "从这个页面上,使用汇总“到期日”功能, 通过数据透视
 
 #: ../../accounting/payables/pay.rst:3
 msgid "Vendor Payments"
-msgstr ""
+msgstr "供应商账单"
 
 #: ../../accounting/payables/pay/check.rst:3
 msgid "Pay by Checks"
@@ -9780,7 +10060,7 @@ msgstr "隐藏付款方式"
 msgid ""
 "Technical field used to hide the payment method if the selected journal has "
 "only one available which is 'manual'"
-msgstr "技术领域用于隐藏的付款方法，如果选择的日记账只有一个可用的是“手动”"
+msgstr "技术领域用于隐藏的付款方法，如果选择的日记账只有一个可用的是 '手动'"
 
 #: ../../accounting/payables/pay/check.rst:0
 msgid "Check: Pay bill by check and print it from Odoo."
@@ -9808,7 +10088,7 @@ msgstr "代码"
 #: ../../accounting/payables/pay/check.rst:0
 msgid ""
 "Technical field used to adapt the interface to the payment type selected."
-msgstr "技术领域中使用的，以适应该接口所选择的付款类型。"
+msgstr "技术字段根据付款方式来调整。"
 
 #: ../../accounting/payables/pay/check.rst:0
 msgid "Check Number"
@@ -9819,7 +10099,7 @@ msgid ""
 "The selected journal is configured to print check numbers. If your pre-"
 "printed check paper already has numbers or if the current numbering is "
 "wrong, you can change it in the journal configuration page."
-msgstr "所选的账簿已配置成打印支票编号。如果支票已有了编号或当前编号是错误的,你可在账簿界面去更改设置。"
+msgstr "被选的日记账被配置成打印支票号码。如果预先印制支票纸已经有号码或者当前的号码是错误的你可以在日记账配置页面改正"
 
 #: ../../accounting/payables/pay/check.rst:80
 msgid "Try paying a supplier bill with a check"
@@ -10261,7 +10541,6 @@ msgstr "用SEPA支付,收款人必须有有效的IBAN和BIC。如果这个提示
 
 #: ../../accounting/payables/pay/sepa.rst:132
 #: ../../accounting/receivables/customer_payments/credit_cards.rst:168
-#: ../../accounting/receivables/customer_payments/followup.rst:168
 #: ../../accounting/receivables/customer_payments/recording.rst:129
 msgid ":doc:`check`"
 msgstr ":doc:`check` "
@@ -10714,177 +10993,80 @@ msgid "Customer Invoices"
 msgstr "客户发票"
 
 #: ../../accounting/receivables/customer_invoices/cash_discounts.rst:3
-msgid "How to setup cash discounts?"
-msgstr "如何设置现金折扣？"
+msgid "Offer cash discounts"
+msgstr ""
 
 #: ../../accounting/receivables/customer_invoices/cash_discounts.rst:5
 msgid ""
-"Cash discounts are an incentive (usually a small percentage) that you offer "
-"to customers in return for paying a bill owed before the scheduled due date."
-" If used properly, cash discounts improve the Days Sales Outstanding aspect "
-"of a business's cash conversion cycle."
-msgstr "现金折扣是一种激励(通常是一个小的比例)，如客户在欠款到期日之前支付账款所享受的折扣。如果使用得当，现金折扣提高了一个企业的现金转换周期。"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:10
-msgid ""
-"For example, a typical cash discount would be: you offer a 2% discount on an"
-" invoice due in 30 days if the customer were to pay within the first 5 days "
-"of receiving the invoice."
-msgstr "例如，一个典型的现金折扣是：提供了一个2%的折扣，到期日为30天，如果客户在收到发票后5天内支付可享受折扣。"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:18
-msgid "Payment terms"
-msgstr "付款条款"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:20
-msgid ""
-"In order to manage cash discounts, we will use the payment terms concept of "
-"Odoo (From the Accounting module, go to :menuselection:`Configuration --> "
-"Management --> Payment terms --> Create`)."
+"Cash discounts are incentives you can offer to customers to motivate them to"
+" pay within a specific time frame. For instance, you offer a 2% discount if "
+"the customer pays you within the first 5 days of the invoice, when it is due"
+" in 30 days. This approach can greatly improve your average collection "
+"period."
 msgstr ""
-"为了管理现金折扣，需要管理付款条款(从会计模块，去 :menuselection:`Configuration --> Management --> "
-"Payment terms --> Create`)."
 
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:24
+#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:12
+msgid "Set up a cash discount"
+msgstr ""
+
+#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:14
 msgid ""
-"Let's start with the above example: a 2% discount on an invoice due in 30 "
-"days if the customer were to pay within the first 5 days."
-msgstr "让我们开始上面的例子：2%折扣，如果客户在开票后5天内支付,账期为30天。"
+"To set up a cash discount, go to :menuselection:`Accounting --> "
+"Configuration --> Management --> Payment Terms` and click on *Create*. Add a"
+" *Percent* type of term with a corresponding value (e.g. 98% of the total "
+"price for a 2% discount) and the number of days during which the offer is "
+"valid. You can also change the default balance term if needed."
+msgstr ""
+
+#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:25
+msgid "Start offering the cash discount"
+msgstr ""
 
 #: ../../accounting/receivables/customer_invoices/cash_discounts.rst:27
 msgid ""
-"A typical payment term of 30 days would have only one installment: balance "
-"in 30 days. But, in order to configure the cash discount, you can configure "
-"the payment term with two installments:"
-msgstr "付款期限为30天，将只有一个部分：余额在30天支付。但是，为了配置现金折扣，您可以配置两个部分："
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:31
-msgid "98% within 5 days"
-msgstr "5天内98%"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:32
-msgid "balance within 30 days"
-msgstr "30天内付清"
+"Now, you can create a customer invoice and select the cash discount payment "
+"term you added. Once the invoice is validated, Odoo will automatically split"
+" the account receivables part of the journal entry into two installments "
+"having different due dates. Since the discounted price is already "
+"calculated, your payment controls will be simplified."
+msgstr ""
 
 #: ../../accounting/receivables/customer_invoices/cash_discounts.rst:37
+msgid "Grant the cash discount"
+msgstr ""
+
+#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:39
 msgid ""
-"To make it clear that it's not a payment term but a cash discount, don't "
-"forget to set a clear description that will appear on the invoice: Invoice "
-"is due within 30 days, but you can benefit from a 2% cash discount if you "
-"pay within 5 days."
-msgstr "这不是一个付款条件，而是现金折扣，不要忘了在发票上做一个明确的描述：发票账期是30天，但如果你在5天内支付, 可享受2%的现金折扣。"
+"The customer fulfilled the payment terms and therefore benefits from the "
+"cash discount. When you process the bank statement, match the payment with "
+"the related journal entry. Then, select the remaining cash discount and "
+"click on *Create Write-off* to reconcile it."
+msgstr ""
 
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:43
-msgid "Bank reconciliation model"
-msgstr "银行对账模型"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:45
+#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:48
 msgid ""
-"In order to speed up the bank reconciliation process, we can create a model "
-"of entry for all cash discounts. To do that, from the Accounting application"
-" dashboard, click on the \"More\" link on the bank and choose the option "
-"\"Reconciliation Models\"."
-msgstr "为了加快银行核销进程，可以建立一个现金折扣的模型。要做到这一点，在会计应用程序的仪表板，在银行上击“更多”的链接，并选择“核销模型”。"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:53
-msgid "Create a new model for cash discounts as follow:"
-msgstr "为现金折扣创建如下类型"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:55
-msgid "**Button Label**: Cash Discount"
-msgstr "**按钮标签**: 现金折扣"
+"You can also create a dedicated reconciliation model to make the process "
+"easier. In this case, you should add a tax to the model based on the taxes "
+"applied to your invoices. This means that if you handle multiple tax rates, "
+"you need to create several reconciliation models. Note that depending on "
+"your localisation, you might already have a Cash Discount model available by"
+" default."
+msgstr ""
 
 #: ../../accounting/receivables/customer_invoices/cash_discounts.rst:56
-msgid "**Account**: Cash Discount (according to your country)"
-msgstr "**科目**: 现金折扣 (根据所在国家)"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:57
-msgid "**Amount Type**: Percentage"
-msgstr "**总额类型**: 百分比"
+msgid "Register the full payment"
+msgstr ""
 
 #: ../../accounting/receivables/customer_invoices/cash_discounts.rst:58
-msgid "**Amount**: 100%"
-msgstr " **合计**:  100%"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:60
-msgid "**Taxes**: depending on your country, you may put a tax on the cash"
-msgstr "**税**: 根据所在国家，可以在现金上设置税"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:60
-msgid "discount if taxes have to be deduced"
-msgstr "如果税收必须推导的折扣"
+msgid ""
+"In this case, the customer has not fulfilled the payment term and cannot "
+"benefit from the cash discount. When you process the bank statement, match "
+"the payment with the two related journal entries."
+msgstr ""
 
 #: ../../accounting/receivables/customer_invoices/cash_discounts.rst:67
-msgid ""
-"Even if it's a 2% cash discount, set a 100% amount on the reconciliation "
-"model as it means 100% of the remaining balance (the 2%). You can use the "
-"same reconciliation model for all your cash discount. No need to create a "
-"model per payment term."
-msgstr "即使2%的现金折扣，设置核销模式，意味着100%的剩余余额(2%)。核销模型可用于所有的现金折扣。没必要每个付款条款创建一个模型。"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:73
-msgid "Creating an invoice with a cash discount"
-msgstr "创建带有现金折扣的发票"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:75
-msgid ""
-"When you create a customer invoice, set the right payment term \"30 days, 2%"
-" cash discount\" right after having selected the customer."
-msgstr "当创建一张客户发票，选择客户后设置正确的付款条款“30天，2%现金折扣”。"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:81
-msgid ""
-"Once the invoice is validated, Odoo will automatically split the account "
-"receivable part of the journal entry with two installments having a "
-"different due date: 98% within 5 days, 2% within 30 days."
-msgstr "一旦发票确认后，Odoo将自动将应收账款按不同到期日分成2部分：98% 5天，2% 30天。"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:92
-msgid "Paying the invoice with a cash discount"
-msgstr "支付带有现金折扣的发票"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:94
-msgid ""
-"If the customer pays with a cash discount, when processing the bank "
-"statement, you will match the payment (98%) with the related line in the "
-"journal entry."
-msgstr "如果客户使用现金折扣，当处理银行对账单时，将付款(98%)与凭证中的相关行关联。"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:101
-msgid ""
-"As you can see in the above screenshot, when selecting the customer, you "
-"also see the 2% remaining of 3$. If you want to accept the cash discount (if"
-" the customer paid within the 5 days), you can click on this line with 2%, "
-"click on \"Open Balance\", and select your \"Cash Discount\" reconciliation "
-"model. That way, the invoice is marked as fully paid."
+msgid ":doc:`../../receivables/customer_invoices/payment_terms`"
 msgstr ""
-"正如上面的截图，当选择客户时，能看到了2%的余款 "
-"3美元。如果你想接受现金折扣(如果客户在5天内支付)，你可以点击2%这行，点击“开放平衡”，并选择你的“现金折扣”的核销模式。这样，发票被标记为完全支付。"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:109
-msgid ""
-"from now on, matching the remaining 2% has to be done manually. In the "
-"future, we plan to automate the reconciliation of the 2% if the 98% are paid"
-" on time."
-msgstr "从现在起，剩下的2%必须手动完成匹配。在未来，我们计划自动核销2%，如果98%是按时支付。"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:113
-msgid "Paying the invoice in full"
-msgstr "全额付款"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:115
-msgid ""
-"If the customer pays the invoice fully, without benefiting from the cash "
-"discount, you will reconcile the payment (in full) with the two lines from "
-"the invoice (98% and 2%). Just click on the two lines to match them with the"
-" payment."
-msgstr "如果客户全额支付，没有使用现金折扣，将付款(完全)与发票的两行(98%和2%)核销。只需点击这两行，与付款核销。"
-
-#: ../../accounting/receivables/customer_invoices/cash_discounts.rst:125
-#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:116
-#: ../../accounting/receivables/customer_invoices/installment_plans.rst:86
-msgid ":doc:`overview`"
-msgstr ":doc:`overview` "
 
 #: ../../accounting/receivables/customer_invoices/cash_rounding.rst:2
 msgid "Set up cash roundings"
@@ -11143,6 +11325,11 @@ msgstr ""
 "\t\t\n"
 "分析所有含有递延收入的合同，可使用菜单Reporting > Deferred Revenue Analysis."
 
+#: ../../accounting/receivables/customer_invoices/deferred_revenues.rst:116
+#: ../../accounting/receivables/customer_invoices/installment_plans.rst:86
+msgid ":doc:`overview`"
+msgstr ":doc:`overview` "
+
 #: ../../accounting/receivables/customer_invoices/installment_plans.rst:3
 msgid "How to define an installment plan on customer invoices?"
 msgstr "如何为客户发票制定分期付款计划?"
@@ -11237,7 +11424,7 @@ msgstr "如果发票包含一个付款条款，相关的凭证将不同。没有
 #: ../../accounting/receivables/customer_invoices/payment_terms.rst:58
 #: ../../accounting/receivables/customer_invoices/payment_terms.rst:70
 msgid "Due date"
-msgstr "截止日期"
+msgstr "到期日期"
 
 #: ../../accounting/receivables/customer_invoices/installment_plans.rst:66
 #: ../../accounting/receivables/customer_invoices/payment_terms.rst:65
@@ -11380,7 +11567,7 @@ msgstr "在全部付款完成后, 电商订单也会触发订单的创建, 如
 
 #: ../../accounting/receivables/customer_invoices/overview.rst:70
 msgid "Contracts"
-msgstr "合约"
+msgstr "合同"
 
 #: ../../accounting/receivables/customer_invoices/overview.rst:73
 msgid "Regular Contracts ‣ Invoices"
@@ -11679,315 +11866,6 @@ msgstr "退票不同于退款。通常情况下，在客户未付款前可退票
 msgid "Customer Payments"
 msgstr "客户付款"
 
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:3
-msgid "How to automate customer follow-ups with plans?"
-msgstr "如何自动有计划地跟进客户？"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:5
-msgid ""
-"With the Odoo Accounting application, you get a dynamic aged receivable "
-"report, customer statements and you can easily send them to customers."
-msgstr "在会计应用，你会得到一个动态的应收款报表，客户对账表，可发送给客户。"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:8
-msgid ""
-"If you want to go further in the automation of the credit collection "
-"process, you can use follow-up plans. They will help you automate all the "
-"steps to get paid, by triggering them at the right time: send customer "
-"statements by emails, send regular letter (through the Docsaway "
-"integration), create a task to manually call the customer, etc..."
-msgstr ""
-"如果你想进一步自动化信用收集，可使用跟踪计划。他们会帮助你自动完成收款所有的步骤：将客户对账单电子邮件给客户，定期发封信(通过docsaway集成)，创建一个任务，手动打电话给客户，等等..."
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:14
-msgid "Here is an example of a plan:"
-msgstr "这里是一项计划的例子 :"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:17
-msgid "When?"
-msgstr "何时？"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:17
-msgid "What?"
-msgstr "什么？"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:17
-msgid "Who?"
-msgstr "谁？"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:19
-msgid "3 days before due date"
-msgstr "3天后过期"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:19
-msgid "Email"
-msgstr "电子邮箱"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:19
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:21
-msgid "automated"
-msgstr "自动的"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:21
-msgid "1 day after due date"
-msgstr "1 天后过期"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:21
-msgid "Email + Regular Letter"
-msgstr "电子邮件 + 定期信件"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:23
-msgid "15 days after due date"
-msgstr "15 天后过期"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:23
-msgid "Call the customer"
-msgstr "致电客户"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:23
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:25
-msgid "John Mac Gregor"
-msgstr "John Mac Gregor"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:25
-msgid "35 days after due date"
-msgstr "35天后过期"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:25
-msgid "Email + Letter + Call"
-msgstr "电子邮件 + 信件 + 电话"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:27
-msgid "60 days after due date"
-msgstr "60 天后过期"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:27
-msgid "Formal notice"
-msgstr "正式通知"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:27
-msgid "Bailiff"
-msgstr "Bailiff"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:34
-msgid "Install Reminder Module"
-msgstr "安装提醒模块"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:36
-msgid ""
-"You must start by activating the feature, using the menu "
-":menuselection:`Configuration --> Settings` of the Accounting application. "
-"From the settings screen, activate the feature **Enable payment follow-up "
-"management**."
-msgstr ""
-"你必须先激活功能，使用菜单 :menuselection:`Configuration --> Settings` .  "
-"从设置界面，激活功能**Enable payment follow-up management**."
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:44
-msgid "Define Payment Follow-ups Levels"
-msgstr "定义付款追踪等级"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:46
-msgid ""
-"To automate customer follow ups, you must configure your follow–up levels "
-"using the menu :menuselection:`Accounting --> Configuration --> Payment "
-"Follow-ups`. You should define one and only one follow-up plan per company."
-msgstr ""
-"自动化的跟进客户，必须配置, 菜单:`Accounting --> Configuration --> Payment Follow-ups`. "
-"你应该定义一个公司，每个公司只有一个跟进计划。"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:50
-msgid ""
-"The levels of follow-up are relative to the due date; when no payment term "
-"is specified, the invoice date will be considered as the due date."
-msgstr "跟进关联到期日；当没有付款条款时，发票日期将视为到期日。"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:53
-msgid ""
-"For each level, you should define the number of days and create a note which"
-" will automatically be added into the reminder letter."
-msgstr "对于每一个级别，应定义天数，并创建一个将自动添加到提醒函中的说明。"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:59
-msgid "Odoo defines several actions for every reminder:"
-msgstr "Odoo为每个提醒定义了几个行动 :"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:61
-msgid ""
-"**Manual Action:** assign a responsible that will have to call the customer"
-msgstr "* *手动操作：**指定一个电话给客户的负责人"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:62
-msgid "**Send an Email:** send an email to customer using the provided text"
-msgstr " **发送一个邮件 :** 使用所提供的文本发送一封电子邮件给客户"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:63
-msgid ""
-"**Send a Letter:** send a letter by regular mail, using the provided note"
-msgstr " **发送一个信件 :** 使用提供的备注, 通过定期邮件发送一个信件"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:69
-msgid ""
-"As you need to provide a number of days relative to the due date, you can "
-"use a negative number. As an example, if an invoice is issued the January "
-"1st but the due date is January 20, if you set a reminder 3 days before the "
-"due date, the customer may receive an email in January 17."
-msgstr ""
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:76
-msgid "Doing your weekly follow-ups"
-msgstr "每周做的跟进工作"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:78
-msgid ""
-"Once everything is setup, Odoo will prepare follow-up letters and emails "
-"automatically for you. All you have to do is to the menu "
-":menuselection:`Sales --> Customers Statement` in the accounting "
-"application."
-msgstr ""
-"一旦一切设置好，Odoo将自动发送跟进信件和邮件。必须的设置, 在菜单:menuselection:`Sales --> Customers "
-"Statement`."
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:85
-msgid ""
-"Odoo will automatically propose you actions based on the follow-up plan you "
-"defined, invoices to pay and payment received."
-msgstr "Odoo会基于定义的跟踪计划自动建议后续行动，收支款项。"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:88
-msgid ""
-"You can use this menu every day, once a week or once a month. You do not "
-"risk to send two times the same reminder to your customer. Odoo only "
-"proposes you the action you have to do. If you do it every day, you will "
-"have a few calls to do per day. If you do it once a month, you will have "
-"much more work once you do it."
-msgstr ""
-"你可每天，每周或每月一次使用这个菜单。你不用担心发送多次提醒给客户。Odoo只会提醒必做的工作。如果你每天都这样做，你每天都会有几个电话。如果你一个月做一次，工作会囤积得比较多。"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:94
-msgid ""
-"It's up to you to organize the way you want to work. But it's a good "
-"practice to reconcile your bank statements before launching the follow-ups. "
-"That way, all paid invoices will be reconciled and you will not send a "
-"follow-up letter to a customer that already paid his invoice."
-msgstr "由你来决定工作的方式。但运行跟踪行动前, 请先将银行对账单核销。这样，所有的支付发票将被核销，以免给已付款的客户发送催款信。"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:99
-msgid "From a customer follow-up proposition, you can:"
-msgstr "通过客户跟进提议, 你可以:"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:101
-msgid "Get the customer information to contact him"
-msgstr "取得客户的联系方式并联系他"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:103
-msgid "Drill down to the customer information form by clicking on its name"
-msgstr "点击名字，下拉客户信息表"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:105
-msgid "Change the text (or the email or letter) and adapt to the customer"
-msgstr "更改文本(或电子邮件或信)使之适应客户"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:107
-msgid ""
-"Change the colored dot to mark the customer as being a good, normal or bad "
-"debtor"
-msgstr "更改彩色点标记客户为好、一般或差债务人"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:110
-msgid "Log a note is you called the customer"
-msgstr "将你联系过客户的相关信息记录一下"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:112
-msgid "Exclude some invoices from the statement table (litigation)"
-msgstr "对账单不含这些发票(诉讼)"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:114
-msgid "Send an email with the statement"
-msgstr "发送一份账单邮件"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:116
-msgid ""
-"Print a letter, or send a regular mail (if you installed the Docsaway "
-"integration)"
-msgstr "打印一封信, 或发送定期邮件 (如果您安装了 Docsaway 集成)"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:119
-msgid ""
-"Plan the next reminder (but it's better to keep in automatic mode so that "
-"Odoo will stick to the follow-up plan of the company)"
-msgstr "计划下次提醒(但最好在自动模式下，Odoo将自动进行公司的跟踪计划)"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:122
-msgid "Drill down to an invoice"
-msgstr "深入一张发票"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:124
-msgid ""
-"Change the expected payment date of an invoice (thus, impacting the next "
-"time Odoo will propose you to send a reminder)"
-msgstr "更改发票的预期的付款日期 (因此, 影响下一次 Odoo 建议您发送提醒的时间)"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:128
-msgid ""
-"You can force a customer statement, even if Odoo do not proposes you to do "
-"it, because it's not the right date yet. To do this, you should go to the "
-"Aged Receivable report (in the report menu of the Accounting application). "
-"From this report, you can click on a customer to get to his customer "
-"statement."
-msgstr ""
-"你可以查看客户对账单，即使Odoo因为未到日期没有建议你这样做。要做到这一点，去应收账龄表(在会计应用程序下的报表菜单)。从这份报告中，你可以点击一个客户,"
-" 可看到客户对账单。"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:135
-msgid "How to exclude an invoice from auto follow up?"
-msgstr "如何从自动催款里面排除发票？"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:137
-msgid "To see all **overdue invoices** or **on need of action**,"
-msgstr "查看所有 **逾期发票** 或 **需要的行动** "
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:139
-msgid "Go to :menuselection:`Accounting --> Sales --> Customers Statement`"
-msgstr ""
-"转到 :menuselection:`会计(Accounting) -->销售(Sales) -->客户对账单(Customers "
-"Statement)` "
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:145
-msgid "Exclude a specific invoice for a specific date"
-msgstr "排除特定日期的特定日期"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:147
-msgid ""
-"Odoo can exclude an invoice from follow-ups actions for specific date by "
-"clicking on **Log a Note**, then choose one of the ready options (*one "
-"week*, *two weeks*, *one month*, *two months*), So Odoo will calculate the "
-"required date according to the current date."
-msgstr ""
-"点击**Log a Note**, 在跟踪计划时可不含这些发票，然后选择一个选项(*一周*，* "
-"两周*，*一个月*，*两个月*)，所以Odoo会根据当前日期计算所需的时间。"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:155
-msgid ""
-"Another way to achieve it is the following: click on the required invoice, "
-"then choose **Change expected payment date/note**, then enter a new payment "
-"date and note."
-msgstr "另一种方法也可以实现：点击所需的发票，然后选择**更改预期的付款日期/说明**，然后输入一个新的付款日期和说明。"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:162
-msgid "Exclude a specific invoice forever"
-msgstr "永久的排除特定的发票"
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:164
-msgid ""
-"Odoo can exclude an invoice for a specific customer by clicking on the "
-"checkbox **Excluded**"
-msgstr "Odoo 可以为特定客户免开发票 , 通过点击复选框 **排除** "
-
-#: ../../accounting/receivables/customer_payments/automated_followups.rst:168
-msgid "If you click on **History**, you can see all follow ups actions."
-msgstr "如果你点击了 **历史记录** , 你可以看到所有的后续操作。"
-
 #: ../../accounting/receivables/customer_payments/check.rst:3
 msgid "How to register customer payments by checks?"
 msgstr "如何用支票登记客户付款？"
@@ -12390,7 +12268,6 @@ msgstr ""
 "如果您使用这种方法来管理收到的付款，您可使用报告**银行余额调节表**来核实银行已收到或由银行支付的付款。(本报告可从* *更多 * *进入)。"
 
 #: ../../accounting/receivables/customer_payments/credit_cards.rst:166
-#: ../../accounting/receivables/customer_payments/followup.rst:167
 msgid ":doc:`recording`"
 msgstr ":doc:`recording` "
 
@@ -12405,235 +12282,95 @@ msgid ":doc:`followup`"
 msgstr ":doc:`followup` "
 
 #: ../../accounting/receivables/customer_payments/followup.rst:3
-msgid "How to get paid and organize customer follow-ups?"
-msgstr "如何收款以及组织客户回款？"
+msgid "Follow-up on invoices and get paid faster"
+msgstr ""
 
 #: ../../accounting/receivables/customer_payments/followup.rst:5
 msgid ""
-"Getting paid and organizing customer reminders is always a difficult task, "
-"however it is critical for the health of the company to stay diligent about "
-"outstanding receivables. Fortunately, Odoo provides the right tools to track"
-" receivables, automate customer statements, and measure your performance."
+"It is essential for your business to collect payments when they are overdue."
+" Odoo will help you identify payments that are late and will allow you to "
+"send the appropriate reminders."
 msgstr ""
-"催款和提醒客户付款一直是一项艰巨的任务，然而，它是对公司的健康运行又至关重要的。幸运的是，Odoo提供此项功能来跟踪应收账款、自动更新客户往来账户报表，并评价客户情况。"
 
-#: ../../accounting/receivables/customer_payments/followup.rst:12
-msgid "Customer follow-ups: A step by step guide"
-msgstr "客户跟踪：每步的操作指南"
+#: ../../accounting/receivables/customer_payments/followup.rst:10
+msgid "Manage your follow-ups"
+msgstr ""
 
-#: ../../accounting/receivables/customer_payments/followup.rst:15
-msgid "Cleaning up outstanding payments"
-msgstr "清理未清付款"
+#: ../../accounting/receivables/customer_payments/followup.rst:13
+msgid ""
+"We recommend that you reconcile your bank statements before launching your "
+"follow-up process. It will avoid you the trouble of sending a statement to a"
+" customer that has already paid you."
+msgstr ""
 
 #: ../../accounting/receivables/customer_payments/followup.rst:17
 msgid ""
-"If you have any unreconciled transactions in your bank account, you will "
-"need to process them first before you begin analyzing your customers "
-"statements. This ensures that you have recorded all of the latest customer "
-"payments before sending out reminders to any customers with outstanding "
-"balances."
-msgstr "如果你的银行帐户有未核销的交易，在分析客户之前, 需要处理干净。这确保在发出未清余款前, 您已更新了所有的最新的付款情况。"
+"The overdue invoices you need to follow-up on are available by default in "
+":menuselection:`Accounting --> Sales --> Follow-up Reports`. There, you can "
+"easily send a reminder by email or print it as a letter. Then, you can click"
+" on the *Done* button to view the next follow-up that needs your attention."
+msgstr ""
 
-#: ../../accounting/receivables/customer_payments/followup.rst:27
-msgid "Checking the Aged Receivables report"
-msgstr "核对应收款项账龄表"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:29
+#: ../../accounting/receivables/customer_payments/followup.rst:23
 msgid ""
-"After you have reconciled all of your bank accounts, you can then generate "
-"an accurate Aged Receivables Report from the Reports menu. This report will "
-"display all of the customers and their outstanding balances on open "
-"invoices."
-msgstr "核销所有的银行科目后，就可以得到准确的应收账龄表。报表显示所有的客户及未清余额。"
+"Otherwise, if now is not the time for a reminder, click on *Remind me "
+"later*. You will get the next report according to the *Next Reminder Date* "
+"set on the statement."
+msgstr ""
 
-#: ../../accounting/receivables/customer_payments/followup.rst:37
+#: ../../accounting/receivables/customer_payments/followup.rst:28
 msgid ""
-"The report displays this information in time increments to better paint a "
-"picture of the outstanding balances your customers hold and for how long "
-"they have held these outstanding balances. You can then appropriately focus "
-"your efforts on the appropriate customers."
-msgstr "报告显示客户的未清余额及欠账时间。然后，你可以适当地集中催讨款项。"
+"To avoid sending too many reminders in a short period of time, change the "
+"number of days calculated between each report by going to "
+":menuselection:`Accounting --> Configuration --> Settings --> Payment "
+"Follow-up`."
+msgstr ""
+
+#: ../../accounting/receivables/customer_payments/followup.rst:33
+msgid ""
+"You can also set a trust level for your customers by marking them as bad, "
+"normal or good debtors on the follow-up reports."
+msgstr ""
+
+#: ../../accounting/receivables/customer_payments/followup.rst:40
+msgid "Send reminders in batch"
+msgstr ""
 
 #: ../../accounting/receivables/customer_payments/followup.rst:42
 msgid ""
-"You can then select any of the customers on this list and Odoo will open up "
-"their invoice details in the form of the Customer Follow-Up letter, also "
-"known as the **Customer Statement**."
-msgstr "你可以选择清单上的任何一个客户，Odoo将把发票明细放入催款信，也被称为**客户声明**。"
+"To get your follow-up process easier, you can send reminder emails in batch "
+"from your follow-up reports page. Select all the reports you would like to "
+"process, click on *Action* and then on *Process Follow-ups*. A pdf document "
+"containing all of the follow-up letters for you to print will also be "
+"automatically generated."
+msgstr ""
 
-#: ../../accounting/receivables/customer_payments/followup.rst:49
-msgid "From the customer statement, you can:"
-msgstr "通过客户对账表, 你可以:"
+#: ../../accounting/receivables/customer_payments/followup.rst:52
+msgid "Plan a follow-up process"
+msgstr ""
 
-#: ../../accounting/receivables/customer_payments/followup.rst:51
-msgid "Change and customize the message that is sent to the customer"
-msgstr "更改和自定义发送给客户的信息"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:53
-msgid "Send a reminder email to the customer"
-msgstr "发送提醒邮件给客户"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:55
-msgid "Send a printed reminder letter to the customer"
-msgstr "发送打印的提示信的客户"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:57
-msgid "Send automated printed reminders by utilizing our Docsaway integration"
-msgstr "通过utilizing our Docsaway integration自动发送提醒."
-
-#: ../../accounting/receivables/customer_payments/followup.rst:60
-msgid "Zoom in on the different open invoices or payments"
-msgstr "放大不同的未清发票或付款"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:62
-msgid "Remove an invoice or payment from the report (in case of conflict)"
-msgstr "从报告中删除发票或付款(如有冲突)"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:64
-msgid "Log any call notes made to the customer"
-msgstr "记录客户的所有通话记录"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:66
+#: ../../accounting/receivables/customer_payments/followup.rst:54
 msgid ""
-"Schedule your next follow up task to stay on top of customer payments (e.g. "
-"call back in 15 days if not payments are made)"
-msgstr "安排你的下一个任务，保持客户付款的最优先级别(例如，如果没有付款，请在15天内回电)"
+"To plan a follow-up process, go to :menuselection:`Accounting --> "
+"Configuration --> Settings` and activate the *Follow-up Levels* feature "
+"under the *Customer Payments* section. Then, click on the new *Follow-up "
+"Levels* button that has appeared on your settings page."
+msgstr ""
+
+#: ../../accounting/receivables/customer_payments/followup.rst:59
+msgid ""
+"A follow-up plan with several actions is available by default in Odoo, but "
+"you can customize it any way you want. Depending on a specific number of "
+"overdue days, plan to send an email, a letter or to undertake a manual "
+"action. You can also edit the template used for the statement according to "
+"the stage of the process."
+msgstr ""
 
 #: ../../accounting/receivables/customer_payments/followup.rst:69
 msgid ""
-"You can set reminders for when you would like to next contact the particular"
-" customer. Selecting **Manual** will open up the follow up scheduling tool, "
-"while selecting **Auto** will automatically recommend that you contact the "
-"customer 15 days from then if the customer has not yet paid for the invoice."
-" Installing the **Follow-Up Plans** module will allow you to define "
-"automated actions and intervals to send reminders."
+"If you would like to get a reminder before the actual due date, set a "
+"negative number of due days."
 msgstr ""
-"当您计划下一次联系这个客户,可以设置提醒. "
-"选择**手动**将打开后续的安排，同时选择***自动**将自动建议您15天后联系客户，从那时起计算，如果客户仍未支付发票。安装**跟踪计划**模块将允许定义自动操作和设置发送提醒的时间间隔。"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:79
-msgid ""
-"If you have already sent out a reminder to a customer a few days ago, a "
-"warning message will appear at the top of the screen, reminding you that you"
-" should not send another reminder so soon since one was already sent "
-"recently. Every time you log a note, Odoo will automatically set the next "
-"reminder date, unless you choose to manually set it by selecting the next "
-"reminder button at the top right of the screen."
-msgstr ""
-"如果几天前你已经向客户发出了一个提醒，在屏幕的顶部将出现一个警告信息，提醒你不用再发提醒，因为最近刚发送了一个提醒。每一次登录日志，Odoo将自动设置一个提醒日期，除非你用屏幕的右上方提醒按钮选择手动设置。"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:88
-msgid ""
-"You can also specify the expected payment date on an invoice line directly, "
-"therefore defining the next reminder in case the invoice has not been paid."
-msgstr "您也可以直接在发票上指定预期的付款日期，如发票没有被支付，定义下一个提醒。"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:92
-msgid "Sending customer statements"
-msgstr "发送客户对账单"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:94
-msgid ""
-"Send your customers reminders in batches in the menu :menuselection:`Sales "
-"--> Customer Statements`."
-msgstr "在菜单中分批发送您的客户提醒 :菜单选择:`销售-->客户报表` ."
-
-#: ../../accounting/receivables/customer_payments/followup.rst:97
-msgid ""
-"Here Odoo will open all the statements awaiting to be processed, which is "
-"determined by the last reminder they received. You can choose to process "
-"them one by one, send multiple letters or emails in batches, or set a next "
-"action date for the next time they'll be contacted."
-msgstr "这将打开所有待处理报表，这些都已确认发出提醒。你可以选择一个一个处理，发送批量发送信或电子邮件，或设置下一个联系时间。"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:104
-msgid ""
-"If an invoice has not yet been paid, Odoo will remind you to contact at "
-"particular customer based after their next action date."
-msgstr "如果发票尚未支付，Odoo将提醒你设置联系提醒日期。"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:107
-msgid ""
-"You can access the customer statement report daily and Odoo will only "
-"display the customers you need to contact on any given day. This is based "
-"on:"
-msgstr "您可以每天查看客户对账单, 报表将只显示指定日期。这可基于："
-
-#: ../../accounting/receivables/customer_payments/followup.rst:111
-msgid "Customers you have not yet received a payment from"
-msgstr "未付款客户"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:113
-msgid ""
-"Customers that have not been reminded over the last X days (\"X\" being "
-"defined as the overdue date of the invoice after the first reminder, then "
-"the next action date set at every reminder)"
-msgstr "在最后的X天, 没有提醒客户(“X”被定义为第一次提醒后发票的逾期日期，下一次的设置为以后的每一个提醒)"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:118
-msgid "Setting up your dunning process"
-msgstr "设置你的催款过程"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:120
-msgid ""
-"The **Payment Follow-up Management** module allows you to define reminder "
-"plans. After installing it from the **Apps** menu, go to the **Follow-up "
-"Levels** menu in the accounting configuration to set up your dunning "
-"process."
-msgstr "**付款后续管理**模块可定义提醒计划。在**应用程序**菜单中安装，去**跟进水平**菜单设置催款过程。"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:125
-msgid "Some Examples are:"
-msgstr "举一些例子："
-
-#: ../../accounting/receivables/customer_payments/followup.rst:127
-msgid "**Email**: 3 days before overdue date"
-msgstr " **Email**:  截止日期前3天"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:129
-msgid "**Email+Letter**: at the overdue date"
-msgstr " **Email+Letter**:  在截止日"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:131
-msgid "**Email+Call**: 15 days after the overdue date"
-msgstr " **Email+Call**:  截止日期后 15 天"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:133
-msgid "**Email+Letter**: 60 days after the overdue date"
-msgstr " **Email+Letter**:  截止日期后60天"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:138
-msgid ""
-"Thanks to this module, you can send every email and letters in batches for "
-"all your customers at once. The next reminder will automatically be computed"
-" based on your configured follow-up plan."
-msgstr "由于这个模块，可批量发送邮件和信件给客户。下个提醒将自动基于配置的后续计划完成。"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:142
-msgid ""
-"The module will also add a red/green dot on each customer, this will allow "
-"you to easily mark customer status's with the following options: \"Good "
-"Debtor, Normal Debtor, or bad debtors."
-msgstr "该模块将为每个客户添加一个红色/绿色的点，这将让你轻松标记不同状态的客户, 状态有以下选项：“优质债务人，正常债务人，或劣质债务人。"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:150
-msgid "DSO: Measuring your performance"
-msgstr "DSO:评估你的绩效"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:152
-msgid ""
-"The DSO (Days of Outstanding Sales) is a measure of the average number of "
-"days that a company takes to collect revenue after a sale has been made. DSO"
-" is calculated by dividing the amount of accounts receivable during a given "
-"period by the total value of credit sales during the same period, and "
-"multiplying the result by the number of days in the period measured."
-msgstr "DSO(未清款项天数)是一个平均天数，是销售到收款的天数。DSO是所有销售款除以已收到款项, 再乘以这段期间的天数得出。"
-
-#: ../../accounting/receivables/customer_payments/followup.rst:159
-msgid ""
-"You can get the DSO of your company from the Executive Summary report under "
-"Reporting (check the KPI average debtors days)."
-msgstr "你可以从报告下的执行概要得到你公司的DSO (检查KPI平均债务人天数)"
 
 #: ../../accounting/receivables/customer_payments/payment_sepa.rst:3
 #: ../../accounting/receivables/customer_payments/payment_sepa.rst:29
diff --git a/locale/zh_CN/LC_MESSAGES/applications.po b/locale/zh_CN/LC_MESSAGES/applications.po
index 385f4fd65..be3f89bb1 100644
--- a/locale/zh_CN/LC_MESSAGES/applications.po
+++ b/locale/zh_CN/LC_MESSAGES/applications.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2015-TODAY, Odoo S.A.
-# This file is distributed under the same license as the Odoo Business package.
+# This file is distributed under the same license as the Odoo package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 10.0\n"
+"Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-07 09:30+0200\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: liAnGjiA <liangjia@qq.com>, 2017\n"
+"Last-Translator: Jeffery CHEN Fan <jeffery9@gmail.com>, 2018\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,4 +20,4 @@ msgstr ""
 
 #: ../../applications.rst:3
 msgid "Applications"
-msgstr "应用模块"
+msgstr "应用"
diff --git a/locale/zh_CN/LC_MESSAGES/discuss.po b/locale/zh_CN/LC_MESSAGES/discuss.po
index 02a2c5be4..b6ceb811f 100644
--- a/locale/zh_CN/LC_MESSAGES/discuss.po
+++ b/locale/zh_CN/LC_MESSAGES/discuss.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-27 11:08+0200\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: fausthuang, 2018\n"
+"Last-Translator: Kate Lee <kateleelpk@gmail.com>, 2018\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,23 +30,32 @@ msgstr ""
 msgid ""
 "This document is mainly dedicated to Odoo on-premise users who don't benefit"
 " from an out-of-the-box solution to send and receive emails in Odoo, unlike "
-"in `Odoo Online <https://www.odoo.com/trial>`__ & `Odoo.sh "
+"`Odoo Online <https://www.odoo.com/trial>`__ & `Odoo.sh "
 "<https://www.odoo.sh>`__."
 msgstr ""
 
 #: ../../discuss/email_servers.rst:9
 msgid ""
 "If no one in your company is used to manage email servers, we strongly "
-"recommend that you opt for such convenient Odoo hosting solutions. Indeed "
-"their email system works instantly and is monitored by professionals. "
-"Nevertheless you can still use your own email servers if you want to manage "
-"your email server's reputation yourself."
+"recommend that you opt for those Odoo hosting solutions. Their email system "
+"works instantly and is monitored by professionals. Nevertheless you can "
+"still use your own email servers if you want to manage your email server's "
+"reputation yourself."
 msgstr ""
 
 #: ../../discuss/email_servers.rst:15
 msgid ""
-"You will find here below some useful information to do so by integrating "
-"your own email solution with Odoo. .. note::"
+"You will find here below some useful information on how to integrate your "
+"own email solution with Odoo."
+msgstr ""
+
+#: ../../discuss/email_servers.rst:18
+msgid ""
+"Office 365 email servers don't allow easiliy to send external emails from "
+"hosts like Odoo. Refer to the `Microsoft's documentation "
+"<https://support.office.com/en-us/article/How-to-set-up-a-multifunction-"
+"device-or-application-to-send-email-using-"
+"Office-365-69f58e99-c550-4274-ad18-c805d654b4c4>`__ to make it work."
 msgstr ""
 
 #: ../../discuss/email_servers.rst:24
@@ -483,6 +492,27 @@ msgid ""
 "their *Category* is set as *Meeting*."
 msgstr ""
 
+#: ../../discuss/plan_activities.rst:40
+msgid "Schedule a chain of activities to follow"
+msgstr ""
+
+#: ../../discuss/plan_activities.rst:42
+msgid ""
+"Odoo helps you easily plan your usual flow of activities. Go to "
+":menuselection:`Configuration --> Activity Types` and set the common "
+"following steps as *Recommended next activities*."
+msgstr ""
+
+#: ../../discuss/plan_activities.rst:49
+msgid ""
+"Now, when an activity is completed, you can select *Done & schedule next*. "
+"The next steps will automatically be suggested to you."
+msgstr ""
+
+#: ../../discuss/plan_activities.rst:55
+msgid "Have fun getting better organized by planning activities !"
+msgstr ""
+
 #: ../../discuss/team_communication.rst:3
 msgid "How to efficiently communicate in team using channels"
 msgstr "如何通过频道与团队进行有效沟通"
diff --git a/locale/zh_CN/LC_MESSAGES/ecommerce.po b/locale/zh_CN/LC_MESSAGES/ecommerce.po
index 93bb678be..a22bf5b5e 100644
--- a/locale/zh_CN/LC_MESSAGES/ecommerce.po
+++ b/locale/zh_CN/LC_MESSAGES/ecommerce.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2015-TODAY, Odoo S.A.
-# This file is distributed under the same license as the Odoo Business package.
+# This file is distributed under the same license as the Odoo package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 10.0\n"
+"Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-10 09:08+0200\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: e2f_cn c5 <jarvisn@ecinnovations.com>, 2018\n"
+"Last-Translator: 老窦 北京 <2662059195@qq.com>, 2018\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,7 +24,7 @@ msgstr "电子商务"
 
 #: ../../ecommerce/getting_started.rst:3
 msgid "Get started"
-msgstr "启动"
+msgstr "开始"
 
 #: ../../ecommerce/getting_started/catalog.rst:3
 msgid "How to customize my catalog page"
@@ -610,7 +610,7 @@ msgstr "在产品Web页面的*自定义*菜单中打开*替代品*。"
 
 #: ../../ecommerce/overview.rst:3
 msgid "Overview"
-msgstr "概述"
+msgstr "概览"
 
 #: ../../ecommerce/overview/introduction.rst:3
 msgid "Introduction to Odoo eCommerce"
@@ -848,11 +848,11 @@ msgstr "Adyen"
 
 #: ../../ecommerce/shopper_experience/payment.rst:31
 msgid "Buckaroo"
-msgstr "Buckaroo"
+msgstr "牛仔"
 
 #: ../../ecommerce/shopper_experience/payment.rst:32
 msgid "PayUmoney"
-msgstr "PayUmoney"
+msgstr "付给你钱"
 
 #: ../../ecommerce/shopper_experience/payment.rst:33
 msgid "Sips"
diff --git a/locale/zh_CN/LC_MESSAGES/general.po b/locale/zh_CN/LC_MESSAGES/general.po
index 517e56e8d..818391d0a 100644
--- a/locale/zh_CN/LC_MESSAGES/general.po
+++ b/locale/zh_CN/LC_MESSAGES/general.po
@@ -1,14 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2015-TODAY, Odoo S.A.
-# This file is distributed under the same license as the Odoo Business package.
+# This file is distributed under the same license as the Odoo package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 10.0\n"
+"Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-10 09:08+0200\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: 凡 杨 <sailfan_yang@qq.com>, 2018\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: ../../general.rst:5
 msgid "General"
-msgstr "常规"
+msgstr "一般"
 
 #: ../../general/auth.rst:3
 msgid "Authentication"
@@ -792,10 +792,6 @@ msgid ""
 "users>`_"
 msgstr "禁止用户<../../db_management/documentation.html#deactivating-users>`"
 
-#: ../../general/odoo_basics/add_user.rst:46
-msgid ":doc:`../../crm/salesteam/setup/create_team`"
-msgstr ":doc:`../../crm/salesteam/setup/create_team`"
-
 #: ../../general/odoo_basics/choose_language.rst:3
 msgid "Manage Odoo in your own language"
 msgstr "使用简体中文语言管理操作Odoo"
diff --git a/locale/zh_CN/LC_MESSAGES/getting_started.po b/locale/zh_CN/LC_MESSAGES/getting_started.po
index 8f4c2ec50..f7d6fdf9b 100644
--- a/locale/zh_CN/LC_MESSAGES/getting_started.po
+++ b/locale/zh_CN/LC_MESSAGES/getting_started.po
@@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-07-26 12:01+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: liAnGjiA <liangjia@qq.com>, 2017\n"
+"Last-Translator: Connie Xiao <connie.xiao@elico-corp.com>, 2018\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -290,7 +290,7 @@ msgid ""
 "Introduction Videos: `https://www.odoo.com/r/videos "
 "<https://www.odoo.com/r/videos>`__"
 msgstr ""
-"介绍视频 :`https: //www.odoo.com/r/videos <https ://www.odoo.com/r/videos>` __"
+"介绍视频 :`https://www.odoo.com/r/videos <https ://www.odoo.com/r/videos>` __"
 
 #: ../../getting_started/documentation.rst:170
 msgid ""
@@ -373,8 +373,8 @@ msgid ""
 "Odoo Online Security: `https://www.odoo.com/page/security "
 "<https://www.odoo.com/fr_FR/page/security>`__"
 msgstr ""
-"ODOO 安全在线 :`https: //www.odoo.com/page/security <https "
-"://www.odoo.com/fr_FR/page/security>` __"
+"ODOO 安全在线: `https://www.odoo.com/page/security "
+"<https://www.odoo.com/fr_FR/page/security>`__"
 
 #: ../../getting_started/documentation.rst:220
 msgid ""
diff --git a/locale/zh_CN/LC_MESSAGES/helpdesk.po b/locale/zh_CN/LC_MESSAGES/helpdesk.po
index 287ecf3b1..64833b2fe 100644
--- a/locale/zh_CN/LC_MESSAGES/helpdesk.po
+++ b/locale/zh_CN/LC_MESSAGES/helpdesk.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2015-TODAY, Odoo S.A.
-# This file is distributed under the same license as the Odoo Business package.
+# This file is distributed under the same license as the Odoo package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 10.0\n"
+"Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-08 14:28+0100\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: mrshelly <mrshelly@hotmail.com>, 2018\n"
+"Last-Translator: Jeffery CHEN Fan <jeffery9@gmail.com>, 2018\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,7 +28,7 @@ msgstr ""
 
 #: ../../helpdesk/getting_started.rst:6
 msgid "Overview"
-msgstr "概述"
+msgstr "概览"
 
 #: ../../helpdesk/getting_started.rst:9
 msgid "Getting started with Odoo Helpdesk"
diff --git a/locale/zh_CN/LC_MESSAGES/index.po b/locale/zh_CN/LC_MESSAGES/index.po
index 1cba1abb6..8ac727eb3 100644
--- a/locale/zh_CN/LC_MESSAGES/index.po
+++ b/locale/zh_CN/LC_MESSAGES/index.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2015-TODAY, Odoo S.A.
-# This file is distributed under the same license as the Odoo Business package.
+# This file is distributed under the same license as the Odoo package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 10.0\n"
+"Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-07 09:30+0200\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: liAnGjiA <liangjia@qq.com>, 2017\n"
+"Last-Translator: liAnGjiA <liangjia@qq.com>, 2018\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/locale/zh_CN/LC_MESSAGES/inventory.po b/locale/zh_CN/LC_MESSAGES/inventory.po
index 9bb81e9f7..86baa4014 100644
--- a/locale/zh_CN/LC_MESSAGES/inventory.po
+++ b/locale/zh_CN/LC_MESSAGES/inventory.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2015-TODAY, Odoo S.A.
-# This file is distributed under the same license as the Odoo Business package.
+# This file is distributed under the same license as the Odoo package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 10.0\n"
+"Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-08 17:10+0100\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: 苏州远鼎 <tiexinliu@126.com>, 2017\n"
+"Last-Translator: zpq001 <zpq001@live.com>, 2018\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -70,7 +70,7 @@ msgid ""
 "There are two approaches to process delivery orders: you can either work on "
 "printed documents (and scan lines on the documents), or on a screen (and "
 "scan products directly)."
-msgstr "有两种方法去完成发货单：你可以在打印出来的文档上（在文档上逐行扫描）操作也可以在屏幕（直接扫描产品）上"
+msgstr "有两种方法去处理发货单：你可以在打印出来的文档上（在文档上逐行扫描）操作，或者在屏幕（并直接扫描产品）上。"
 
 #: ../../inventory/barcode/operations/delivery.rst:10
 msgid "Process printed delivery orders:"
@@ -114,7 +114,7 @@ msgstr "下载所有标记为 **待做** 的发货单, 并且打开第一个"
 #: ../../inventory/barcode/operations/delivery.rst:35
 #: ../../inventory/barcode/operations/receipts.rst:33
 msgid "Pick up and scan each listed product."
-msgstr "捡起并扫描每一个被列出的产品"
+msgstr "捡起并扫描每一个被列出的产品。"
 
 #: ../../inventory/barcode/operations/delivery.rst:37
 msgid ""
@@ -134,7 +134,7 @@ msgstr "如何做内部调拨?"
 
 #: ../../inventory/barcode/operations/internal.rst:5
 msgid "In Odoo, there are two types of internal transfers:"
-msgstr "在Odoo中，有两种类型的内部调拨"
+msgstr "在Odoo中，有两种类型的内部调拨："
 
 #: ../../inventory/barcode/operations/internal.rst:7
 msgid ""
@@ -145,7 +145,7 @@ msgstr "系统自动初始化这些（例如，质量控制）"
 msgid ""
 "Those created by a worker (for example, through the internal transfer area "
 "of the dashboard)."
-msgstr "由工人创建的这些(例如，通过仪表板上的'内部调拨'区域)"
+msgstr "由工人创建的这些(例如，通过仪表板上的'内部调拨'区域)。"
 
 #: ../../inventory/barcode/operations/internal.rst:13
 msgid "To make an Internal Transfer:"
@@ -262,7 +262,7 @@ msgid ""
 "Then, scan the barcode of every product, or scan the barcode of the product "
 "on the picking line if the barcode on the product is not easily accessible, "
 "visible or is missing."
-msgstr "然后，扫描每个产品的条码，或者如果产品上的条码不容易扫到或者丢失那么就在拣货行上扫描产品的条码"
+msgstr "然后，扫描每个产品的条码或者如果产品上的条码不容易扫到、看到或者丢失，那么就在拣货行上扫描产品的条码。"
 
 #: ../../inventory/barcode/operations/receipts.rst:28
 msgid "Process incoming receipts from a computer or mobile device:"
@@ -640,7 +640,7 @@ msgstr "点击 **验证盘点** 按钮确认该次盘点并过账。"
 
 #: ../../inventory/management/adjustment/initial_inventory.rst:102
 msgid "Reporting"
-msgstr "报告"
+msgstr "报表"
 
 #: ../../inventory/management/adjustment/initial_inventory.rst:104
 msgid ""
@@ -758,11 +758,11 @@ msgstr "有效"
 msgid ""
 "If the active field is set to False, it will allow you to hide the "
 "orderpoint without removing it."
-msgstr "如果没有选中“可用”字段，那么将隐藏需求单记录且不会删除它。"
+msgstr "如果有效字段被设置为否，系统将会允许你隐藏订货点而不是删除。"
 
 #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
 msgid "Product Unit of Measure"
-msgstr "单位"
+msgstr "产品量度单位"
 
 #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
 msgid "Default Unit of Measure used for all stock operation."
@@ -777,7 +777,7 @@ msgid ""
 "Moves created through this orderpoint will be put in this procurement group."
 " If none is given, the moves generated by procurement rules will be grouped "
 "into one big picking."
-msgstr "通过此订购点创建的移动将放在此补货组中。如果没有被提供，由补货规则生成的移动将被组合到一个大拣货。"
+msgstr "通过此订购点创建的移动将放在此补货组中。如果没有提供，由补货规则生成的移动将被组合到一个大拣货。"
 
 #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
 msgid "Minimum Quantity"
@@ -788,7 +788,7 @@ msgid ""
 "When the virtual stock goes below the Min Quantity specified for this field,"
 " Odoo generates a procurement to bring the forecasted quantity to the Max "
 "Quantity."
-msgstr "当虚拟库存小于指定的最小数量，Odoo生成补货将预测数量带到最大数量。"
+msgstr "当虚拟库存小于此字段指定的最小数量，Odoo生成补货以便令预测数量达至最大数量。"
 
 #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
 msgid "Maximum Quantity"
@@ -799,7 +799,7 @@ msgid ""
 "When the virtual stock goes below the Min Quantity, Odoo generates a "
 "procurement to bring the forecasted quantity to the Quantity specified as "
 "Max Quantity."
-msgstr "当虚拟库存低于最小数量， Odoo生成补货将预测数量带到最大数量。"
+msgstr "当虚拟库存小于最小数量，Odoo生成补货以便令数量的预测数量达至最大数量。"
 
 #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
 msgid "Quantity Multiple"
@@ -809,7 +809,7 @@ msgstr "数量倍数"
 msgid ""
 "The procurement quantity will be rounded up to this multiple.  If it is 0, "
 "the exact quantity will be used."
-msgstr "补货数量会翻转到此倍数。如果它是0, 那么确切的数量会被使用。"
+msgstr "补货数量将会舍入最多为此倍数。如果它是0， 那么会使用确切的数量。"
 
 #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0
 msgid "Lead Time"
@@ -819,7 +819,7 @@ msgstr "前置时间"
 msgid ""
 "Number of days after the orderpoint is triggered to receive the products or "
 "to order to the vendor"
-msgstr "天数在订购点被触发到收到产品或者给供应商下单。"
+msgstr "在订购点被触发到收到产品或者给供应商下单的天数"
 
 #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:45
 msgid ""
@@ -896,7 +896,7 @@ msgstr "如何取消交货单？"
 #: ../../inventory/shipping/setup/delivery_method.rst:6
 #: ../../inventory/shipping/setup/third_party_shipper.rst:6
 msgid "Overview"
-msgstr "概述"
+msgstr "概览"
 
 #: ../../inventory/management/delivery/cancel_order.rst:8
 msgid ""
@@ -3205,7 +3205,7 @@ msgstr "标准价格"
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:129
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:182
 msgid "Operation"
-msgstr "作业"
+msgstr "操作"
 
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:29
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:74
@@ -3784,7 +3784,7 @@ msgstr "客户发货"
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:289
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:288
 msgid "Manufacturing Orders"
-msgstr "制造订单"
+msgstr "生产单"
 
 #: ../../inventory/management/reporting/valuation_methods_anglo_saxon.rst:295
 #: ../../inventory/management/reporting/valuation_methods_continental.rst:294
@@ -4478,7 +4478,7 @@ msgstr "质量控制→库存"
 
 #: ../../inventory/overview/concepts/double-entry.rst:221
 msgid "Product Category"
-msgstr "产品类别"
+msgstr "产品分类"
 
 #: ../../inventory/overview/concepts/double-entry.rst:215
 msgid "Product Category Route Example: cross-dock"
@@ -4518,7 +4518,7 @@ msgstr "供应商→客户"
 
 #: ../../inventory/overview/concepts/double-entry.rst:230
 msgid "Push Rules"
-msgstr "推式规则"
+msgstr "推送规则"
 
 #: ../../inventory/overview/concepts/double-entry.rst:232
 msgid ""
@@ -4568,7 +4568,7 @@ msgstr "路线和规则定义库存的移动, 对于每一个规则, 都提供
 
 #: ../../inventory/overview/concepts/double-entry.rst:252
 msgid "Picking"
-msgstr "拣货"
+msgstr "分拣"
 
 #: ../../inventory/overview/concepts/double-entry.rst:253
 msgid "Packing"
@@ -5630,7 +5630,7 @@ msgstr "管理产品的制造链条"
 
 #: ../../inventory/routes/concepts/use_routes.rst:13
 msgid "Manage default locations per product"
-msgstr "为每个产品定义默认位置"
+msgstr "为每个产品管理默认位置"
 
 #: ../../inventory/routes/concepts/use_routes.rst:15
 msgid ""
@@ -5642,7 +5642,7 @@ msgstr "根据业务需求在仓库中定义路线, 例如质检, 售后和供
 msgid ""
 "Help rental management, by generating automated return moves for rented "
 "products"
-msgstr "租用管理是用自动产生从租借地位置的产品退回移动"
+msgstr "租用管理协助是从租借产品自动生成退回移动"
 
 #: ../../inventory/routes/concepts/use_routes.rst:24
 msgid ""
@@ -6642,10 +6642,6 @@ msgstr ":doc:`../../overview/start/setup` "
 msgid ":doc:`uom`"
 msgstr ":doc:`uom` "
 
-#: ../../inventory/settings/products/usage.rst:72
-msgid ":doc:`packages`"
-msgstr ":doc:`packages` "
-
 #: ../../inventory/settings/products/variants.rst:3
 msgid "Using product variants"
 msgstr "使用产品型号(变体)"
@@ -8030,7 +8026,7 @@ msgid ""
 "<https://www.ups.com/upsdeveloperkit?loc=en_US>`__"
 msgstr ""
 "1. 到以下 **UPS 开发套件** 网页\n"
-" `https ://www.ups.com/upsdeveloperkit?loc=en\\_US <https: //www.ups.com/upsdeveloperkit?loc=en_US>` __"
+" `https://www.ups.com/upsdeveloperkit?loc=en\\_US <https://www.ups.com/upsdeveloperkit?loc=en_US>` __"
 
 #: ../../inventory/shipping/setup/ups_credentials.rst:65
 msgid "Log into UPS.com with your user ID and password"
diff --git a/locale/zh_CN/LC_MESSAGES/iot.po b/locale/zh_CN/LC_MESSAGES/iot.po
new file mode 100644
index 000000000..d01289c9a
--- /dev/null
+++ b/locale/zh_CN/LC_MESSAGES/iot.po
@@ -0,0 +1,369 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2015-TODAY, Odoo S.A.
+# This file is distributed under the same license as the Odoo package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo 11.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: LINYUN TONG <tong.linyun@elico-corp.com>, 2018\n"
+"Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../../iot.rst:5
+msgid "Internet of Things (IoT)"
+msgstr ""
+
+#: ../../iot/connect.rst:3
+msgid "Connect an IoT Box to your database"
+msgstr ""
+
+#: ../../iot/connect.rst:5
+msgid "Install the Internet of Things (IoT) App on your Odoo Database."
+msgstr ""
+
+#: ../../iot/connect.rst:10
+msgid "Go in the IoT App and click on Connect on the IoT Boxes page."
+msgstr ""
+
+#: ../../iot/connect.rst:15
+msgid "Follow the steps to connect your IoT Box."
+msgstr ""
+
+#: ../../iot/connect.rst:21
+msgid "Ethernet Connection"
+msgstr ""
+
+#: ../../iot/connect.rst:23
+msgid ""
+"Connect to the IoT Box all the devices that have to be connected with cables"
+" (ethernet, usb devices, etc.)."
+msgstr ""
+
+#: ../../iot/connect.rst:26
+msgid "Power on the IoT Box."
+msgstr ""
+
+#: ../../iot/connect.rst:28
+msgid "Then click on the Scan button."
+msgstr ""
+
+#: ../../iot/connect.rst:34
+msgid "WiFi Connection"
+msgstr ""
+
+#: ../../iot/connect.rst:36
+msgid "Power on the IoT Box"
+msgstr ""
+
+#: ../../iot/connect.rst:38
+msgid "Copy the token"
+msgstr ""
+
+#: ../../iot/connect.rst:43
+msgid ""
+"Connect to the IoT Box WiFi Network (make sure there is no ethernet cable "
+"plugged in your computer)."
+msgstr ""
+
+#: ../../iot/connect.rst:49
+msgid ""
+"You will be redirected to the IoT Box Homepage (if it doesn't work, connect "
+"to the IP address of the box). Give a name to your IoT Box (not required) "
+"and paste the token, then click on next."
+msgstr ""
+
+#: ../../iot/connect.rst:57
+msgid ""
+"If you are on Runbot, do not forget to add the -all or -base in the token "
+"(e.g. this token **http://375228-saas-11-5-iot-"
+"f3f920.runbot16.odoo.com\\|4957098401** should become "
+"**http://375228-saas-11-5-iot-f3f920-all.runbot16.odoo.com\\|4957098401**)."
+msgstr ""
+
+#: ../../iot/connect.rst:63
+msgid ""
+"Choose the WiFi network you want to connect with (enter the password if "
+"there is one) and click on Submit. Wait a few seconds before being "
+"redirected to your database."
+msgstr ""
+
+#: ../../iot/connect.rst:70
+msgid "You should now see the IoT Box."
+msgstr ""
+
+#: ../../iot/connect.rst:76
+msgid "IoT Box Schema"
+msgstr ""
+
+#: ../../iot/pos.rst:3
+msgid "Use the IoT Box for the PoS"
+msgstr ""
+
+#: ../../iot/pos.rst:9
+msgid "Prerequisites"
+msgstr "先决条件"
+
+#: ../../iot/pos.rst:11
+msgid "Before starting, make sure you have the following:"
+msgstr ""
+
+#: ../../iot/pos.rst:13
+msgid "An IoT Box"
+msgstr ""
+
+#: ../../iot/pos.rst:15
+msgid "A 2A Power adapter with pi 3 b+ 2.5 A"
+msgstr ""
+
+#: ../../iot/pos.rst:17
+msgid "A computer or tablet with an up-to-date web browser"
+msgstr "一台带最新的Web浏览器的计算机或平板电脑。"
+
+#: ../../iot/pos.rst:19
+msgid ""
+"A running SaaS or Odoo instance with the Point of Sale and IoT apps "
+"installed"
+msgstr ""
+
+#: ../../iot/pos.rst:22
+msgid "A local network setup with DHCP (this is the default setting)"
+msgstr ""
+
+#: ../../iot/pos.rst:24
+msgid ""
+"An Epson USB TM-T20 Printer or another ESC/POS compatible printer "
+"(officially supported printers are listed at the `POS Hardware page "
+"<https://www.odoo.com/page/pos-ipad-android-hardware>`__)"
+msgstr ""
+
+#: ../../iot/pos.rst:28
+msgid "A Honeywell Eclipse USB Barcode Scanner or another compatible scanner"
+msgstr "霍尼韦尔的Eclipse USB条码扫描仪或其他兼容的扫描仪"
+
+#: ../../iot/pos.rst:30
+msgid "An Epson compatible cash drawer"
+msgstr "爱普生兼容钱箱"
+
+#: ../../iot/pos.rst:32
+msgid "An RJ45 Ethernet Cable (optional, WiFi is built in)"
+msgstr ""
+
+#: ../../iot/pos.rst:35
+msgid "Set Up"
+msgstr "设置"
+
+#: ../../iot/pos.rst:37
+msgid ""
+"To connect hardware to the PoS, the first step is to connect an IoT Box to "
+"your database. For this, follow this `documentation "
+"<https://docs.google.com/document/d/1vhWrSSlSdJcRYe4tjPpXKYVMTD47lVK3ysyYc7tJDlA/edit#>`__."
+msgstr ""
+
+#: ../../iot/pos.rst:44
+msgid "Then, you have to connect the peripheral devices to your IoT Box."
+msgstr ""
+
+#: ../../iot/pos.rst:46
+msgid ""
+"Officially supported hardware is listed on `the POS Hardware page "
+"<https://www.odoo.com/page/pos-ipad-android-hardware>`__, but other hardware"
+" might work as well."
+msgstr ""
+
+#: ../../iot/pos.rst:50
+msgid "**Printer**: Connect an ESC/POS printer to a USB port and power it on."
+msgstr " **打印机**:  一个ESC/ POS打印机连接到USB端口, 并接通电源。"
+
+#: ../../iot/pos.rst:53
+msgid ""
+"**Cash drawer**: The cash drawer should be connected to the printer with an "
+"RJ25 cable."
+msgstr " **钱箱**:  钱箱应连接用RJ25电缆连接打印机。"
+
+#: ../../iot/pos.rst:56
+msgid ""
+"**Barcode scanner**: Connect your barcode scanner. In order for your barcode"
+" scanner to be compatible it must behave as a keyboard and must be "
+"configured in **US QWERTY**. It also must end barcodes with an Enter "
+"character (keycode 28). This is most likely the default configuration of "
+"your barcode scanner."
+msgstr ""
+" **条形码扫描仪**:  连接条形码扫描器。为了使您的条形码扫描仪是兼容的, 必须表现为键盘, 必须配置 **US QWERTY** "
+"。它还必须一个输入字符(键码28)结束条形码。这很可能是你的条码扫描仪的默认配置。"
+
+#: ../../iot/pos.rst:62
+msgid "**Scale**: Connect your scale and power it on."
+msgstr " **电子磅秤**:  连接你的电子磅秤和接通电源。"
+
+#: ../../iot/pos.rst:64
+msgid ""
+"**Ethernet**: If you do not wish to use Wi-Fi, plug in the Ethernet cable. "
+"Make sure this will connect the IoT Box to the same network as your POS "
+"device."
+msgstr ""
+
+#: ../../iot/pos.rst:68
+msgid ""
+"**Wi-Fi**: The current version of the IoT Box has Wi-Fi built in. Make sure "
+"not to plug in an Ethernet cable when booting, because all Wi-Fi "
+"functionality will be bypassed when a wired network connection is available "
+"on boot."
+msgstr ""
+
+#: ../../iot/pos.rst:73
+msgid ""
+"Once it's done, you can connect the IoT Box to your PoS. For this, go in "
+"Point of Sale > Configuration > PoS, tick the box \"IoT Box\" and select the"
+" IoT Box you want to connect with. Save the changes."
+msgstr ""
+
+#: ../../iot/pos.rst:77
+msgid "Set up is done, you can launch a new PoS Session."
+msgstr ""
+
+#: ../../iot/pos.rst:80
+msgid "Troubleshoot"
+msgstr "疑难解答"
+
+#: ../../iot/pos.rst:83
+msgid "The PoS cannot connect to the IoT Box"
+msgstr ""
+
+#: ../../iot/pos.rst:85
+msgid ""
+"The easiest way to make sure the IoT Box is properly set-up is to turn it on"
+" with the printer plugged in as it will print a receipt indicating any error"
+" if encountered or the IoT Box's IP address in case of success. If no "
+"receipt is printed, check the following steps:"
+msgstr ""
+
+#: ../../iot/pos.rst:91
+msgid ""
+"Make sure the IoT Box is powered on, indicated by a brightly lit red status "
+"LED."
+msgstr ""
+
+#: ../../iot/pos.rst:94
+msgid ""
+"Make sure the IoT Box is ready, this is indicated by a brightly lit green "
+"status LED just next to the red power status LED. The IoT Box should be "
+"ready ~2 minutes after it is started."
+msgstr ""
+
+#: ../../iot/pos.rst:98
+msgid ""
+"Make sure the IoT Box is connected to the same network as your POS device. "
+"Both the device and the IoT Box should be visible in the list of connected "
+"devices on your network router."
+msgstr ""
+
+#: ../../iot/pos.rst:102
+msgid ""
+"If you specified the IoT Box's IP address in the configuration, make sure it"
+" corresponds to the ip address printed on the IoT Box's status receipt."
+msgstr ""
+
+#: ../../iot/pos.rst:106
+msgid "Make sure that the POS is not loaded over HTTPS."
+msgstr "确认 POS 部分未开启 HTTPS 访问."
+
+#: ../../iot/pos.rst:108
+msgid ""
+"A bug in Firefox's HTTP implementation might prevent the autodiscovery from "
+"working reliably. You could also manually set up the IoT Box's IP address in"
+" the POS configuration."
+msgstr ""
+
+#: ../../iot/pos.rst:113
+msgid "The Barcode Scanner is not working"
+msgstr "条码枪不能使用"
+
+#: ../../iot/pos.rst:115
+msgid ""
+"The barcode scanner must be configured in US QWERTY and emit an Enter after "
+"each barcode. This is the default configuration of most barcode readers. "
+"Refer to the barcode reader documentation for more information."
+msgstr "在US QWERTY中配置条形码扫描仪, 扫码后输入。这是大多数条形码扫描仪的默认配置。有关更多信息,请参阅条形码文档。"
+
+#: ../../iot/pos.rst:120
+msgid ""
+"The IoT Box needs a 2A power supply to work with some barcode scanners. If "
+"you are not using the provided power supply, make sure the one you use has "
+"enough power."
+msgstr ""
+
+#: ../../iot/pos.rst:124
+msgid ""
+"Some barcode scanners will need more than 2A and will not work, or will work"
+" unreliably, even with the provided power supply. In those case you can plug"
+" the barcode scanner in a self-powered USB hub."
+msgstr "一些条形码扫描仪将需要超过2A的电源, 有时即使提供了电源也不可靠。在这些情况下,你可以把条形码扫描器连接在自供电的USB集线器上。"
+
+#: ../../iot/pos.rst:129
+msgid ""
+"Some poorly built barcode scanners do not advertise themselves as barcode "
+"scanners but as a usb keyboard instead, and will not be recognized by the "
+"IoT Box."
+msgstr ""
+
+#: ../../iot/pos.rst:134
+msgid "The Barcode Scanner is not working reliably"
+msgstr "条码枪确实不能使用"
+
+#: ../../iot/pos.rst:136
+msgid ""
+"Make sure that no more than one device with 'Scan via Proxy'/'Barcode "
+"Scanner' enabled are connected to the IoT Box at the same time."
+msgstr ""
+
+#: ../../iot/pos.rst:140
+msgid "Printing the receipt takes too much time"
+msgstr "打印小票太慢"
+
+#: ../../iot/pos.rst:142
+msgid ""
+"A small delay before the first print is expected, as the IoT Box will do "
+"some preprocessing to speed up the next printings. If you suffer delays "
+"afterwards it is most likely due to poor network connection between the POS "
+"and the IoT Box."
+msgstr ""
+
+#: ../../iot/pos.rst:148
+msgid "Some characters are not correctly printed on the receipt"
+msgstr "收据上打印出来的字母有些错误"
+
+#: ../../iot/pos.rst:150
+msgid ""
+"The IoT Box does not support all languages and characters. It currently "
+"supports Latin and Cyrillic based scripts, with basic Japanese support."
+msgstr ""
+
+#: ../../iot/pos.rst:155
+msgid "The printer is offline"
+msgstr "打印机处于离线"
+
+#: ../../iot/pos.rst:157
+msgid ""
+"Make sure the printer is connected, powered, has enough paper and has its "
+"lid closed, and is not reporting an error. If the error persists, please "
+"contact support."
+msgstr "确保打印机是连接, 有电源,有足够的纸, 它的盖子是关闭的, 并且没有报告错误。如果错误出现, 请联系技术支持。"
+
+#: ../../iot/pos.rst:162
+msgid "The cashdrawer does not open"
+msgstr "钱箱无法打开"
+
+#: ../../iot/pos.rst:164
+msgid ""
+"The cashdrawer should be connected to the printer and should be activated in"
+" the POS configuration."
+msgstr "现金盒应该连到打印机, 在POS中应将设置激活。"
diff --git a/locale/zh_CN/LC_MESSAGES/livechat.po b/locale/zh_CN/LC_MESSAGES/livechat.po
index 1d1d61a3f..c5e72bdcc 100644
--- a/locale/zh_CN/LC_MESSAGES/livechat.po
+++ b/locale/zh_CN/LC_MESSAGES/livechat.po
@@ -1,14 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2015-TODAY, Odoo S.A.
-# This file is distributed under the same license as the Odoo Business package.
+# This file is distributed under the same license as the Odoo package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 10.0\n"
+"Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-08 14:28+0100\n"
+"POT-Creation-Date: 2018-07-23 12:10+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: William Qi <qigl@inspur.com>, 2018\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: ../../livechat/livechat.rst:5
 msgid "Live Chat"
-msgstr "在线聊天"
+msgstr "在线客服"
 
 #: ../../livechat/livechat.rst:8
 msgid "Chat in live with website visitors"
diff --git a/locale/zh_CN/LC_MESSAGES/manufacturing.po b/locale/zh_CN/LC_MESSAGES/manufacturing.po
index 940e291f9..3e551ba3e 100644
--- a/locale/zh_CN/LC_MESSAGES/manufacturing.po
+++ b/locale/zh_CN/LC_MESSAGES/manufacturing.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2015-TODAY, Odoo S.A.
-# This file is distributed under the same license as the Odoo Business package.
+# This file is distributed under the same license as the Odoo package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 10.0\n"
+"Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-22 15:27+0100\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Gary Wei <Gary.wei@elico-corp.com>, 2017\n"
+"Last-Translator: Shane Tsoi <sso@odoo.com>, 2018\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -51,13 +51,10 @@ msgstr "设置基本的BoM"
 #: ../../manufacturing/management/bill_configuration.rst:16
 msgid ""
 "If you choose to manage your manufacturing operations using manufacturing "
-"orders only, you will define basic bills of materials without routings. For "
-"more information about which method of management to use, review the "
-"**Getting Started** section of the *Manufacturing* chapter of the "
-"documentation."
-msgstr "如你只用制造订单来管理制造过程，可无需路由来定义基本的物料清单。关于所采用的管理方式详情，请查看文献中*制造*章节的**开始**节。"
+"orders only, you will define basic bills of materials without routings."
+msgstr ""
 
-#: ../../manufacturing/management/bill_configuration.rst:22
+#: ../../manufacturing/management/bill_configuration.rst:19
 msgid ""
 "Before creating your first bill of materials, you will need to create a "
 "product and at least one component (components are considered products in "
@@ -72,7 +69,7 @@ msgstr ""
 "创建你的第一份物料清单前，你需要创建至少一个部件（在Odoo中也被认为是产品），方法是从 "
 ":menuselection:`主数据->产品，中选择或在系统运行时从BoM表格的相关字段中选择。一旦创建好一个产品和至少一个部件后，从相关的下拉菜单中选择它们并添加到你的物料清单。新的物料单可从menuselection中创建，选择主数据->物料清单，或使用产品表单之上的按钮进行创建。"
 
-#: ../../manufacturing/management/bill_configuration.rst:32
+#: ../../manufacturing/management/bill_configuration.rst:29
 msgid ""
 "Under the **Miscellaneous** tab, you can fill additional fields. "
 "**Sequence** defines the order in which your BoMs will be selected for "
@@ -81,11 +78,11 @@ msgid ""
 msgstr ""
 "在**杂项**页签下填写额外的字段。**顺序**定义了BoM被选择为生产订单的顺序，数字越小优先级越高。**版本**允许你跟踪BoM在不同时间的版本号变化。"
 
-#: ../../manufacturing/management/bill_configuration.rst:38
+#: ../../manufacturing/management/bill_configuration.rst:35
 msgid "Adding a Routing to a BoM"
 msgstr "在BoM中添加路由"
 
-#: ../../manufacturing/management/bill_configuration.rst:40
+#: ../../manufacturing/management/bill_configuration.rst:37
 msgid ""
 "A routing defines a series of operations required to manufacture a product "
 "and the work center at which each operation is performed. A routing may be "
@@ -94,14 +91,14 @@ msgid ""
 msgstr ""
 "路由定义制造一个产品所需的一系列操作，以及每个操作执行的工作中心。一个路由可以添加到多个BoM中，而后者每个只能有一个路由。路由配置的更多信息，请参阅路由一章。"
 
-#: ../../manufacturing/management/bill_configuration.rst:46
+#: ../../manufacturing/management/bill_configuration.rst:43
 msgid ""
 "After enabling routings from :menuselection:`Configuration --> Settings`, "
 "you will be able to add a routing to a bill of materials by selecting a "
 "routing from the dropdown list or creating one on the fly."
 msgstr "启用路由的方法 :menuselection:`配置 -->设置，然后当系统运行时从下拉清单中选择一个路由，即可将路由添加到物料清单。"
 
-#: ../../manufacturing/management/bill_configuration.rst:50
+#: ../../manufacturing/management/bill_configuration.rst:47
 msgid ""
 "You may define the work operation or step in which each component is "
 "consumed using the field, **Consumed in Operation** under the **Components**"
@@ -112,23 +109,23 @@ msgid ""
 msgstr ""
 "通过**组件**下方的**在工序中消费**字段定义工序或步骤。同样，也可以用**在操作中生产**字段（位于**杂项**页签下）定义产品被生产的操作。如果不填这个字段，产品将在路由的最后操作中被消耗/生产。"
 
-#: ../../manufacturing/management/bill_configuration.rst:61
+#: ../../manufacturing/management/bill_configuration.rst:58
 msgid "Adding Byproducts to a BoM"
 msgstr "添加副产品到BoM"
 
-#: ../../manufacturing/management/bill_configuration.rst:63
+#: ../../manufacturing/management/bill_configuration.rst:60
 msgid ""
 "In Odoo, a byproduct is any product produced by a BoM in addition to the "
 "primary product."
 msgstr "副产品指在Odoo中，BoM生产的任何主产品之外的产品。"
 
-#: ../../manufacturing/management/bill_configuration.rst:66
+#: ../../manufacturing/management/bill_configuration.rst:63
 msgid ""
 "To add byproducts to a BoM, you will first need to enable them from "
 ":menuselection:`Configuration --> Settings`."
 msgstr "如需将副产品添加到BoM，首先要在 :menuselection:`配置->设置，中选择启用它们。"
 
-#: ../../manufacturing/management/bill_configuration.rst:72
+#: ../../manufacturing/management/bill_configuration.rst:69
 msgid ""
 "Once byproducts are enabled, you can add them to your bills of materials "
 "under the **Byproducts** tab of the bill of materials. You can add any "
@@ -137,11 +134,11 @@ msgid ""
 msgstr ""
 "副产品启用后，即可被添加到物料清单**副产品**页签下的物料清单了。你可将任何产品（一个或多个）作为副产品添加。副产品的生产过程与BoM中主产品的路由一致。"
 
-#: ../../manufacturing/management/bill_configuration.rst:81
+#: ../../manufacturing/management/bill_configuration.rst:78
 msgid "Setting up a BoM for a Product With Sub-Assemblies"
 msgstr "为产品设置一个带分组件的BoM"
 
-#: ../../manufacturing/management/bill_configuration.rst:83
+#: ../../manufacturing/management/bill_configuration.rst:80
 #: ../../manufacturing/management/sub_assemblies.rst:5
 msgid ""
 "A subassembly is a manufactured product which is intended to be used as a "
@@ -152,7 +149,7 @@ msgid ""
 msgstr ""
 "分组件是一种用于另一制成品部件的制成品。你可能想用分组件来简化一个复杂的BoM、更精确地表示你的制造流，或在多个BoM中使用相同的分组件。BoM使用分组件通常指多级BoM。"
 
-#: ../../manufacturing/management/bill_configuration.rst:90
+#: ../../manufacturing/management/bill_configuration.rst:87
 #: ../../manufacturing/management/sub_assemblies.rst:12
 msgid ""
 "Multi-level bills of materials in Odoo are accomplished by creating a top-"
@@ -163,11 +160,11 @@ msgid ""
 msgstr ""
 "Odoo中的多级物料清单可通过创建顶级BoM和分组件BoM完成。下一步定义分组件产品的采购路线，以确保每次创建了顶级产品的制造订单时，能同时创建每个分组件的制造订单。"
 
-#: ../../manufacturing/management/bill_configuration.rst:97
+#: ../../manufacturing/management/bill_configuration.rst:94
 msgid "Configure the Top-Level Product BoM"
 msgstr "配置顶级产品BoM"
 
-#: ../../manufacturing/management/bill_configuration.rst:99
+#: ../../manufacturing/management/bill_configuration.rst:96
 #: ../../manufacturing/management/sub_assemblies.rst:21
 msgid ""
 "To configure a multi-level BoM, create the top-level product and its BoM. "
@@ -175,12 +172,12 @@ msgid ""
 "subassembly as you would for any product."
 msgstr "为配置多级BoM，请创建顶极产品及其BoM。将所有分组件包括到部件清单中。为每个分组件创建一个BoM（类似为每个产品创建BoM）。"
 
-#: ../../manufacturing/management/bill_configuration.rst:107
+#: ../../manufacturing/management/bill_configuration.rst:104
 #: ../../manufacturing/management/sub_assemblies.rst:29
 msgid "Configure the Subassembly Product Data"
 msgstr "配置分组件产品数据"
 
-#: ../../manufacturing/management/bill_configuration.rst:109
+#: ../../manufacturing/management/bill_configuration.rst:106
 #: ../../manufacturing/management/sub_assemblies.rst:31
 msgid ""
 "On the product form of the subassembly, you must select the routes "
@@ -189,7 +186,7 @@ msgid ""
 "effect."
 msgstr "在分组件的产品表中，必须选择**制造**和**按需补货**路由。**制造**路由的优先级高于**购买**路由，因此选后者是无效的。"
 
-#: ../../manufacturing/management/bill_configuration.rst:117
+#: ../../manufacturing/management/bill_configuration.rst:114
 #: ../../manufacturing/management/sub_assemblies.rst:39
 msgid ""
 "If you would like to be able to purchase the subassembly in addition to "
@@ -197,11 +194,11 @@ msgid ""
 "subassembly product form may be configured according to your preference."
 msgstr "如需在制造之外采购一些组件，选择**可以购买**。分组件产品表单中的所有其他字段都可根据你的偏好配置。"
 
-#: ../../manufacturing/management/bill_configuration.rst:123
+#: ../../manufacturing/management/bill_configuration.rst:120
 msgid "Using a Single BoM to Describe Several Variants of a Single Product"
 msgstr "使用单个的BoM描述单一产品的多个变体"
 
-#: ../../manufacturing/management/bill_configuration.rst:125
+#: ../../manufacturing/management/bill_configuration.rst:122
 #: ../../manufacturing/management/product_variants.rst:5
 msgid ""
 "Odoo allows you to use one bill of materials for multiple variants of the "
@@ -209,7 +206,7 @@ msgid ""
 "Settings`."
 msgstr "Odoo允许你为同一产品的多个变量使用物料清单。启用变量的方式很简单，只需从 :menuselection:`配置->设置中选择。"
 
-#: ../../manufacturing/management/bill_configuration.rst:132
+#: ../../manufacturing/management/bill_configuration.rst:129
 #: ../../manufacturing/management/product_variants.rst:12
 msgid ""
 "You will then be able to specify which component lines are to be used in the"
@@ -218,7 +215,7 @@ msgid ""
 "variants."
 msgstr "然后就可以指定每个产品变量的制造中需要用哪些部件行。可以为每个行指定多个变量。如果没有指定变量，这一行可以用于所有的变量。"
 
-#: ../../manufacturing/management/bill_configuration.rst:137
+#: ../../manufacturing/management/bill_configuration.rst:134
 #: ../../manufacturing/management/product_variants.rst:17
 msgid ""
 "When defining variant BoMs on a line-item-basis, the **Product Variant** "
@@ -429,6 +426,112 @@ msgstr "如何管理半成品。"
 msgid "Configure the Top -Level Product BoM"
 msgstr "配置顶级产品BoM"
 
+#: ../../manufacturing/management/unbuild.rst:3
+msgid "Unbuild a product"
+msgstr ""
+
+#: ../../manufacturing/management/unbuild.rst:5
+msgid ""
+"In Odoo Manufacturing App, you can *Unbuild* products. Two use cases can be "
+"managed: (1) you can unbuild products you have built yourself or (2) you can"
+" unbuild products you have received."
+msgstr ""
+
+#: ../../manufacturing/management/unbuild.rst:9
+msgid ""
+"Let's take the first case, you are manufacturing products yourself. If one "
+"of your product presents some defect, you might want to unbuild it instead "
+"of scrapping it completely, allowing you to reuse some components of the "
+"product."
+msgstr ""
+
+#: ../../manufacturing/management/unbuild.rst:14
+msgid ""
+"In the second case, you are buying products for the sole purpose of "
+"unbuilding them and recycling them."
+msgstr ""
+
+#: ../../manufacturing/management/unbuild.rst:18
+msgid "Unbuild Order"
+msgstr "拆解单"
+
+#: ../../manufacturing/management/unbuild.rst:20
+msgid ""
+"While in the Manufacturing App, under the *Operations* tab you will find the"
+" menu *Unbuild Orders*."
+msgstr ""
+
+#: ../../manufacturing/management/unbuild.rst:26
+msgid ""
+"When creating a new one, you can either select a MO if you are unbuilding "
+"something you manufactured or only select a product if you are unbuilding "
+"something you received."
+msgstr ""
+
+#: ../../manufacturing/management/unbuild.rst:33
+msgid "When you are done, just click unbuild and the process will be over."
+msgstr ""
+
+#: ../../manufacturing/management/unbuild.rst:35
+msgid ""
+"If you unbuild a product that you manufactured before, you will get the "
+"components from the MO back in stock."
+msgstr ""
+
+#: ../../manufacturing/management/unbuild.rst:38
+msgid ""
+"If you unbuild a product you bought, you will get the components from the "
+"BoM back in stock."
+msgstr ""
+
 #: ../../manufacturing/overview.rst:5
 msgid "Overview"
-msgstr "概述"
+msgstr "概览"
+
+#: ../../manufacturing/repair.rst:5
+msgid "Repair Management"
+msgstr ""
+
+#: ../../manufacturing/repair/repair.rst:3
+msgid "Repair products"
+msgstr ""
+
+#: ../../manufacturing/repair/repair.rst:5
+msgid ""
+"The Odoo *Repair* app allows you to manage a complete after sales process "
+"but also to simply repair products you have manufactured, if they present a "
+"defect."
+msgstr ""
+
+#: ../../manufacturing/repair/repair.rst:10
+msgid "Create a Repair Order"
+msgstr ""
+
+#: ../../manufacturing/repair/repair.rst:12
+msgid ""
+"Once in the app, you can access your existing *Repair Orders* and create a "
+"new one."
+msgstr ""
+
+#: ../../manufacturing/repair/repair.rst:19
+msgid "Manage a repair"
+msgstr ""
+
+#: ../../manufacturing/repair/repair.rst:21
+msgid ""
+"When a customer sends you a product for repair, create a new *Repair Order*."
+" Fill it in with all the information you may need such as the product, the "
+"customer, if it has to be invoiced after or before the repair, the parts you"
+" might need, etc."
+msgstr ""
+
+#: ../../manufacturing/repair/repair.rst:29
+msgid ""
+"Once everything is done, you can then send the repair quotation to your "
+"customer. If it is approved, you can confirm the repair. You will then be "
+"able to start & end the repair when it is completed."
+msgstr ""
+
+#: ../../manufacturing/repair/repair.rst:36
+msgid "You can now invoice the repair."
+msgstr ""
diff --git a/locale/zh_CN/LC_MESSAGES/mobile.po b/locale/zh_CN/LC_MESSAGES/mobile.po
new file mode 100644
index 000000000..ee4800c07
--- /dev/null
+++ b/locale/zh_CN/LC_MESSAGES/mobile.po
@@ -0,0 +1,119 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2015-TODAY, Odoo S.A.
+# This file is distributed under the same license as the Odoo package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo 11.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Robin Xia <xiayoubin@me.com>, 2018\n"
+"Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../../mobile/firebase.rst:5
+msgid "Mobile"
+msgstr "手机"
+
+#: ../../mobile/firebase.rst:8
+msgid "Setup your Firebase Cloud Messaging"
+msgstr "设置你的Firebase 云信息"
+
+#: ../../mobile/firebase.rst:10
+msgid ""
+"In order to have mobile notifications in our Android app, you need an API "
+"key."
+msgstr "为了在我们的安卓应用中获得移动通知，你需要一个API key。"
+
+#: ../../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 "对安卓应用，若在On-premise 或 Odoo.sh例程中不能自动配置，请按下列步奏获取一个API key。"
+
+#: ../../mobile/firebase.rst:18
+msgid ""
+"The iOS app doesn't support mobile notifications for Odoo versions < 12."
+msgstr "对Odoo 12.0以下的版本，iOS应用不支持移动消息通知。"
+
+#: ../../mobile/firebase.rst:22
+msgid "Firebase Settings"
+msgstr "Firebase 设置"
+
+#: ../../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 "
+"<https://console.firebase.google.com/>`__ and create a new project."
+msgstr ""
+"首先确认你登录到了Google账号，然后到网址：`https://console.firebase.google.com "
+"<https://console.firebase.google.com/>`__并创建一个新项目。"
+
+#: ../../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 "你必须使用“com.odoo.com”为安卓页的名字，否则，它不工作。"
+
+#: ../../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 "获取生成的API key"
+
+#: ../../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 "在【云信息】中，你会看到ODOO【设置】上的【API key】与【Sender ID】."
+
+#: ../../mobile/firebase.rst:74
+msgid "Settings in Odoo"
+msgstr "在Odoo上设置"
+
+#: ../../mobile/firebase.rst:76
+msgid "Simply paste the API key and the Sender ID from Cloud Messaging."
+msgstr "在云信息中，简单粘贴“API key”与’’Sender ID’’。"
diff --git a/locale/zh_CN/LC_MESSAGES/point_of_sale.po b/locale/zh_CN/LC_MESSAGES/point_of_sale.po
index 274694328..d0438ced7 100644
--- a/locale/zh_CN/LC_MESSAGES/point_of_sale.po
+++ b/locale/zh_CN/LC_MESSAGES/point_of_sale.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-26 12:01+0200\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Martin Trigaux, 2017\n"
+"Last-Translator: LINYUN TONG <tong.linyun@elico-corp.com>, 2018\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -55,8 +55,8 @@ msgstr ""
 
 #: ../../point_of_sale/advanced/barcode.rst:14
 msgid ""
-"Under the PosBox / Hardware category, you will find *Barcode Scanner* select"
-" it."
+"Under the IoT Box / Hardware category, you will find *Barcode Scanner* "
+"select it."
 msgstr ""
 
 #: ../../point_of_sale/advanced/barcode.rst:21
@@ -535,29 +535,26 @@ msgstr ""
 "://trendnet.com/products/proddetail.asp?prod=265_TU-S9>` __)"
 
 #: ../../point_of_sale/belgian_fdm/setup.rst:32
-msgid "A registered POSBox per POS configuration"
-msgstr "一个POS配置已注册的POS盒"
+msgid "A registered IoT Box per POS configuration"
+msgstr ""
 
 #: ../../point_of_sale/belgian_fdm/setup.rst:35
 msgid "Setup"
 msgstr "设置"
 
 #: ../../point_of_sale/belgian_fdm/setup.rst:38
-msgid "POSBox"
-msgstr "POSBox"
+msgid "IoT Box"
+msgstr "IoT 盒子"
 
 #: ../../point_of_sale/belgian_fdm/setup.rst:40
 msgid ""
-"In order to use a Fiscal Data Module, you will need a registered POSBox. "
-"These POSBoxes are similar to the regular POSBoxes we sell, but they are "
+"In order to use a Fiscal Data Module, you will need a registered IoT Box. "
+"These IoT Boxes are similar to the regular IoT Boxes we sell, but they are "
 "registered with the Belgian government. This is required by law. Attempting "
-"to use a Fiscal Data Module on a non-registered POSBox will not work. You "
-"can verify that the Fiscal Data Module is recognized by the POSBox by going "
-"to the *Hardware status page* via the POSBox homepage."
+"to use a Fiscal Data Module on a non-registered IoT Box will not work. You "
+"can verify that the Fiscal Data Module is recognized by the IoT Box by going"
+" to the *Hardware status page* via the IoT Box homepage."
 msgstr ""
-"为了使用财政数据模块, 您将需要一个注册过的POSBox。这些POSBoxes类似于我们出售的普通邮筒, "
-"但他们与比利时政府登记。这是由法律规定。尝试使用财政数据模块上的非注册POSBox将无法正常工作。您可以通过POSBox主页验证财政数据模块P已经由POSBox认可在"
-" *硬件状态页* 。"
 
 #: ../../point_of_sale/belgian_fdm/setup.rst:52
 msgid "Odoo"
@@ -569,17 +566,13 @@ msgid ""
 "**Belgian Registered Cash Register** app (technical name: "
 "``pos_blackbox_be``). Because of government restrictions imposed on us, this"
 " installation cannot be undone. After this, you will have to ensure that "
-"each POS configuration has a unique registered POSBox associated with it "
+"each POS configuration has a unique registered IoT Box associated with it "
 "(:menuselection:`Point of Sale --> Configuration --> Point of Sale` and "
-"ensure Hardware Proxy / POSBox and the serial number of your POSBox is set)."
-" The first time you open the Point of Sale and attempt to do a transaction, "
-"you will be asked to input the PIN that you received with your VAT signing "
-"card."
+"ensure Hardware Proxy / IoT Box and the serial number of your IoT Box is "
+"set). The first time you open the Point of Sale and attempt to do a "
+"transaction, you will be asked to input the PIN that you received with your "
+"VAT signing card."
 msgstr ""
-"一个Odoo POS应用程序可以通过安装 **比利时注册的收银机** 应用程序( :\" pos_blackbox be \\ "
-"\"技术名称)给予认证的POS功能。因为这是政府强加的限制, 这种安装不能撤消。在此之后, 你必须确保每个POS配置有与它(关联的唯一注册POSBox:"
-" 菜单选择 :`零售 - >配置 - > 零售', 确保硬件代理/ POSBox和序列号您POSBox被设置好了)。第一次你打开零售, "
-"并尝试做一个交易, 你会被要求输入您与增值税签约卡接收的PIN。"
 
 #: ../../point_of_sale/belgian_fdm/setup.rst:69
 msgid "Certification & On-premise"
@@ -627,12 +620,12 @@ msgid "Selling products without a valid tax"
 msgstr "产品销售没有有效的税收"
 
 #: ../../point_of_sale/belgian_fdm/setup.rst:90
-msgid "Multiple Odoo POS configurations per POSBox are not allowed"
-msgstr "单个POS盒中的多重Odoo POS配置是不允许的。"
+msgid "Multiple Odoo POS configurations per IoT Box are not allowed"
+msgstr ""
 
 #: ../../point_of_sale/belgian_fdm/setup.rst:91
-msgid "Using the POS without a connection to the POSBox (and thus FDM)"
-msgstr "使用不连POS盒的POS(以及FDM)"
+msgid "Using the POS without a connection to the IoT Box (and thus FDM)"
+msgstr ""
 
 #: ../../point_of_sale/belgian_fdm/setup.rst:92
 msgid "Blacklisted modules: pos_discount, pos_reprint, pos_loyalty"
@@ -640,7 +633,7 @@ msgstr "列入黑名单的模块 :POS_打折, POS_重新打印, POS_忠诚度"
 
 #: ../../point_of_sale/overview.rst:3 ../../point_of_sale/overview/start.rst:6
 msgid "Overview"
-msgstr "概述"
+msgstr "概览"
 
 #: ../../point_of_sale/overview/register.rst:3
 msgid "Register customers"
@@ -677,918 +670,6 @@ msgid ""
 "any future transactions."
 msgstr ""
 
-#: ../../point_of_sale/overview/setup.rst:3
-msgid "Point of Sale Hardware Setup"
-msgstr "零售硬件设置"
-
-#: ../../point_of_sale/overview/setup.rst:6
-msgid "POSBox Setup Guide"
-msgstr "收银台(POSBox) 配置向导"
-
-#: ../../point_of_sale/overview/setup.rst:11
-#: ../../point_of_sale/overview/setup.rst:205
-msgid "Prerequisites"
-msgstr "先决条件"
-
-#: ../../point_of_sale/overview/setup.rst:13
-msgid ""
-"Before you start setting up your POSBox make sure you have everything. You "
-"will need :"
-msgstr "在开始设置您的POSBox之前, 确保你准备好了一切。 你会需要 :"
-
-#: ../../point_of_sale/overview/setup.rst:16
-msgid "The POSBox"
-msgstr "POSBox"
-
-#: ../../point_of_sale/overview/setup.rst:17
-msgid "A 2A Power adapter"
-msgstr "2A电源适配器"
-
-#: ../../point_of_sale/overview/setup.rst:18
-msgid "A computer or tablet with an up-to-date web browser"
-msgstr "一台带最新的Web浏览器的计算机或平板电脑。"
-
-#: ../../point_of_sale/overview/setup.rst:19
-msgid "A running SaaS or Odoo database with the Point of Sale installed"
-msgstr ""
-
-#: ../../point_of_sale/overview/setup.rst:20
-msgid "A local network set up with DHCP (this is the default setting)"
-msgstr "设置了DHCP(这是默认设置)的本地网络"
-
-#: ../../point_of_sale/overview/setup.rst:21
-msgid ""
-"An Epson USB TM-T20 Printer or another ESC/POS compatible printer "
-"(officially supported printers are listed at the `POS Hardware page "
-"<https://www.odoo.com/page/pos-ipad-android-hardware>`_)"
-msgstr ""
-"一台 Epson USB TM-T20 打印机或其他兼容的 ESC/POS 打印机 (官方的 `POS 硬件支持列表 "
-"<https://www.odoo.com/page/pos-ipad-android-hardware>`_)"
-
-#: ../../point_of_sale/overview/setup.rst:24
-msgid "A Honeywell Eclipse USB Barcode Scanner or another compatible scanner"
-msgstr "霍尼韦尔的Eclipse USB条码扫描仪或其他兼容的扫描仪"
-
-#: ../../point_of_sale/overview/setup.rst:25
-msgid "An Epson compatible cash drawer"
-msgstr "爱普生兼容钱箱"
-
-#: ../../point_of_sale/overview/setup.rst:26
-msgid "An RJ45 Ethernet Cable (optional, Wi-Fi is built in)"
-msgstr ""
-
-#: ../../point_of_sale/overview/setup.rst:29
-#: ../../point_of_sale/overview/setup.rst:213
-msgid "Step By Step Setup Guide"
-msgstr "一步一步的安装指南"
-
-#: ../../point_of_sale/overview/setup.rst:32
-msgid "Current version of the POSBox (since 2015)"
-msgstr "POSBox的当前版本(2015年以来)"
-
-#: ../../point_of_sale/overview/setup.rst:36
-msgid "Connect peripheral devices"
-msgstr "连接外围设备"
-
-#: ../../point_of_sale/overview/setup.rst:38
-msgid ""
-"Officially supported hardware is listed on `the POS Hardware page "
-"<https://www.odoo.com/page/pos-ipad-android-hardware>`_, but other hardware "
-"might work as well."
-msgstr ""
-"官方支持的硬件列在POS硬件页<https ://www.odoo.com/page/pos-ipad-android-hardware>上 `_, "
-"但其他硬件可能也能正常工作。"
-
-#: ../../point_of_sale/overview/setup.rst:42
-msgid "**Printer**: Connect an ESC/POS printer to a USB port and power it on."
-msgstr " **打印机**:  一个ESC/ POS打印机连接到USB端口, 并接通电源。"
-
-#: ../../point_of_sale/overview/setup.rst:45
-msgid ""
-"**Cash drawer**: The cash drawer should be connected to the printer with an "
-"RJ25 cable."
-msgstr " **钱箱**:  钱箱应连接用RJ25电缆连接打印机。"
-
-#: ../../point_of_sale/overview/setup.rst:48
-msgid ""
-"**Barcode scanner**: Connect your barcode scanner. In order for your barcode"
-" scanner to be compatible it must behave as a keyboard and must be "
-"configured in **US QWERTY**. It also must end barcodes with an Enter "
-"character (keycode 28). This is most likely the default configuration of "
-"your barcode scanner."
-msgstr ""
-" **条形码扫描仪**:  连接条形码扫描器。为了使您的条形码扫描仪是兼容的, 必须表现为键盘, 必须配置 **US QWERTY** "
-"。它还必须一个输入字符(键码28)结束条形码。这很可能是你的条码扫描仪的默认配置。"
-
-#: ../../point_of_sale/overview/setup.rst:54
-msgid "**Scale**: Connect your scale and power it on."
-msgstr " **电子磅秤**:  连接你的电子磅秤和接通电源。"
-
-#: ../../point_of_sale/overview/setup.rst:56
-msgid ""
-"**Ethernet**: If you do not wish to use Wi-Fi, plug in the Ethernet cable. "
-"Make sure this will connect the POSBox to the same network as your POS "
-"device."
-msgstr " **以太网**:  如果你不希望使用Wi-Fi, 插上以太网电缆。确保这将POSBOX连接到同一个网络的POS设备。"
-
-#: ../../point_of_sale/overview/setup.rst:60
-msgid ""
-"**Wi-Fi**: The current version of the POSBox has Wi-Fi built in. Make sure "
-"not to plug in an Ethernet cable, because all Wi-Fi functionality will be "
-"bypassed when a wired network connection is available."
-msgstr ""
-
-#: ../../point_of_sale/overview/setup.rst:66
-msgid "Power the POSBox"
-msgstr "POSBox通电"
-
-#: ../../point_of_sale/overview/setup.rst:68
-msgid ""
-"Plug the power adapter into the POSBox, a bright red status led should light"
-" up."
-msgstr "将电源适配器插入POSBox, 红色的状态灯应该亮起。"
-
-#: ../../point_of_sale/overview/setup.rst:72
-msgid "Make sure the POSBox is ready"
-msgstr "确保POSBox已准备就绪"
-
-#: ../../point_of_sale/overview/setup.rst:74
-msgid ""
-"Once powered, The POSBox needs a while to boot. Once the POSBox is ready, it"
-" should print a status receipt with its IP address. Also the status LED, "
-"just next to the red power LED, should be permanently lit green."
-msgstr ""
-"一旦供电, POSBox需要一段时间才能启动。一旦POSBox准备就绪, 就应该打印带IP地址的状态条。另外, LED状态指示灯, "
-"旁边的红色电源指示灯应常亮绿色。"
-
-#: ../../point_of_sale/overview/setup.rst:80
-#: ../../point_of_sale/overview/setup.rst:292
-msgid "Setup the Point of Sale"
-msgstr "设置零售点"
-
-#: ../../point_of_sale/overview/setup.rst:82
-msgid ""
-"To setup the POSBox in the Point of Sale go to :menuselection:`Point of Sale"
-" --> Configuration --> Point of Sale` and select your Point of Sale. Scroll "
-"down to the ``PoSBox / Hardware Proxy`` section and activate the options for"
-" the hardware you want to use through the POSBox. Specifying the IP of the "
-"POSBox is recommended (it is printed on the receipt that gets printed after "
-"booting up the POSBox). When the IP is not specified the Point of Sale will "
-"attempt to find it on the local network."
-msgstr ""
-
-#: ../../point_of_sale/overview/setup.rst:91
-msgid ""
-"If you are running multiple Point of Sale on the same POSBox, make sure that"
-" only one of them has Remote Scanning/Barcode Scanner activated."
-msgstr ""
-
-#: ../../point_of_sale/overview/setup.rst:94
-msgid ""
-"It might be a good idea to make sure the POSBox IP never changes in your "
-"network. Refer to your router documentation on how to achieve this."
-msgstr "如果在你的网络中固定POSBox的IP地址, 是个比较好的注意。请参阅您的路由器文档就如何实现这一目标。"
-
-#: ../../point_of_sale/overview/setup.rst:99
-msgid "Launch the Point of Sale"
-msgstr "启动销售点"
-
-#: ../../point_of_sale/overview/setup.rst:101
-msgid ""
-"If you didn't specify the POSBox's IP address in the configuration, the POS "
-"will need some time to perform a network scan to find the POSBox. This is "
-"only done once."
-msgstr "如果没有在配置指定POSBox的IP地址, POS将需要一些时间来执行网络扫描来寻找POSBox。这种扫描只进行一次。"
-
-#: ../../point_of_sale/overview/setup.rst:105
-msgid ""
-"The Point of Sale is now connected to the POSBox and your hardware should be"
-" ready to use."
-msgstr "销售点已经连接到POSBox, 你的硬件应该可以使用。"
-
-#: ../../point_of_sale/overview/setup.rst:109
-msgid "Wi-Fi configuration"
-msgstr "Wi-Fi 配置"
-
-#: ../../point_of_sale/overview/setup.rst:111
-msgid ""
-"The most recent version of the POSBox has Wi-Fi built in. If you're using an"
-" older version you'll need a Linux compatible USB Wi-Fi adapter. Most "
-"commercially available Wi-Fi adapters are Linux compatible. Officially "
-"supported are Wi-Fi adapters with a Ralink 5370 chipset."
-msgstr ""
-
-#: ../../point_of_sale/overview/setup.rst:117
-msgid ""
-"Make sure not to plug in an Ethernet cable, as all Wi-Fi related "
-"functionality will be disabled when a wired network connection is available."
-msgstr "确保不要插以太网电缆插头, 因为当有线网络连接可用时所有Wi-Fi相关的功能将被禁用。"
-
-#: ../../point_of_sale/overview/setup.rst:121
-msgid ""
-"When the POSBox boots with a Wi-Fi adapter it will start its own Wi-Fi "
-"Access Point called \"Posbox\" you can connect to. The receipt that gets "
-"printed when the POSBox starts will reflect this. In order to make the "
-"POSBox connect to an already existing Wi-Fi network, go to the homepage of "
-"the POSBox (indicated on the receipt) and go to the Wi-Fi configuration "
-"page. On there you can choose a network to connect to. Note that we only "
-"support open and WPA(2)-PSK networks. When connecting to a WPA-secured "
-"network, fill in the password field. The POSBox will attempt to connect to "
-"the specified network and will print a new POSBox status receipt after it "
-"has connected."
-msgstr ""
-"当POSBox使用Wi-Fi适配器启动时, 将以您可以连接到的被称为“Posbox\" 的自己的Wi-"
-"Fi接入点开始。POSBox启动时的收据打印将反映这一点。为了使POSBox连接到已有的Wi-Fi网络, 转到POSBox的主页(在收据上已标明), "
-"并进入Wi-Fi配置页面。在那里, 你可以选择网络连接。请注意, 我们只支持开放式和WPA(2)-PSK网络。当连接到一个WPA保护的网络, "
-"填写密码字段。该POSBox将尝试连接到指定的网络, 连接后将打印新的POSBox状态条。 "
-
-#: ../../point_of_sale/overview/setup.rst:132
-msgid ""
-"If you plan on permanently setting up the POSBox with Wi-Fi, you can use the"
-" \"persistent\" checkbox on the Wi-Fi configuration page when connecting to "
-"a network. This will make the network choice persist across reboots. This "
-"means that instead of starting up its own \"Posbox\" network it will always "
-"attempt to connect to the specified network after it boots."
-msgstr ""
-"如果你打算永久设置POSBox 为Wi-Fi连接, 你可以在Wi-Fi配置页上选择复选框为“一直\" "
-"。这将在重新启动时网络选择一直选择WIFI。这意味着, 在启动后它将始终尝试连接到指定的网络而不是自己的“Posbox \"网络。"
-
-#: ../../point_of_sale/overview/setup.rst:139
-msgid ""
-"When the POSBox fails to connect to a network it will fall back to starting "
-"it's own \"Posbox\" Access Point. If connection is lost with a Wi-Fi network"
-" after connecting to it, the POSBox will attempt to re-establish connection "
-"automatically."
-msgstr ""
-"当POSBox无法连接到网络时, 它将退回到开始了自己的“Posbox\" 接入点。如果与Wi-Fi网络丢失, POSBox会尝试自动重新建立连接。 "
-
-#: ../../point_of_sale/overview/setup.rst:145
-msgid "Multi-POS Configuration"
-msgstr "多POS 设置"
-
-#: ../../point_of_sale/overview/setup.rst:147
-msgid ""
-"The advised way to setup a multi Point of Sale shop is to have one POSBox "
-"per Point of Sale. In this case it is mandatory to manually specify the IP "
-"address of each POSBox in each Point of Sale. You must also configure your "
-"network to make sure the POSBox's IP addresses don't change. Please refer to"
-" your router documentation."
-msgstr ""
-"建议设置多个零售点的商店是每个零售点一个POSBox. 在这个例子中, 必须为每个POSBox手动指定IP "
-"地址.你还必须配置你的网络保证每个POSBox 的IP 地址不会改变。请参考你的路由文档。"
-
-#: ../../point_of_sale/overview/setup.rst:154
-msgid "POSBoxless Guide (advanced)"
-msgstr "没有POSBox的指南(高级)"
-
-#: ../../point_of_sale/overview/setup.rst:158
-msgid ""
-"If you are running your Point of Sale on a Debian-based Linux distribution, "
-"you do not need the POSBox as you can run its software locally. However the "
-"installation process is not foolproof. You'll need at least to know how to "
-"install and run Odoo. You may also run into issues specific to your "
-"distribution or to your particular setup and hardware configuration."
-msgstr ""
-"如果您运行在基于Debian的Linux的销售点, 你可以不用POSBox, "
-"你可以运行本地软件。然而安装过程并不是万无一失的。你必须知道如何安装和运行Odoo.你也许会遇到关于版本的, 或特定设置和硬件配置的问题。"
-
-#: ../../point_of_sale/overview/setup.rst:165
-msgid ""
-"Drivers for the various types of supported hardware are provided as Odoo "
-"modules. In fact, the POSBox runs an instance of Odoo that the Point of Sale"
-" communicates with. The instance of Odoo running on the POSBox is very "
-"different from a 'real' Odoo instance however. It does not handle *any* "
-"business data (eg. POS orders), but only serves as a gateway between the "
-"Point of Sale and the hardware."
-msgstr ""
-"Odoo模块提供了对于不同类型的硬件的驱动支持。事实上, POSBox运行Odoo的销售点通信。在POSBox运行Odoo是一个和“真正的\" "
-"Odoo有很大的不同的例子。它不处理任何 **业务数据(如POS订单), 仅仅是作为销售点和硬件之间的网关。 "
-
-#: ../../point_of_sale/overview/setup.rst:172
-msgid ""
-"The goal of this section will be to set up a local Odoo instance that "
-"behaves like the Odoo instance running on the POSBox."
-msgstr "本节的目标是要建立一个当地Odoo演示数据, 模拟在POSBox 上运行。"
-
-#: ../../point_of_sale/overview/setup.rst:176
-msgid "Image building process"
-msgstr "镜像建立过程"
-
-#: ../../point_of_sale/overview/setup.rst:178
-msgid ""
-"We generate the official POSBox images using the scripts in "
-"https://github.com/odoo/odoo/tree/11.0/addons/point_of_sale/tools/posbox. "
-"More specifically, we run `posbox_create_image.sh "
-"<https://github.com/odoo/odoo/blob/11.0/addons/point_of_sale/tools/posbox/posbox_create_image.sh>`_."
-" This builds an image called ``posbox.img``, which we zip and upload to "
-"`nightly.odoo.com <https://nightly.odoo.com>`_ for users to download."
-msgstr ""
-
-#: ../../point_of_sale/overview/setup.rst:186
-msgid ""
-"The scripts in this directory might be useful as a reference if you get "
-"stuck or want more detail about something."
-msgstr "在此目录中的脚本对于你碰到问题或想了解更多是很有用的。"
-
-#: ../../point_of_sale/overview/setup.rst:190
-msgid "Summary of the image creation process"
-msgstr "映像创建过程总结"
-
-#: ../../point_of_sale/overview/setup.rst:192
-msgid ""
-"The image creation process starts by downloading the latest `Raspbian "
-"<https://www.raspbian.org/>`_ image. It then locally mounts this Raspbian "
-"image and copies over some files and scripts that will make the Raspbian "
-"image turn itself into a POSBox when it boots. These scripts will update "
-"Raspbian, remove non-essential packages and install required packages. In "
-"order to boot Raspbian we use qemu, which is capable of providing ARM "
-"emulation. After this, the emulated Raspbian OS will shut itself down. We "
-"then once again locally mount the image, remove the scripts that were used "
-"to initialize the image at boot and we copy over some extra configuration "
-"files. The resulting image is then ready to be tested and used."
-msgstr ""
-"镜像创建进程通过下载最新 `Raspbian<https ://www.raspbian.org/>` _镜像开始。然后, 它在本地挂载这个镜像, "
-"复制一些文件和脚本, 这将使Raspbian镜像把自己变成一个POSBox在启动时。这些脚本将更新Raspbian, "
-"删除非必要的包和安装所需的软件包。为了引导Raspbian我们用QEMU, 其能够提供ARM仿真。在此之后, "
-"仿真Raspbian操作系统将自行关闭。然后, 我们再一次在本地挂载镜像, 删除被用来初始化在启动镜像的脚本, "
-"我们复制了一些额外的配置文件。所产生的镜像, 然后可以被用来进行测试和使用。"
-
-#: ../../point_of_sale/overview/setup.rst:207
-msgid "A Debian-based Linux distribution (Debian, Ubuntu, Mint, etc.)"
-msgstr "基于Debian内核的Linux 版本(Debian, Ubuntu, Mint, etc)"
-
-#: ../../point_of_sale/overview/setup.rst:208
-msgid "A running Odoo instance you connect to load the Point of Sale"
-msgstr ""
-
-#: ../../point_of_sale/overview/setup.rst:209
-msgid ""
-"You must uninstall any ESC/POS printer driver as it will conflict with "
-"Odoo's built-in driver"
-msgstr "你必须卸载任何ESC/POS 打印机驱动, 因为它会和Odoo内置的驱动冲突。"
-
-#: ../../point_of_sale/overview/setup.rst:216
-msgid "Extra dependencies"
-msgstr "额外的依赖"
-
-#: ../../point_of_sale/overview/setup.rst:218
-msgid ""
-"Because Odoo runs on Python 2, you need to check which version of pip you "
-"need to use."
-msgstr "由于Odoo在Python2上运行, 你需要检查你需要使用的PIP的版本。"
-
-#: ../../point_of_sale/overview/setup.rst:221
-msgid "``# pip --version``"
-msgstr "``# pip --version``"
-
-#: ../../point_of_sale/overview/setup.rst:223
-#: ../../point_of_sale/overview/setup.rst:229
-msgid "If it returns something like::"
-msgstr "如果它返回例如 :"
-
-#: ../../point_of_sale/overview/setup.rst:227
-msgid "You need to try pip2 instead."
-msgstr "你需要PIP2"
-
-#: ../../point_of_sale/overview/setup.rst:233
-msgid "You can use pip."
-msgstr "使用 pip 工具."
-
-#: ../../point_of_sale/overview/setup.rst:235
-msgid "The driver modules requires the installation of new python modules:"
-msgstr "驱动模块需要安装新的python模块"
-
-#: ../../point_of_sale/overview/setup.rst:237
-msgid "``# pip install pyserial``"
-msgstr "``# pip install pyserial``"
-
-#: ../../point_of_sale/overview/setup.rst:239
-msgid "``# pip install pyusb==1.0.0b1``"
-msgstr "``# pip install pyusb==1.0.0b1``"
-
-#: ../../point_of_sale/overview/setup.rst:241
-msgid "``# pip install qrcode``"
-msgstr "``# pip install qrcode``"
-
-#: ../../point_of_sale/overview/setup.rst:244
-msgid "Access Rights"
-msgstr "访问权"
-
-#: ../../point_of_sale/overview/setup.rst:246
-msgid ""
-"The drivers need raw access to the printer and barcode scanner devices. "
-"Doing so requires a bit system administration. First we are going to create "
-"a group that has access to USB devices"
-msgstr "驱动需要获得打印机和条码扫描仪设备的原始访问。这样做需要一点系统管理。首先我们要创建一个访问USB设备的组"
-
-#: ../../point_of_sale/overview/setup.rst:250
-msgid "``# groupadd usbusers``"
-msgstr "``# groupadd usbusers``"
-
-#: ../../point_of_sale/overview/setup.rst:252
-msgid "Then we add the user who will run the OpenERP server to ``usbusers``"
-msgstr "然后, 我们添加谁将会运行OpenERP的服务器\" USB users \\ \"用户"
-
-#: ../../point_of_sale/overview/setup.rst:254
-msgid "``# usermod -a -G usbusers USERNAME``"
-msgstr "``# usermod -a -G usbusers 用户名``"
-
-#: ../../point_of_sale/overview/setup.rst:256
-msgid ""
-"Then we need to create a udev rule that will automatically allow members of "
-"``usbusers`` to access raw USB devices. To do so create a file called "
-"``99-usbusers.rules`` in the ``/etc/udev/rules.d/`` directory with the "
-"following content::"
-msgstr ""
-"允许“usbusers“自动访问USB设备, 需要创建一个udev规则。为此, 在``/etc/udev/rules.d/`` 下直接创建一个名为“99"
-" - usbusers的文件, 文件包含以下内容:"
-
-#: ../../point_of_sale/overview/setup.rst:264
-msgid "Then you need to reboot your machine."
-msgstr "然后你需啊重启你的机器。"
-
-#: ../../point_of_sale/overview/setup.rst:267
-msgid "Start the local Odoo instance"
-msgstr "开始本地Odoo实例。"
-
-#: ../../point_of_sale/overview/setup.rst:269
-msgid "We must launch the Odoo server with the correct settings"
-msgstr "我们必须用正确的设置启动Odoo服务器"
-
-#: ../../point_of_sale/overview/setup.rst:271
-msgid ""
-"``$ ./odoo.py "
-"--load=web,hw_proxy,hw_posbox_homepage,hw_posbox_upgrade,hw_scale,hw_scanner,hw_escpos``"
-msgstr ""
-"``$ ./odoo.py "
-"--load=web,hw_proxy,hw_posbox_homepage,hw_posbox_upgrade,hw_scale,hw_scanner,hw_escpos``"
-
-#: ../../point_of_sale/overview/setup.rst:274
-msgid "Test the instance"
-msgstr "测试实例。"
-
-#: ../../point_of_sale/overview/setup.rst:276
-msgid ""
-"Plug all your hardware to your machine's USB ports, and go to "
-"``http://localhost:8069/hw_proxy/status`` refresh the page a few times and "
-"see if all your devices are indicated as *Connected*. Possible source of "
-"errors are: The paths on the distribution differ from the paths expected by "
-"the drivers, another process has grabbed exclusive access to the devices, "
-"the udev rules do not apply or a superseded by others."
-msgstr ""
-"请将所有的硬件设备插到机器的USB端口, 然后转到\" http ://localhost: 8069/hw_proxy/status \\ \"\" "
-"刷新页面几次, 看看是否所有的设备都显示为 *连接* 。错误的可能来源是 :linux上的路径和驱动所期望的路径不同, "
-"另一个进程已经抢到了设备的独占访问时, udev规则不适用或他被人取代。 "
-
-#: ../../point_of_sale/overview/setup.rst:284
-msgid "Automatically start Odoo"
-msgstr "自动启动Odoo"
-
-#: ../../point_of_sale/overview/setup.rst:286
-msgid ""
-"You must now make sure that this Odoo install is automatically started after"
-" boot. There are various ways to do so, and how to do it depends on your "
-"particular setup. Using the init system provided by your distribution is "
-"probably the easiest way to accomplish this."
-msgstr ""
-"你必须确保Odoo 安装是在启动后自动开始。有多种方式可以实现, 如何做取决于你的特定设置.使用你的操作系统提供的安装系统可能使最简单的方式。"
-
-#: ../../point_of_sale/overview/setup.rst:294
-msgid ""
-"The IP address field in the POS configuration must be either ``127.0.0.1`` "
-"or ``localhost`` if you're running the created Odoo server on the machine "
-"that you'll use as the Point of Sale device. You can also leave it empty."
-msgstr ""
-"在POS的IP地址字段必须配置\" 127.0.0.1 \\ \"or\" localhost \\ \", 如果你将在作为零售点的Odoo "
-"服务器的机器上运行, 你也可以留空。"
-
-#: ../../point_of_sale/overview/setup.rst:300
-msgid "POSBox Technical Documentation"
-msgstr "POSBox 技术文档"
-
-#: ../../point_of_sale/overview/setup.rst:303
-msgid "Technical Overview"
-msgstr "技术总览"
-
-#: ../../point_of_sale/overview/setup.rst:306
-msgid "The POSBox Hardware"
-msgstr "收银机(POSBox) 硬件"
-
-#: ../../point_of_sale/overview/setup.rst:308
-msgid ""
-"The POSBox's Hardware is based on a `Raspberry Pi 2 "
-"<https://www.raspberrypi.org/products/raspberry-pi-2-model-b/>`_, a popular "
-"single-board computer. The Raspberry Pi 2 is powered with a 2A micro-usb "
-"power adapter. 2A is needed to give enough power to the barcode scanners. "
-"The Software is installed on a 8Gb Class 10 or Higher SD Card. All this "
-"hardware is easily available worldwide from independent vendors."
-msgstr ""
-"该POSBox的硬件是基于 `Raspberry Pi 2<https ://www.raspberrypi.org/products"
-"/raspberry-pi-2-model-b/>` _, 一个普遍的单片机。Raspberry PI "
-"2使用2A微型USB电源适配器。需要提供2A的足够电源给条码扫描器。软件安装在8G的10级或更高的SD卡。所有这些硬件都很容易从世界性的独立供应商处获得。"
-
-#: ../../point_of_sale/overview/setup.rst:317
-msgid "Compatible Peripherals"
-msgstr "兼容外设"
-
-#: ../../point_of_sale/overview/setup.rst:319
-msgid ""
-"Officially supported hardware is listed on the `POS Hardware page "
-"<https://www.odoo.com/page/pos-ipad-android-hardware>`_."
-msgstr ""
-"官方支持的硬件, 列在'POS硬件页<https ://www.odoo.com/page/pos-ipad-android-hardware> "
-"`_上。"
-
-#: ../../point_of_sale/overview/setup.rst:323
-msgid "The POSBox Software"
-msgstr "收银机(POSBox) 软件"
-
-#: ../../point_of_sale/overview/setup.rst:325
-msgid ""
-"The POSBox runs a heavily modified Raspbian Linux installation, a Debian "
-"derivative for the Raspberry Pi. It also runs a barebones installation of "
-"Odoo which provides the webserver and the drivers. The hardware drivers are "
-"implemented as Odoo modules. Those modules are all prefixed with ``hw_*`` "
-"and they are the only modules that are running on the POSBox. Odoo is only "
-"used for the framework it provides. No business data is processed or stored "
-"on the POSBox. The Odoo instance is a shallow git clone of the ``8.0`` "
-"branch."
-msgstr ""
-"该POSBox运行一个重大的修改Raspbian Linux, 是Raspberry Debian的衍生物。它还可以运行Odoo的准系统安装, "
-"提供网络服务器和驱动程序。硬件驱动被作为为Odoo模块。这些模块都前缀\" hw_ * \\ \", 他们是POSBox运行的唯一模块。 "
-"Odoo仅用于所提供的框架。没有业务数据被处理或存储在POSBox。该Odoo实例是\" 8.0 \\ \"克隆。"
-
-#: ../../point_of_sale/overview/setup.rst:334
-msgid ""
-"The root partition on the POSBox is mounted read-only, ensuring that we "
-"don't wear out the SD card by writing to it too much. It also ensures that "
-"the filesystem cannot be corrupted by cutting the power to the POSBox. Linux"
-" applications expect to be able to write to certain directories though. So "
-"we provide a ramdisk for /etc and /var (Raspbian automatically provides one "
-"for /tmp). These ramdisks are setup by ``setup_ramdisks.sh``, which we run "
-"before all other init scripts by running it in ``/etc/init.d/rcS``. The "
-"ramdisks are named /etc_ram and /var_ram respectively. Most data from /etc "
-"and /var is copied to these tmpfs ramdisks. In order to restrict the size of"
-" the ramdisks, we do not copy over certain things to them (eg. apt related "
-"data). We then bind mount them over the original directories. So when an "
-"application writes to /etc/foo/bar it's actually writing to "
-"/etc_ram/foo/bar. We also bind mount / to /root_bypass_ramdisks to be able "
-"to get to the real /etc and /var during development."
-msgstr ""
-"POSBox上的根分区是只读的,确保SD卡不会写太多, 同时还确保文件系统不被削减。Linux应用程序期望能写些目录。所以, 我们提供了虚拟盘 / "
-"etc和/ var (Raspbian自动提供 了/tmp)。在``/etc/init.d/rcS``中运行脚本前, "
-"需在``setup_ramdisks.sh``设置虚拟盘。虚拟磁盘命名为/ etc_ram和/ var_ram。大多数从/ etc、/ "
-"var出来的数据将复制到tmpfs虚拟盘。为了限制虚拟盘的大小,我们不复制这些数据(如, "
-"相关数据)。然后将数据与原来的目录绑定。当应用程序写入/etc/foo/bar时, 其实是写入/ etc_ram / foo / "
-"bar。我们也将mount / 绑定 /root_bypass_ramdisks, 以便在开发中能得到真正的/ etc、/ var。"
-
-#: ../../point_of_sale/overview/setup.rst:350
-msgid "Logs of the running Odoo server can be found at:"
-msgstr "Odoo服务器的运行Log可以在如下地方找到 :"
-
-#: ../../point_of_sale/overview/setup.rst:352
-msgid "``/var/log/odoo/odoo.log``"
-msgstr "\" /var/log/odoo/odoo.log \\ \""
-
-#: ../../point_of_sale/overview/setup.rst:354
-msgid ""
-"Various POSBox related scripts (eg. wifi-related scripts) running on the "
-"POSBox will log to /var/log/syslog and those messages are tagged with "
-"``posbox_*``."
-msgstr ""
-"各种在POSBox运行的相关的脚本(如无线网络相关的脚本)将记录到/ var / log / syslog上, 那些消息都标有\" posbox_ * "
-"\\ \"。"
-
-#: ../../point_of_sale/overview/setup.rst:359
-msgid "Accessing the POSBox"
-msgstr "访问POSBox"
-
-#: ../../point_of_sale/overview/setup.rst:362
-msgid "Local Access"
-msgstr "本地访问"
-
-#: ../../point_of_sale/overview/setup.rst:364
-msgid ""
-"If you plug a QWERTY USB keyboard into one of the POSBox's USB ports, and if"
-" you connect a computer monitor to the *HDMI* port of the POSBox, you can "
-"use it as a small GNU/Linux computer and perform various administration "
-"tasks, like viewing some logs."
-msgstr ""
-"如果你插入一个QWERTY USB的键盘到POSBox的USB端口中, 如果你的计算机显示器连接到 * HDMI * 的POSBox的端口, "
-"你可以使用它作为一个小的GNU / Linux计算机并执行各种管理任务, 如查看一些日志。"
-
-#: ../../point_of_sale/overview/setup.rst:369
-msgid "The POSBox will automatically log in as root on the default tty."
-msgstr "POSBox 将自动登入作为默认终端设备。"
-
-#: ../../point_of_sale/overview/setup.rst:372
-msgid "Remote Access"
-msgstr "远程访问"
-
-#: ../../point_of_sale/overview/setup.rst:374
-msgid ""
-"If you have the POSBox's IP address and an SSH client you can access the "
-"POSBox's system remotely. The login credentials are ``pi``/``raspberry``."
-msgstr "如果你有POSBox的IP地址和SSH客户端, 你可以远程访问POSBox的系统。登录凭据\" pi \\ \"/\" raspberry \\ \"。"
-
-#: ../../point_of_sale/overview/setup.rst:379
-msgid "Updating The POSBox Software"
-msgstr "升级POSBox 软件"
-
-#: ../../point_of_sale/overview/setup.rst:381
-msgid ""
-"Only upgrade the POSBox if you experience problems or want to use newly "
-"implemented features."
-msgstr "当你遇到问题或想要使用新实施的功能升级POSBox。"
-
-#: ../../point_of_sale/overview/setup.rst:384
-msgid ""
-"The best way to update the POSBox software is to download a new version of "
-"the image and flash the SD-Card with it. This operation is described in "
-"detail in `this tutorial <http://elinux.org/RPi_Easy_SD_Card_Setup>`_, just "
-"replace the standard Raspberry Pi image with the latest one found at `the "
-"official POSBox image page <http://nightly.odoo.com/master/posbox/>`_. This "
-"method of upgrading will ensure that you're running the latest version of "
-"the POSBox software."
-msgstr ""
-"更新POSBox软件的最好方法是下载镜像的新版本, 并更新SD卡。该操作的详细描述在 `<http "
-"://elinux.org/RPi_Easy_SD_Card_Setup>` _, "
-"只需用最新一期的'官方POSBox镜像页面找到替换的标准Raspberry Pi 镜像<http: "
-"//nightly.odoo.com/master/posbox/> `_。这种升级方法将确保您正在运行最新版本的POSBox软件。"
-
-#: ../../point_of_sale/overview/setup.rst:393
-msgid ""
-"The second way of upgrading is through the built in upgrade interface that "
-"can be reached through the POSBox homepage. The nice thing about upgrading "
-"like this is that you don't have to flash a new image. This upgrade method "
-"is limited to what it can do however. It can not eg. update installed "
-"configuration files (like eg. /etc/hostapd.conf). It can only upgrade:"
-msgstr ""
-"升级的第二个方法是通过内置的升级界面访问POSBox主页。这样升级的好处是, "
-"你不必换一个新镜像。这种升级方法受限于有些不能做。例如不能更新安装配置文件(/etc/hostapd.conf)。它只能升级 :"
-
-#: ../../point_of_sale/overview/setup.rst:400
-msgid "The internal Odoo application"
-msgstr "内部Odoo应用"
-
-#: ../../point_of_sale/overview/setup.rst:401
-msgid ""
-"Scripts in the folder "
-"``odoo/addons/point_of_sale/tools/posbox/configuration/``"
-msgstr "脚本在文件夹\" odoo/addons/point_of_sale/tools/posbox/configuration/ \\ \""
-
-#: ../../point_of_sale/overview/setup.rst:403
-msgid "When in doubt, always use the first method of upgrading."
-msgstr "如有疑问, 一定要使用升级的第一个方法。"
-
-#: ../../point_of_sale/overview/setup.rst:406
-msgid "Troubleshoot"
-msgstr "疑难解答"
-
-#: ../../point_of_sale/overview/setup.rst:409
-msgid "The POS cannot connect to the POSBox"
-msgstr "该POS无法连接到POSBox"
-
-#: ../../point_of_sale/overview/setup.rst:411
-msgid ""
-"The easiest way to make sure the POSBox is properly set-up is to turn it on "
-"with the printer plugged in as it will print a receipt indicating any error "
-"if encountered or the POSBox's IP address in case of success. If no receipt "
-"is printed, check the following steps:"
-msgstr ""
-"最简单的方法确保POSBox是正确的设置, 是把它与打印机插入, "
-"因为它会在POSBox的IP地址设置成功的情况下打印收据显示任何遇到的错误。如果不打印收据, 请执行下列步骤 :"
-
-#: ../../point_of_sale/overview/setup.rst:415
-msgid ""
-"Make sure the POSBox is powered on, indicated by a brightly lit red status "
-"LED."
-msgstr "确保POSBox是通电的, 明亮的红色状态指示灯亮。"
-
-#: ../../point_of_sale/overview/setup.rst:417
-msgid ""
-"Make sure the POSBox is ready, this is indicated by a brightly lit green "
-"status LED just next to the red power status LED. The POSBox should be ready"
-" ~2 minutes after it is started."
-msgstr "确保POSBox已经准备好, 这是由一个红色电源状态指示灯后面的绿色状态指示灯指示。在启动后的POSBox应该准备〜2分钟。"
-
-#: ../../point_of_sale/overview/setup.rst:420
-msgid ""
-"Make sure the POSBox is connected to the same network as your POS device. "
-"Both the device and the POSBox should be visible in the list of connected "
-"devices on your network router."
-msgstr "确保POSBox连接到POS设备的相同网络。无论是设备和POSBox应该在你的网络中路由器连接的设备的列表中可见。"
-
-#: ../../point_of_sale/overview/setup.rst:423
-msgid ""
-"Make sure that your LAN is set up with DHCP, and gives IP addresses in the "
-"range 192.168.0.X, 192.168.1.X, 10.0.0.X. If you cannot setup your LAN that "
-"way, you must manually set up your POSBox's IP address."
-msgstr ""
-"确保你的局域网已用DHCP设置,并赋予IP地址范围 192.168.0.X, 192.168.1.X, 10.0.0.X. 如果不能这样设置, "
-"那就手动设置POSBox的IP地址。"
-
-#: ../../point_of_sale/overview/setup.rst:427
-msgid ""
-"If you have specified the POSBox's IP address in the configuration, make "
-"sure it correspond to the printed on the POSBox's status receipt."
-msgstr "如果你在配置中指定POSBox的IP地址, 确保它符合POSBox上的收据打印需求。"
-
-#: ../../point_of_sale/overview/setup.rst:430
-msgid "Make sure that the POS is not loaded over HTTPS."
-msgstr "确认 POS 部分未开启 HTTPS 访问."
-
-#: ../../point_of_sale/overview/setup.rst:431
-msgid ""
-"A bug in Firefox's HTTP implementation prevents the autodiscovery from "
-"working reliably. When using Firefox you should manually set up the POSBox's"
-" IP address in the POS configuration."
-msgstr "Firefox的HTTP实施时的一个故障可防止自动运行。使用火狐浏览器时, 你应在POS配置中手动设置POSBox 的IP地址。"
-
-#: ../../point_of_sale/overview/setup.rst:436
-msgid "The Barcode Scanner is not working"
-msgstr "条码枪不能使用"
-
-#: ../../point_of_sale/overview/setup.rst:438
-msgid ""
-"The barcode scanner must be configured in US QWERTY and emit an Enter after "
-"each barcode. This is the default configuration of most barcode readers. "
-"Refer to the barcode reader documentation for more information."
-msgstr "在US QWERTY中配置条形码扫描仪, 扫码后输入。这是大多数条形码扫描仪的默认配置。有关更多信息,请参阅条形码文档。"
-
-#: ../../point_of_sale/overview/setup.rst:442
-msgid ""
-"The POSBox needs a 2A power supply to work with some barcode scanners. If "
-"you are not using the provided power supply, make sure the one you use has "
-"enough power."
-msgstr "POSBox需要2A电源和一些条形码扫描仪。如果你不使用提供的电源,确保你使用电源的功率。"
-
-#: ../../point_of_sale/overview/setup.rst:445
-msgid ""
-"Some barcode scanners will need more than 2A and will not work, or will work"
-" unreliably, even with the provided power supply. In those case you can plug"
-" the barcode scanner in a self-powered USB hub."
-msgstr "一些条形码扫描仪将需要超过2A的电源, 有时即使提供了电源也不可靠。在这些情况下,你可以把条形码扫描器连接在自供电的USB集线器上。"
-
-#: ../../point_of_sale/overview/setup.rst:448
-msgid ""
-"Some poorly built barcode scanners do not advertise themselves as barcode "
-"scanners but as a usb keyboard instead, and will not be recognized by the "
-"POSBox."
-msgstr "一些简陋的条形码扫描仪是作为usb键盘, 而不是条形码扫描仪, 这将不被POSBox认可。"
-
-#: ../../point_of_sale/overview/setup.rst:453
-msgid "The Barcode Scanner is not working reliably"
-msgstr "条码枪确实不能使用"
-
-#: ../../point_of_sale/overview/setup.rst:455
-msgid ""
-"Make sure that no more than one device with 'Scan via Proxy'/'Barcode "
-"Scanner' enabled are connected to the POSBox at the same time."
-msgstr "确保不超过一个设备同时与'Scan via Proxy'/'Barcode Scanner'连接到POSBox使用。"
-
-#: ../../point_of_sale/overview/setup.rst:460
-msgid "Printing the receipt takes too much time"
-msgstr "打印小票太慢"
-
-#: ../../point_of_sale/overview/setup.rst:462
-msgid ""
-"A small delay before the first print is expected, as the POSBox will do some"
-" preprocessing to speed up the next printings. If you suffer delays "
-"afterwards it is most likely due to poor network connection between the POS "
-"and the POSBox."
-msgstr "打印前有稍许延迟是正常的, POSBox接下来会做一些预处理加快打印。如果之后再有延迟, 很可能是POS和POSBox之间网络连接的问题。"
-
-#: ../../point_of_sale/overview/setup.rst:468
-msgid "Some characters are not correctly printed on the receipt"
-msgstr "收据上打印出来的字母有些错误"
-
-#: ../../point_of_sale/overview/setup.rst:470
-msgid ""
-"The POSBox does not support all languages and characters. It currently "
-"supports Latin and Cyrillic based scripts, with basic Japanese support."
-msgstr "POSBox不支持所有的语言和文字。基于日语的支持, 目前支持拉丁文和斯拉夫语。"
-
-#: ../../point_of_sale/overview/setup.rst:475
-msgid "The printer is offline"
-msgstr "打印机处于离线"
-
-#: ../../point_of_sale/overview/setup.rst:477
-msgid ""
-"Make sure the printer is connected, powered, has enough paper and has its "
-"lid closed, and is not reporting an error. If the error persists, please "
-"contact support."
-msgstr "确保打印机是连接, 有电源,有足够的纸, 它的盖子是关闭的, 并且没有报告错误。如果错误出现, 请联系技术支持。"
-
-#: ../../point_of_sale/overview/setup.rst:482
-msgid "The cashdrawer does not open"
-msgstr "钱箱无法打开"
-
-#: ../../point_of_sale/overview/setup.rst:484
-msgid ""
-"The cashdrawer should be connected to the printer and should be activated in"
-" the POS configuration."
-msgstr "现金盒应该连到打印机, 在POS中应将设置激活。"
-
-#: ../../point_of_sale/overview/setup.rst:488
-msgid "Credits"
-msgstr "信用"
-
-#: ../../point_of_sale/overview/setup.rst:489
-msgid ""
-"The POSBox project was developed by Frédéric van der Essen with the kind "
-"help of Gary Malherbe, Fabien Meghazi, Nicolas Wisniewsky, Dimitri Del "
-"Marmol, Joren Van Onder and Antony Lesuisse."
-msgstr ""
-"POSBox项目是由Frédéric van der Essen开发的, 同时得到了Gary Malherbe, Fabien Meghazi, "
-"Nicolas Wisniewsky, Dimitri Del Marmol, Joren Van Onder 和 Antony "
-"Lesuisse的帮助."
-
-#: ../../point_of_sale/overview/setup.rst:493
-msgid ""
-"This development would not have been possible without the Indiegogo campaign"
-" and those who contributed to it. Special thanks goes to the partners who "
-"backed the campaign with founding partner bundles:"
-msgstr "没有 Indiegogo和其他人的贡献, 开发不可能完成。特别感谢支持参加活动的创始合伙人:"
-
-#: ../../point_of_sale/overview/setup.rst:497
-msgid "Camptocamp"
-msgstr "Camptocamp"
-
-#: ../../point_of_sale/overview/setup.rst:498
-msgid "BHC"
-msgstr "BHC"
-
-#: ../../point_of_sale/overview/setup.rst:499
-msgid "openBig"
-msgstr "openBig"
-
-#: ../../point_of_sale/overview/setup.rst:500
-msgid "Eeezee-IT"
-msgstr "Eeezee-IT"
-
-#: ../../point_of_sale/overview/setup.rst:501
-msgid "Solarsis LDA"
-msgstr "Solarsis LDA"
-
-#: ../../point_of_sale/overview/setup.rst:502
-msgid "ACSONE"
-msgstr "ACSONE"
-
-#: ../../point_of_sale/overview/setup.rst:503
-msgid "Vauxoo"
-msgstr "Vauxoo"
-
-#: ../../point_of_sale/overview/setup.rst:504
-msgid "Ekomurz"
-msgstr "Ekomurz"
-
-#: ../../point_of_sale/overview/setup.rst:505
-msgid "Datalp"
-msgstr "Datalp"
-
-#: ../../point_of_sale/overview/setup.rst:506
-msgid "Dao Systems"
-msgstr "Dao 系统"
-
-#: ../../point_of_sale/overview/setup.rst:507
-msgid "Eggs Solutions"
-msgstr "鸡蛋方案"
-
-#: ../../point_of_sale/overview/setup.rst:508
-msgid "OpusVL"
-msgstr "OpusVL"
-
-#: ../../point_of_sale/overview/setup.rst:510
-msgid ""
-"And also the partners who've backed the development with the Founding POSBox"
-" Bundle:"
-msgstr "也感谢一直支持发展POSBox的合作伙伴:"
-
-#: ../../point_of_sale/overview/setup.rst:513
-msgid "Willow IT"
-msgstr "Willow IT"
-
-#: ../../point_of_sale/overview/setup.rst:514
-msgid "E\\. Akhalwaya & Sons"
-msgstr "E\\. Akhalwaya & Sons"
-
-#: ../../point_of_sale/overview/setup.rst:515
-msgid "Multibase"
-msgstr "Multibase"
-
-#: ../../point_of_sale/overview/setup.rst:516
-msgid "Mindesa"
-msgstr "Mindesa"
-
-#: ../../point_of_sale/overview/setup.rst:517
-msgid "bpso.biz"
-msgstr "bpso.biz"
-
-#: ../../point_of_sale/overview/setup.rst:518
-msgid "Shine IT."
-msgstr "上海先安信息科技(Shine IT)."
-
 #: ../../point_of_sale/overview/start.rst:3
 msgid "Getting started with Odoo Point of Sale"
 msgstr "开始使用Odoo销售点"
@@ -1743,6 +824,12 @@ msgstr ""
 msgid "It's done, you have now closed your first PoS session."
 msgstr ""
 
+#: ../../point_of_sale/overview/start.rst:133
+msgid ""
+"To connect the PoS to hardware with an Odoo IoT Box, please see the section "
+":doc:`../../../iot/connect` and :doc:`../../../iot/pos`"
+msgstr ""
+
 #: ../../point_of_sale/restaurant.rst:3
 msgid "Advanced Restaurant Features"
 msgstr "高级的餐馆功能"
@@ -1808,7 +895,7 @@ msgstr ""
 
 #: ../../point_of_sale/restaurant/kitchen_printing.rst:16
 msgid ""
-"Under the PosBox / Hardware Proxy category, you will find *Order Printers*."
+"Under the IoT Box / Hardware Proxy category, you will find *Order Printers*."
 msgstr ""
 
 #: ../../point_of_sale/restaurant/kitchen_printing.rst:19
@@ -2100,7 +1187,7 @@ msgstr ""
 
 #: ../../point_of_sale/shop/cash_control.rst:24
 msgid ""
-"When clicking on *->Opening/Closing Values* you will be able to create those"
+"When clicking on **Opening/Closing Values** you will be able to create those"
 " values."
 msgstr ""
 
diff --git a/locale/zh_CN/LC_MESSAGES/portal.po b/locale/zh_CN/LC_MESSAGES/portal.po
index c3260e981..94d5570b0 100644
--- a/locale/zh_CN/LC_MESSAGES/portal.po
+++ b/locale/zh_CN/LC_MESSAGES/portal.po
@@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-07-23 12:10+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: e2f_cn c7 <e2f_cn_c7@outlook.com>, 2018\n"
+"Last-Translator: Martin Trigaux, 2018\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -97,7 +97,7 @@ msgstr ""
 
 #: ../../portal/my_odoo_portal.rst:66
 msgid "Tickets"
-msgstr "门票"
+msgstr "服务单"
 
 #: ../../portal/my_odoo_portal.rst:68
 msgid ""
diff --git a/locale/zh_CN/LC_MESSAGES/practical.po b/locale/zh_CN/LC_MESSAGES/practical.po
index 768b31bef..a127c345e 100644
--- a/locale/zh_CN/LC_MESSAGES/practical.po
+++ b/locale/zh_CN/LC_MESSAGES/practical.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2015-TODAY, Odoo S.A.
-# This file is distributed under the same license as the Odoo Business package.
+# This file is distributed under the same license as the Odoo package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 10.0\n"
+"Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-06-07 09:30+0200\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: liAnGjiA <liangjia@qq.com>, 2017\n"
+"Last-Translator: liAnGjiA <liangjia@qq.com>, 2018\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/locale/zh_CN/LC_MESSAGES/project.po b/locale/zh_CN/LC_MESSAGES/project.po
index 24822acf5..b97a72a25 100644
--- a/locale/zh_CN/LC_MESSAGES/project.po
+++ b/locale/zh_CN/LC_MESSAGES/project.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-26 12:01+0200\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: liAnGjiA <liangjia@qq.com>, 2017\n"
+"Last-Translator: LINYUN TONG <tong.linyun@elico-corp.com>, 2018\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,7 +35,7 @@ msgstr "如何从客户处收集回馈？"
 #: ../../project/configuration/time_record.rst:6 ../../project/overview.rst:3
 #: ../../project/overview/main_concepts.rst:3
 msgid "Overview"
-msgstr "概述"
+msgstr "概览"
 
 #: ../../project/advanced/feedback.rst:8
 msgid ""
@@ -125,7 +125,7 @@ msgstr "客户只需要点击笑脸（微笑, 自然, 悲伤）来评价你的
 
 #: ../../project/advanced/feedback.rst:79
 msgid "Reporting"
-msgstr "报告"
+msgstr "报表"
 
 #: ../../project/advanced/feedback.rst:81
 msgid ""
@@ -156,10 +156,6 @@ msgid ""
 " end of the website."
 msgstr "然后, 你就能够可以在网站上公布你的结果了, 你可以在网站右上角上点击确认按钮。"
 
-#: ../../project/advanced/feedback.rst:111
-msgid ":doc:`claim_issue`"
-msgstr ":doc:`claim_issue` "
-
 #: ../../project/advanced/so_to_task.rst:3
 msgid "How to create tasks from sales orders?"
 msgstr "如何为销售订单创建相关任务？"
diff --git a/locale/zh_CN/LC_MESSAGES/purchase.po b/locale/zh_CN/LC_MESSAGES/purchase.po
index 971dde93f..769f2ed7a 100644
--- a/locale/zh_CN/LC_MESSAGES/purchase.po
+++ b/locale/zh_CN/LC_MESSAGES/purchase.po
@@ -1,16 +1,16 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2015-TODAY, Odoo S.A.
-# This file is distributed under the same license as the Odoo Business package.
+# This file is distributed under the same license as the Odoo package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Business 10.0\n"
+"Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-22 15:27+0100\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: mao luo <dooms21day@163.com>, 2018\n"
+"Last-Translator: fausthuang, 2018\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,343 +22,6 @@ msgstr ""
 msgid "Purchase"
 msgstr "采购"
 
-#: ../../purchase/overview.rst:3
-#: ../../purchase/replenishment/flows/dropshipping.rst:6
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:6
-#: ../../purchase/replenishment/flows/warning_triggering.rst:6
-#: ../../purchase/replenishment/multicompany/setup.rst:6
-msgid "Overview"
-msgstr "概述"
-
-#: ../../purchase/overview/process.rst:3
-msgid "Process Overview"
-msgstr "过程概览"
-
-#: ../../purchase/overview/process/difference.rst:3
-msgid "Request for Quotation, Purchase Tender or Purchase Order?"
-msgstr "采购询价, 采购招标还是采购订单?"
-
-#: ../../purchase/overview/process/difference.rst:5
-msgid ""
-"Although they are intimately related, Requests for Quotation, Purchase "
-"Tenders and Purchase Orders are not the same."
-msgstr "虽然它们紧密的联系在一起, 采购需求单, 采购招标单和采购订单还是存在一定的差异。"
-
-#: ../../purchase/overview/process/difference.rst:8
-msgid ""
-"A **Request for Quotation** (RfQ) is used when you plan to purchase some "
-"products and you would like to receive a quote for those products. In Odoo, "
-"the Request for Quotation is used to send your list of desired products to "
-"your supplier. Once your supplier has answered your request, you can choose "
-"to go ahead with the offer and purchase or to turn down the offer."
-msgstr ""
-" **询价单** (RFQ)被用来计划采购产品时你想收到一份报价。在Odoo里, "
-"询价单用来发送你想要的产品清单给你的供应商。一旦你的供应商回复了你的需求, 你可以选择继续按报价采购或调低报价。"
-
-#: ../../purchase/overview/process/difference.rst:15
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:5
-msgid ""
-"A **Purchase Tender** (PT), also known as Call for Bids, is used to drive "
-"competition between several suppliers in order to get the best offer for a "
-"list of products. In comparison to the RfQ, a Purchase Tender is sent to "
-"multiple suppliers, stating each are competing with one another, and that "
-"the best offer will win. The main interest is that it usually leads to "
-"better offers."
-msgstr ""
-" **采购招标** (PT), 也被称为招标, 被用来驱动几个供应商之间的竞争, 并获得最佳报价。相比较询价单, 采购招标被发给多个供应商, "
-"表明每个都在和别的供应商竞争, 最佳的报价会赢得招标。主要的好处是它通常带来最佳的报价。"
-
-#: ../../purchase/overview/process/difference.rst:22
-msgid ""
-"The **Purchase Order** (PO) is the actual order that you place to the "
-"supplier that you chose, either through a RfQ, a Purchase Tender, or simply "
-"when you already know which supplier to order from."
-msgstr " **采购单** (PO)是真正的你发给你选择的供应商的订单, 无论是一个询价单, 一个采购招标, 或者是干脆你已知是那个供应商。"
-
-#: ../../purchase/overview/process/difference.rst:27
-msgid "When to use?"
-msgstr "什么样的情况适用?"
-
-#: ../../purchase/overview/process/difference.rst:29
-msgid ""
-"A **RfQ** is interesting when you have never purchased the products with "
-"that supplier before and therefore don't know their price. It is also useful"
-" if you want to challenge your suppliers once you have a well-established "
-"relationship with them. You can also use it to assess the cost of a project "
-"and see if it makes it feasible."
-msgstr ""
-" **采购询价** 对你从没有买过的, 不知道价格的产品是很有用的。同样当你和你的供应商已经建立了良好的关系时, "
-"它对于挑战你的供应商也很有用。你也可以用来评估项目的费用, 看它是否可行。"
-
-#: ../../purchase/overview/process/difference.rst:35
-msgid ""
-"A **Purchase Tender** is used for public offers that require an open "
-"offering from several suppliers. It is also useful when you need to make a "
-"one-off order for a product and you would like to get the best offer, no "
-"matter which supplier it is. It may be used when your supplier has not been "
-"up to your standards and you would like to either push them to deliver a "
-"better service, or find a replacement in their competitors."
-msgstr ""
-" **采购招标** 用来需要从多个供应商获取公开报价。也可以用来为你的一次性采购获取最佳报价, 无论供应商是谁。当你的供应商达不到你的标准, "
-"你可以用来推动他们提供更好的服务, 或者在他们的竞争者中选择一个替代者。"
-
-#: ../../purchase/overview/process/difference.rst:43
-msgid "When not to use?"
-msgstr "什么时候不用？"
-
-#: ../../purchase/overview/process/difference.rst:45
-msgid ""
-"**RfQ**\\ s become unnecessary once you have established your favorite "
-"supplier for each item, and will only increase the delay in the delivery of "
-"your items. In that case, the process will be simpler by starting straight "
-"from a Purchase Order."
-msgstr " **询价单** \\s 并不是必须的当你已经建立了你满意的供应商时, 而且会延迟你的产品交付。在这种情况下, 采购流程将会直接从采购单开始。"
-
-#: ../../purchase/overview/process/difference.rst:50
-msgid ""
-"**Purchase Tenders** are a long and tedious process that will likely take "
-"more than several weeks in the best cases. If you need a quick delivery, "
-"this is not the way to go. Also, if you have a well-established relationship"
-" with one supplier, think twice before you initiate a PT with them as it "
-"might tear the relationship and finally lead to less interesting deals."
-msgstr ""
-" **采购招标** 是一个漫长而乏味的过程, 它可能比最佳情况下多花好几个星期。如果你想快速采购到货物, "
-"不用这么做。如果你和某个供应商建立了良好的关系, 在发起采购招标前请三思, 这也许会搞僵你们的关系最终导致不好的结果。"
-
-#: ../../purchase/overview/process/difference.rst:58
-#: ../../purchase/replenishment/flows/compute_date.rst:139
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:39
-msgid "Example"
-msgstr "例子"
-
-#: ../../purchase/overview/process/difference.rst:60
-msgid ""
-"My company builds wooden furniture. For the new series of table we are "
-"designing, we need some screws, metal frames and rubber protections."
-msgstr "我的公司生产木质家具。对那些新建的系列桌子, 我们需要螺丝, 金属框架和橡胶护角。"
-
-#: ../../purchase/overview/process/difference.rst:63
-msgid ""
-"I create a Request for Quotation in Odoo with those products to my usual "
-"supplier, and send it by email. He answers back with an offer. However, I am"
-" not convinced by the offer, and I want to see if anyone can give a better "
-"one."
-msgstr "我在Odoo里为这些产品创建了一个询价单并发邮件给我的供应商。他回复了一个报价。然而我对此并不满意, 我想看看谁能提供一个更好的报价。"
-
-#: ../../purchase/overview/process/difference.rst:68
-msgid ""
-"I decide to push competition a bit and set up a Purchase Tender, that Odoo "
-"will send to a list of suppliers I specified. Out of the 8 offers I receive,"
-" one gets my attention and I decide to go ahead with that one."
-msgstr "我决定推动一点竞争并建立一个采购招标, Odoo会发送给我指定的供应商。在我收到的8个报价外, 有一个引起了我的注意我决定和这个继续下去。"
-
-#: ../../purchase/overview/process/difference.rst:72
-msgid ""
-"I confirm the order to the supplier by creating a Purchase Order from the "
-"PT, and Odoo automatically asks delivery of the items to the supplier."
-msgstr "我通过采购招标建立了一个采购订单并和供应商确认了订单, Odoo自动要求供应商交货。"
-
-#: ../../purchase/overview/process/difference.rst:77
-#: ../../purchase/purchases/master/suppliers.rst:16
-#: ../../purchase/purchases/master/uom.rst:22
-#: ../../purchase/purchases/rfq/3_way_matching.rst:18
-#: ../../purchase/purchases/rfq/analyze.rst:24
-#: ../../purchase/purchases/rfq/bills.rst:31
-#: ../../purchase/purchases/rfq/create.rst:16
-#: ../../purchase/purchases/rfq/reception.rst:14
-#: ../../purchase/purchases/tender/partial_purchase.rst:14
-#: ../../purchase/replenishment/flows/dropshipping.rst:13
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:58
-#: ../../purchase/replenishment/flows/warning_triggering.rst:21
-msgid "Configuration"
-msgstr "配置"
-
-#: ../../purchase/overview/process/difference.rst:79
-msgid ""
-"If you want to know how to create a **Purchase Order**, read the "
-"documentation on :doc:`from_po_to_invoice`"
-msgstr "关于如何创建 **采购订单** , 请参阅 : : doc :`from_po_to_invoice` "
-
-#: ../../purchase/overview/process/difference.rst:82
-msgid ""
-"If you want to know how to create a **RfQ**, read the documentation on "
-":doc:`../../purchases/rfq/create`"
-msgstr "关于如何创建 **采购需求** , 请参阅 :doc:`../../purchases/rfq/create` "
-
-#: ../../purchase/overview/process/difference.rst:85
-msgid ""
-"If you want to know how to create a **Purchase Tender**, read the "
-"documentation on :doc:`../../purchases/tender/manage_multiple_offers`"
-msgstr ""
-"如果你想知道如何创建一个 **采购招标** , 请阅读在 "
-":doc:`../../purchases/tender/manage_multiple_offers` 上的文档。"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:3
-msgid "From purchase order to invoice and receptions"
-msgstr "从采购订单到发票和收货"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:5
-msgid ""
-"For most of your everyday purchases, chances are you already know where to "
-"purchase and at what price. For these cases, a simple Purchase Order (PO) "
-"will allow you to handle the whole process."
-msgstr "对于你大多数的日常采购, 你已经知道在哪里采购并且是什么价格。对这类采购, 一个简单的采购订单(PO)可以使你处理整个流程。"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:9
-msgid ""
-"In Odoo, a purchase order can be created as is, but can also be the result "
-"of a Request for Quotation or of a Purchase Tender. Therefore, every "
-"purchase made in Odoo has a PO."
-msgstr "在Odoo里, 一个采购单可以这样创建, 也可以是一个询价单或是采购招标的结果。然而, 每个采购都有个一个采购单。"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:13
-msgid ""
-"The PO will generate an invoice, and depending on the contract with your "
-"supplier, you will be required to pay the invoice before or after delivery."
-msgstr "PO会生成一个发票, 按你和供应商的合同, 你需要在交货前或后付款。"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:18
-msgid "Install the Purchase Management application"
-msgstr "安装采购管理应用"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:20
-msgid ""
-"From the **Apps** application, search and install the **Purchase "
-"Management** application."
-msgstr "从 **Apps** 中, 搜索并安装 **采购管理** 应用。"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:27
-msgid "Creating a Purchase Order"
-msgstr "创建采购订单"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:29
-msgid ""
-"In the **Purchases** app, open the **Purchase** menu and click on **Purchase"
-" Orders**."
-msgstr "在 **采购** 模块中, 点开 **采购** 菜单并点击 **采购订单** 。"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:32
-msgid "In the **Purchase Orders** window, click on **Create**."
-msgstr "在 **采购订单** 窗体, 点击 **创建** 。"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:37
-msgid ""
-"From the new window, insert the **Vendor** and type in the **Order Date**."
-msgstr "从新的窗口中, 插入 **供应商** 并输入 **订单日期** 。"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:40
-msgid "In the **Products** section, click on **Add an item**."
-msgstr "在 **产品明细** 表格里面, 点击 **添加** 。"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:45
-msgid "Select your product from the list and add a description if necessary."
-msgstr "从列表中选择产品, 如果有必要的话添加一个描述。"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:47
-msgid "The **Scheduled Date** menu corresponds to the expected delivery date."
-msgstr " **计划日期** 菜单和预期交货日期保持一致。"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:49
-msgid ""
-"Type in the quantity which you wish to purchase, then click on **Save** and "
-"on **Confirm Order**."
-msgstr "输入你想采购产品的数量, 然后点击 **保存** 和 **确认订单** 。"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:53
-msgid ""
-"If you wish to go through the complete flow and create a **Request for "
-"Quotation** for this order, refer to the document on "
-":doc:`../../purchases/rfq/create`"
-msgstr ""
-"如果你想通过完整的流程, 并为订单创建一个 **申购单** , 请参考文档 :doc :`../../purchases/rfq/create` "
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:57
-msgid ""
-"As you can see, the status of the PO has switched to ``Purchase Order``."
-msgstr "如你所见, 该采购订单的状态变成了\" 采购订单 \\ \"。"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:63
-msgid "Registering invoice, payments and receiving products"
-msgstr "登记发票, 付款以及接收产品"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:65
-msgid ""
-"Depending on the contract you have with your supplier, you can either pay "
-"for the purchase upon delivery of the goods, or get the goods delivered "
-"after payment."
-msgstr "根据您与供应商签订的合同, 您可以在交货时付款, 或得到付款后交货。"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:70
-msgid "Payment upon or after reception"
-msgstr "收货之前或者之后付款"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:72
-msgid "Still from your purchase order, click on **Receive Products**."
-msgstr "还是在采购订单上, 点击 **接收产品** 。"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:74
-msgid ""
-"In the next page, check that the number of products received corresponds to "
-"the number ordered, then manually enter the delivered quantity and click on "
-"**Validate**."
-msgstr "在下一页面中, 检查收到的产品数量是否和订单数量一致, 然后手工的输入交货数量并点击 **确认** 。"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:81
-msgid ""
-"Go back to the PO. In the PO, a **Shipment** and an **Invoice** button have "
-"appeared."
-msgstr "回到采购订单, 在采购订单中, 会看到 **收货** 和 **开票** 两个按钮出现。"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:87
-msgid ""
-"Click on the **Invoices** button, then click on **Validate**. The invoice is"
-" now registered in the system. Click on **Register Payment**, insert the "
-"detail of the payment, and click on **Validate**."
-msgstr ""
-"点击 **开票** 按钮, 燃火点击 **确认** 。发票已经在系统中被登记。点击 **登记付款** , 插入付款的详细信息, 然后点击 **确认** "
-"。"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:94
-#: ../../purchase/overview/process/from_po_to_invoice.rst:124
-msgid ""
-"Your products are now ready for picking and storage, and the invoice is "
-"marked as paid."
-msgstr "你的产品现在显示为收货就绪并且已经入库, 并且发票也标记为已经付款。"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:98
-msgid "Upfront payment"
-msgstr "预付款"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:100
-msgid ""
-"From the **Purchase Order** page, open the **Invoices** tab, then click on "
-"**Create**."
-msgstr "在 **采购订单** 页面, 打开 **发票** 页签, 然后点击 **创建** 。"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:103
-msgid ""
-"In the next page, click on **Validate**. The invoice is now registered in "
-"the system. Click on **Register Payment**, insert the detail of the payment,"
-" and click on **Validate**."
-msgstr "在下一页中, 点击 **验证** 。发票被注册在系统中了。点击 **注册付款** , 插入付款明细, 然后点击 **验证** 。"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:110
-msgid ""
-"Go back to the PO. In the PO, a **Shipment** tab and an **Invoice** tab have"
-" appeared."
-msgstr "回到采购订单, 在采购订单中, **收货单** 和 **发票** 页签已经显示。"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:116
-msgid ""
-"Click on **Receive Products**, then in the new page, click on **Validate**."
-msgstr "点击 **接收产品** , 然后在新的页面中点击 **确认** 。"
-
-#: ../../purchase/overview/process/from_po_to_invoice.rst:121
-msgid ""
-"A window will appear, asking if you wish to process every item at once. "
-"Click on **Apply**."
-msgstr "会显示一个窗口, 问你是否想要一次完成全部。点击 **应用** 。"
-
 #: ../../purchase/purchases.rst:3
 msgid "Purchases"
 msgstr "采购"
@@ -368,421 +31,117 @@ msgid "Master Data"
 msgstr "主数据"
 
 #: ../../purchase/purchases/master/import.rst:3
-msgid "How to import supplier pricelists?"
-msgstr "如何导入供应商价格表?"
-
-#: ../../purchase/purchases/master/import.rst:6
-msgid "Introduction"
-msgstr "介绍"
-
-#: ../../purchase/purchases/master/import.rst:8
-msgid ""
-"Big companies use to import supplier pricelists day to day. Indeed, prices "
-"are always changing and you need to get price up to date to deal with a high"
-" number of products."
-msgstr "大公司往往每天导入供应商价格表。实际上价格一直在变化, 你需要得到最新的价格来处理大量的产品。"
-
-#: ../../purchase/purchases/master/import.rst:12
-msgid ""
-"To manage supplier prices on product form, read this document "
-"(:doc:`suppliers`). Here we will show you how to import customer prices."
-msgstr "在产品界面管理供应商价格, 请参阅文档( :doc:`suppliers).我们会展现如何导入客户价格。"
-
-#: ../../purchase/purchases/master/import.rst:16
-msgid "Required configuration"
-msgstr "必须的配置"
-
-#: ../../purchase/purchases/master/import.rst:18
-msgid "In purchase settings, you have 2 options:"
-msgstr "在采购设置中, 你有2种选择 :"
-
-#: ../../purchase/purchases/master/import.rst:20
-msgid "Manage vendor price on the product form"
-msgstr "在产品表单管理供应商价格"
-
-#: ../../purchase/purchases/master/import.rst:22
-msgid "Allow using and importing vendor pricelists"
-msgstr "允许使用和导入供应商价格表"
-
-#: ../../purchase/purchases/master/import.rst:24
-msgid "Here we are selecting: **Allow using and importing vendor pricelists**"
-msgstr "在此我们选择 : **允许使用并导入供应商价格表** "
-
-#: ../../purchase/purchases/master/import.rst:30
-msgid "Import vendor pricelists"
-msgstr "导入供应商价格表"
-
-#: ../../purchase/purchases/master/import.rst:32
-msgid ""
-"There are 2 scenarios: import the vendor pricelist for the first time, or "
-"update an existing vendor pricelist. In both scenarios, we assume your "
-"product list and vendor list is updated and you want to import the price "
-"list of vendors for a given product."
+msgid "Import vendors pricelists"
 msgstr ""
-"有两个场景 :第一次导入供应商价格表, 或者更新现有的供应商价格表。在这2个场景中: 我们假设您的产品清单和供应商清单被更新了, "
-"你需要为给定的产品导入供应商价格表。"
 
-#: ../../purchase/purchases/master/import.rst:40
+#: ../../purchase/purchases/master/import.rst:5
 msgid ""
-"To import a list from a document, the best pratice is to export first to get"
-" an example of data formating and a proper header to reimport."
-msgstr "对于从文件导入价格表, 最好的经验是首先导出一个正确格式的例子然后再导入。"
-
-#: ../../purchase/purchases/master/import.rst:50
-msgid "Import the list for the first time"
-msgstr "第一次导入列表"
-
-#: ../../purchase/purchases/master/import.rst:53
-msgid "Prepare the document"
-msgstr "准备文档"
-
-#: ../../purchase/purchases/master/import.rst:55
-msgid ""
-"In :menuselection:`Purchase --> Purchase --> Supplier Pricelists`, export a "
-"template of document to get import/export compatible and get the right "
-"format to import in mass. Create manually a data and export it "
-"(:menuselection:`select --> Action --> Export`)"
+"It is key for companies to be able to import vendors pricelists to stay up "
+"to date on products pricing."
 msgstr ""
-"在 :菜单选项: ’采购-->采购-->供应商价格表-->‘, 导出一个导入/导出兼容的正确格式的模板再来导入大量的数据。手动创建一个数据并导出( "
-":'菜单选项:'选择-->行动-->导出')"
 
-#: ../../purchase/purchases/master/import.rst:63
-msgid "Here is the list of fields you can import:"
-msgstr "这里是你可以导入的字段的列表 :"
+#: ../../purchase/purchases/master/import.rst:9
+#: ../../purchase/purchases/master/uom.rst:22
+#: ../../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/create.rst:13
+#: ../../purchase/purchases/rfq/lock_orders.rst:9
+#: ../../purchase/purchases/rfq/reception.rst:14
+#: ../../purchase/purchases/rfq/warning.rst:14
+#: ../../purchase/purchases/tender/blanket_orders.rst:10
+#: ../../purchase/purchases/tender/call_for_tender.rst:9
+#: ../../purchase/replenishment/flows/dropshipping.rst:13
+msgid "Configuration"
+msgstr "配置"
 
-#: ../../purchase/purchases/master/import.rst:66
-msgid "**Header of the document to import (csv, xls)**"
-msgstr " **导入文档的头(csv, xls)** "
-
-#: ../../purchase/purchases/master/import.rst:66
-msgid "**Meaning and how to get it**"
-msgstr " **意义以及如何得到** "
-
-#: ../../purchase/purchases/master/import.rst:66
-msgid "**Example**"
-msgstr " **示例** "
-
-#: ../../purchase/purchases/master/import.rst:68
-msgid "name_id"
-msgstr "name_id"
-
-#: ../../purchase/purchases/master/import.rst:68
-msgid "Vendor ID -> export supplier list to get it"
-msgstr "供应商ID->导出获取供应商列表"
-
-#: ../../purchase/purchases/master/import.rst:68
-msgid "\\_\\_export\\_\\_.res\\_partner\\_12"
-msgstr "\\_\\_export\\_\\_.res\\_partner\\_12"
-
-#: ../../purchase/purchases/master/import.rst:70
-msgid "product_code"
-msgstr "product_code"
-
-#: ../../purchase/purchases/master/import.rst:70
-msgid "Vendor product Code -> free text"
-msgstr "供应商产品编码 ->自由文本"
-
-#: ../../purchase/purchases/master/import.rst:70
-msgid "569874"
-msgstr "569874"
-
-#: ../../purchase/purchases/master/import.rst:72
-msgid "price"
-msgstr "price"
-
-#: ../../purchase/purchases/master/import.rst:72
-msgid "Vendor Price -> free text"
-msgstr "供应商价格 ->自由文本"
-
-#: ../../purchase/purchases/master/import.rst:72
-msgid "1500"
-msgstr "1500"
-
-#: ../../purchase/purchases/master/import.rst:74
-msgid "product_tmpl_id.id"
-msgstr "product_tmpl_id.id"
-
-#: ../../purchase/purchases/master/import.rst:74
-msgid "Product Template ID -> export you product list to get it"
-msgstr "产品模板ID ->导出并获取产品列表"
-
-#: ../../purchase/purchases/master/import.rst:74
-msgid "\\_\\_export\\_\\_.product_template_13"
-msgstr "\\_\\_export\\_\\_.product_template_13"
-
-#: ../../purchase/purchases/master/import.rst:76
-msgid "currency_id.id"
-msgstr "currency_id.id"
-
-#: ../../purchase/purchases/master/import.rst:76
-msgid "Currency -> to get it export the currency list"
-msgstr "币别 ->获取并导出币别列表"
-
-#: ../../purchase/purchases/master/import.rst:78
-msgid "date_end"
-msgstr "date_end"
-
-#: ../../purchase/purchases/master/import.rst:78
-msgid "End date of the price validity"
-msgstr "价格有效期的最后一天"
-
-#: ../../purchase/purchases/master/import.rst:78
-msgid "2015-10-22"
-msgstr "2015-10-22"
-
-#: ../../purchase/purchases/master/import.rst:80
-msgid "min_qty"
-msgstr "min_qty"
-
-#: ../../purchase/purchases/master/import.rst:80
-msgid "Minimal quantity to purchase from this vendor"
-msgstr "从该供应商采购最小数量"
-
-#: ../../purchase/purchases/master/import.rst:80
-msgid "2"
-msgstr "2"
-
-#: ../../purchase/purchases/master/import.rst:82
-msgid "product_id.id"
-msgstr "product_id.id"
-
-#: ../../purchase/purchases/master/import.rst:82
-msgid "Product Variante name -> export your variant list to get it"
-msgstr "产品变量名称－>导出变型清单获取"
-
-#: ../../purchase/purchases/master/import.rst:82
-msgid "\\_\\_export\\_\\_.product\\_13"
-msgstr "\\_\\_export\\_\\_.product\\_13"
-
-#: ../../purchase/purchases/master/import.rst:84
-msgid "date_start"
-msgstr "date_start"
-
-#: ../../purchase/purchases/master/import.rst:84
-msgid "Start date of price validity"
-msgstr "价格可用的开始日期"
-
-#: ../../purchase/purchases/master/import.rst:84
-msgid "2015-12-31"
-msgstr "2015-12-31"
-
-#: ../../purchase/purchases/master/import.rst:87
-msgid "You obtain a document which can be imported, fill in your vendor pices"
-msgstr "你能得到一个能导入的文档, 可以在其中填入供应商价格"
-
-#: ../../purchase/purchases/master/import.rst:92
+#: ../../purchase/purchases/master/import.rst:11
 msgid ""
-"Import this document in Odoo. Click on **Import** in the list view and "
-"upload your document. You can validate and check error. Once the system "
-"tells you everything is ok, you can import the list."
-msgstr "导入该文档到Odoo, 点击列表视图中的 **导入** 并上传你的文档。你可以确认并查看错误。一旦系统告知你一切正常, 你就可以导入列表。"
-
-#: ../../purchase/purchases/master/import.rst:102
-msgid ""
-"After the import, the **Vendors** section in **Inventory** tab of the "
-"product form is filled in."
-msgstr "在导入之后, 在 **库存** 页签的 **供应商** 的位置已经被填好。"
-
-#: ../../purchase/purchases/master/import.rst:106
-msgid "Update the vendor pricelist"
-msgstr "更新供应商价格表"
-
-#: ../../purchase/purchases/master/import.rst:108
-msgid ""
-"When the pricelist of your suppliers change, it is necessary to update "
-"existing prices."
-msgstr "当你的供应商的价格表变更, 有必要更新当前的价格。"
-
-#: ../../purchase/purchases/master/import.rst:111
-msgid ""
-"Follow the procedure of the first scenario in order to export existing data "
-"from :menuselection:`Purchases --> Purchase --> Vendor Pricelist`. Select "
-"everything, and export from the **Action** menu."
-msgstr "跟随第一个场景的过程来导出数据从 :菜单选项:'采购-->采购-->供应商价格表'.选择所有, 然后从 **行动** 菜单导出。"
-
-#: ../../purchase/purchases/master/import.rst:115
-msgid ""
-"Change price, end date, add a line, change a supplier, ... and then reimport"
-" in Odoo. Thanks to the ID, the list will be updated. Either the id is "
-"recognized and the line is updated or the ID is not known by Odoo and it "
-"will create a new pricelist line."
+"For this feature to work, go to :menuselection:`Purchases --> Configuration "
+"--> Settings` and tick the box in front of \"Vendor Pricelists\"."
 msgstr ""
-"改变价格, 结束日期, 增加一行, 改变供应商, ...然后再导入。依照ID, 价格表会被更新。\n"
-"如果ID可识别, 价格行会被更新, 如果ID不被Odoo识别, 系统会创建一个新的价格行。"
 
-#: ../../purchase/purchases/master/import.rst:120
+#: ../../purchase/purchases/master/import.rst:15
+msgid "Don't forget to save your settings in the top left corner."
+msgstr ""
+
+#: ../../purchase/purchases/master/import.rst:21
+msgid "Import a pricelist"
+msgstr ""
+
+#: ../../purchase/purchases/master/import.rst:23
+msgid "To import go to :menuselection:`Purchase --> Vendor Pricelists`"
+msgstr ""
+
+#: ../../purchase/purchases/master/import.rst:25
 msgid ""
-"After the import, the **Vendors** section in **Inventory** tab of the "
-"product form is updated."
-msgstr "导入后, 产品界面的 **库存** 标签的 **供应商** 部分被更新了。"
+"Load your file, then you can check if everything is correct before clicking "
+"import."
+msgstr ""
+
+#: ../../purchase/purchases/master/import.rst:28
+msgid "See below a template of the columns used."
+msgstr ""
+
+#: ../../purchase/purchases/master/import.rst:33
+msgid ""
+"`Template download "
+"<https://docs.google.com/spreadsheets/d/1N8c_eejLV_8NhYMGCfZau_oGCnRkUIT9nwdX7n0shhY/edit#gid=964193981>`__"
+msgstr ""
 
 #: ../../purchase/purchases/master/suppliers.rst:3
-msgid "How to set several suppliers on a product?"
-msgstr "如何产品上设置不同的供应商"
+msgid "Set multiple vendors on a product"
+msgstr ""
 
 #: ../../purchase/purchases/master/suppliers.rst:5
 msgid ""
-"Keeping track of your vendors can be a real burden in day-to-day business "
-"life. Prices can change and you might have several suppliers for one "
-"product. With Odoo you have the possibility to directly link vendors with "
-"the corresponding product and specify prices automatically the first time "
-"you purchase them."
+"If you find yourself with the need to buy from multiple vendors for one "
+"product, Odoo can let you directly link them with a single product."
+msgstr ""
+
+#: ../../purchase/purchases/master/suppliers.rst:9
+msgid "Add vendors in a product"
 msgstr ""
-"追踪你的供应商们是一个繁重的日常工作。价格会更改, "
-"而且每个产品你可能有好几个供应商。使用Odoo你可以用相关的产品和价格直接链接供应商当你第一次采购它们时。"
 
 #: ../../purchase/purchases/master/suppliers.rst:11
 msgid ""
-"We will take the following example: We need to buy ``5 t-shirts``. We found "
-"a **Vendor**; called ``Bob&Jerry's`` and we want to issue a request for "
-"quotation."
+"To use this feature, go to :menuselection:`Purchases --> Products`, then "
+"select a product."
 msgstr ""
-"我们将采取下面的例子 :我们需要买''5 T-shirts\" 。我们发现一个 **供应商** ;叫 \\ \"Bob&Jerry's\" , "
-"我们要发出的报价请求。 "
 
-#: ../../purchase/purchases/master/suppliers.rst:19
-msgid "Install the purchase module"
-msgstr "安装 purchase 模块"
-
-#: ../../purchase/purchases/master/suppliers.rst:21
+#: ../../purchase/purchases/master/suppliers.rst:14
 msgid ""
-"The first step to set your suppliers on your products is to install the "
-"purchase module. Go into your **App** module and install the **Purchase** "
-"module."
-msgstr "第一步安装采购模块, 在你的产品上设置你的供应商。去你的 **App** 模块安装 **采购** 模块。"
-
-#: ../../purchase/purchases/master/suppliers.rst:29
-msgid ""
-"By installing the purchase module, the inventory and invoicing module will "
-"be installed as well."
-msgstr "通过安装采购模块, 库存和发票模块也将被安装。"
-
-#: ../../purchase/purchases/master/suppliers.rst:33
-msgid "Create a Vendor"
-msgstr "创建供应商"
-
-#: ../../purchase/purchases/master/suppliers.rst:35
-msgid ""
-"The second step is to create a vendor. In this case we'll create the vendor "
-"``Bob&Jerry's``. Enter the purchase module, select :menuselection:`Purchase "
-"--> Vendors` and create a new vendor."
+"From there you can add existing vendors to your product or create a new one "
+"on the fly."
 msgstr ""
-"第二步创建一个供应商。在这个案列中我们将创建供应商\" Bob&Jerry's\\ \\ \\ \".进入采购模块, 选择 "
-":菜单选项:'采购-->供应商'然后创建一个新的供应商。"
 
-#: ../../purchase/purchases/master/suppliers.rst:39
-msgid ""
-"You can choose if the contact is a company or a person, fill in basic "
-"information such as address, phone, email,..."
-msgstr "你可以选择联系人是公司还是个人, 填写例如地址, 电话, 邮件等基本信息。"
-
-#: ../../purchase/purchases/master/suppliers.rst:42
-msgid ""
-"If you did not create the contact from the purchase module you will need to "
-"go in the **Sales and Purchases** tab as well and indicate that the contact "
-"is a **Vendor** (see picture below). If the contact is created from the "
-"purchase module this box will be ticked automatically."
-msgstr ""
-"如果你不是从采购模块生成联系人, 你需要到 **销售采购** 标签并标明联系人事 **供应商** (如下图).如果联系人事是从采购模块创建的, "
-"它会自动勾选。"
-
-#: ../../purchase/purchases/master/suppliers.rst:51
-msgid "Create a product"
-msgstr "创建产品"
-
-#: ../../purchase/purchases/master/suppliers.rst:53
-msgid ""
-"Next we can create the product we want to buy. We don't know the price of "
-"the t-shirt yet because we still need to issue our **Request for "
-"Quotation**."
-msgstr "接下来我们可以创建我们想买的产品。我们还不知道 t-shirt 的价格因为我们还需要发送我们的 **询价单** 。"
-
-#: ../../purchase/purchases/master/suppliers.rst:57
-msgid ""
-"To create a product enter your purchase module select "
-":menuselection:`Purchase --> Products` and create a new product."
-msgstr "进入采购模块生成一个产品, 选择 :菜单选项:'采购-->产品'来生成一个产品。"
-
-#: ../../purchase/purchases/master/suppliers.rst:60
-msgid ""
-"We will call our product ``T-shirt`` and specify that the product can be "
-"sold and purchased."
-msgstr "我们称我们的产品\" T-shirt\\ \\ \\ \", 并且指定它是可以销售和采购的。"
-
-#: ../../purchase/purchases/master/suppliers.rst:67
-msgid "Add Vendors to the product"
-msgstr "给产品添加可供货的供应商"
-
-#: ../../purchase/purchases/master/suppliers.rst:69
-msgid ""
-"The next action is to add vendors to the product. There are two ways to "
-"handle this. If you issue a purchase order for the first time Odoo will "
-"automatically link the vendor and its price to the product. You can also add"
-" vendors manually"
-msgstr ""
-"下一个给这个产品填加供应商。这里有两种方法来处理。如果你第一次创建采购单, Odoo会自动链接供应商和价格到这个产品。当然你也可以手动添加供应商。"
-
-#: ../../purchase/purchases/master/suppliers.rst:75
-msgid "By issuing a first Purchase Order to new vendor"
-msgstr "通过发布第一个到新的供应商的采购订单"
-
-#: ../../purchase/purchases/master/suppliers.rst:77
-msgid ""
-"When issuing a purchase order for the first time to a vendor, he will "
-"automatically be linked to the product by Odoo. For our example let's say "
-"that we issue a first purchase order to ``Bob&Jerry's`` for ``5 t-shirts`` "
-"at ``12.35 euros / piece``."
-msgstr ""
-"当第一次发送一个采购单给供应商, Odoo会自动帮你链接到产品。对我们的案例来说, 让我们发送第一个采购单给\" Bob&Jerry's\\ \", "
-"\\ \\ \" 5件 t-shirts\\ \"每件价格\\ \\ \" 12.35 eruos/piece\\ \"."
-
-#: ../../purchase/purchases/master/suppliers.rst:82
-msgid ""
-"First create your purchase order with the correct product and supplier (see "
-"picture below, or the documentation page :doc:`../rfq/create` for more "
-"information)"
-msgstr "首先使用正确的产品和供应商创建你的采购单(如下图, 或者文档 :doc:`../rfq/create` 获得更多信息)"
-
-#: ../../purchase/purchases/master/suppliers.rst:89
-msgid ""
-"When we save and validate the purchase order the vendor will automatically "
-"be added to the product's vendors list. To check this enter the purchase "
-"module, select :menuselection:`Purchase --> Products` and select our T-shirt"
-" product. By opening the **Inventory** tab we notice that our vendor and its"
-" price has automatically been added."
-msgstr ""
-"当你保存和验证采购单时供应商会自动加入到产品供应商清单。为了验证这一点, 进入采购模块, 选择 :'菜单选项:'采购-->产品'选择我们的T-shirt"
-" 产品。点开 **库存** 标签我们注意到我们的供应商和它的价格已经被自动添加了。"
-
-#: ../../purchase/purchases/master/suppliers.rst:98
+#: ../../purchase/purchases/master/suppliers.rst:17
 msgid ""
 "Note that every first time the product is purchased from a new vendor, Odoo "
 "will automatically link the contact and price with the product."
 msgstr "每次当产品第一次从一个新的供应商处被采购, Odoo会自动链接联系人和价格。"
 
-#: ../../purchase/purchases/master/suppliers.rst:103
-msgid "By adding manually"
-msgstr "手工的添加"
-
-#: ../../purchase/purchases/master/suppliers.rst:105
-msgid ""
-"We can of course also add vendors and vendors information manually. On the "
-"same page than previously, simply click on **Edit** and click the **Add an "
-"item** button."
-msgstr "当然我们可以手动添加供应商和供应商信息。在先前的同一页面上, 点击 **编辑** 并点击 **增加一个项目** 按钮。"
-
-#: ../../purchase/purchases/master/suppliers.rst:112
-msgid ""
-"When adding a new **Vendor** you are also able to add extra information such"
-" as the vendor product name or code, the validity of the price and the "
-"eventual minimum quantity required. These informations can be added and "
-"modified for existing vendors by simply clicking on the vendors line."
+#: ../../purchase/purchases/master/suppliers.rst:24
+msgid "Add price & quantity as well as a validity period"
+msgstr ""
+
+#: ../../purchase/purchases/master/suppliers.rst:26
+msgid ""
+"When you're adding a vendor to a product, you're able to add the vendor "
+"product name & code as well as set the minimal quantity, price and validity "
+"period."
+msgstr ""
+
+#: ../../purchase/purchases/master/suppliers.rst:34
+msgid ""
+"This Odoo feature also works with variants of your products, such as one "
+"t-shirt in different sizes!"
 msgstr ""
-"当添加一个新 **供应商** 时, 你也可以添加一些额外的信息例如产品名字或代码, 价格有效期, 最低采购数量。这些信息可以增加或修改通过点击供应商行。"
 
 #: ../../purchase/purchases/master/uom.rst:3
-msgid "How to purchase in different unit of measures than sales?"
-msgstr "如何和和销售使用不同计量单位进行采购？"
+msgid "Purchase in different unit of measures than sales"
+msgstr ""
 
 #: ../../purchase/purchases/master/uom.rst:5
 msgid ""
@@ -972,75 +331,65 @@ msgid ""
 msgstr "现在可以在产品界面把 **平方米** 做为计量单位, 把 **卷** 作为采购单位了。"
 
 #: ../../purchase/purchases/rfq.rst:3
-msgid "Request for Quotations"
-msgstr "询价单"
+msgid "Request for Quotation and Purchase Orders"
+msgstr ""
 
 #: ../../purchase/purchases/rfq/3_way_matching.rst:3
-msgid "How to determine if a vendor bill should be paid (3-way matching)"
-msgstr "在供应商账单应该支付的时候如何确定（3方面匹配）"
+msgid "Determine when to pay a vendor bill with 3-way matching"
+msgstr ""
 
 #: ../../purchase/purchases/rfq/3_way_matching.rst:5
 msgid ""
 "In some industries, you may receive a bill from a vendor before receiving "
-"the ordered products. However, the bill should maybe not be paid until the "
-"products have actually been received."
-msgstr "在一些行业中，你可能会在收到订购的产品前收到账单。然而，你可能不应该在收到产品前支付这个账单。"
+"the ordered products. However, you might not want to pay it until the "
+"products have been received."
+msgstr ""
 
 #: ../../purchase/purchases/rfq/3_way_matching.rst:9
 msgid ""
-"To define whether the vendor bill should be paid or not, you can use what is"
-" called the **3-way matching**. It refers to the comparison of the "
-"information appearing on the Purchase Order, the Vendor Bill and the "
-"Receipt."
-msgstr "为了定义是否应该支付供应商账单，你可以使用**3方面匹配**来确定。它指的是采购订单，供应商订单和收据上的信息匹配。"
+"To define whether the vendor bill should be paid or not, you can use what we"
+" call *3-way matching*. It refers to the comparaison of the information "
+"appearing on the *Purchase Order*, the *Vendor Bill* and the *Receipt*."
+msgstr ""
 
 #: ../../purchase/purchases/rfq/3_way_matching.rst:14
 msgid ""
-"The 3-way matching helps you to avoid paying incorrect or fraudulent vendor "
+"The 3-way matching helps you avoid paying incorrect or fraudulent vendor "
 "bills."
-msgstr "3方面匹配帮助你避免错误的支付或者欺诈的供应商账单。"
+msgstr ""
 
 #: ../../purchase/purchases/rfq/3_way_matching.rst:20
 msgid ""
-"Go in :menuselection:`Purchase --> Configuration --> Settings` and activate "
-"the 3-way matching."
-msgstr "进入：菜单选择：“采购->配置->设置”并激活3方面匹配。"
+"For this feature to work, go to :menuselection:`Purchases --> Configuration "
+"--> Settings` and activate the *3-way matching* feature"
+msgstr ""
 
-#: ../../purchase/purchases/rfq/3_way_matching.rst:30
-msgid "Should I pay this vendor bill?"
-msgstr "应该支付此供应商账单吗？"
+#: ../../purchase/purchases/rfq/3_way_matching.rst:27
+msgid "Should I pay the vendor bill?"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/3_way_matching.rst:29
+msgid ""
+"With the feature activated you will have a new *Should be paid* line appear "
+"on the vendor bill under the *Other info* tab."
+msgstr ""
 
 #: ../../purchase/purchases/rfq/3_way_matching.rst:32
 msgid ""
-"Once this setting has been activated, a new information appears on the "
-"vendor bill, defining whether the bill should be paid or not. There are "
-"three possible values:"
-msgstr "一旦这个设置被激活，一个新信息将会出现在供应商账单上，定义此账单是否应该支付。会有三种可能的值："
+"That way Odoo let's you easily know if you should pay the vendor bill or "
+"not."
+msgstr ""
 
-#: ../../purchase/purchases/rfq/3_way_matching.rst:36
-msgid "*Use case 1*: I have received the ordered products."
-msgstr "*用例1*：我已经收到的订购的产品。"
-
-#: ../../purchase/purchases/rfq/3_way_matching.rst:43
-msgid "*Use case 2*: I have not received the ordered products."
-msgstr "*用例2*：我还没有收到订购的产品。"
-
-#: ../../purchase/purchases/rfq/3_way_matching.rst:50
-msgid ""
-"*Use case 3*: the quantities do not match across the Purchase Order, Vendor "
-"Bill and Receipt."
-msgstr "*用例3 *：采购订单，供应商账单和收据上的数量不匹配。"
-
-#: ../../purchase/purchases/rfq/3_way_matching.rst:59
+#: ../../purchase/purchases/rfq/3_way_matching.rst:39
 msgid ""
 "The status is defined automatically by Odoo. However, if you want to define "
-"this status manually, you can tick the box *Force Status* and then you will "
-"be able to set manually whether the vendor bill should be paid or not."
-msgstr "状态由ODOO自动定义。但是，如果你想手动定义这个状态，你可以勾选框*强制状态*，然后你就可以手动设置是否应该支付供应商账单。"
+"this status manually, you can tick the box Force Status and then you will be"
+" able to set manually whether the vendor bill should be paid or not."
+msgstr ""
 
 #: ../../purchase/purchases/rfq/analyze.rst:3
-msgid "How to analyze the performance of my vendors?"
-msgstr "如何分析供应商的表现？"
+msgid "Analyze the performance of my vendors"
+msgstr ""
 
 #: ../../purchase/purchases/rfq/analyze.rst:5
 msgid ""
@@ -1077,7 +426,6 @@ msgstr ""
 "预测和规划自己的未来的订单。"
 
 #: ../../purchase/purchases/rfq/analyze.rst:27
-#: ../../purchase/purchases/tender/partial_purchase.rst:17
 msgid "Install the Purchase Management module"
 msgstr "安装采购管理模块"
 
@@ -1094,22 +442,18 @@ msgstr "发布一些采购订单"
 #: ../../purchase/purchases/rfq/analyze.rst:38
 msgid ""
 "Of course, in order to analyze your vendors' performance, you need to issue "
-"some **Request For Quotations** (RfQ) and confirm some **Purchase Orders**. "
-"If you want to know how to generate a purchase order, please read the "
-"documentation :doc:`../../overview/process/from_po_to_invoice`."
+"some **Request For Quotations** (RfQ) and confirm some **Purchase Orders**."
 msgstr ""
-"当然, 为了分析供应商的表现, 你需要发布一些 **询价单** (RFQ)并确认 **采购单** 。如果你样知道如何生成一个采购单, 请阅读如下文档 "
-":doc:`../../overview/process/from_po_to_invoice` ."
 
-#: ../../purchase/purchases/rfq/analyze.rst:44
+#: ../../purchase/purchases/rfq/analyze.rst:43
 msgid "Analyzing your vendors"
 msgstr "分析供应商"
 
-#: ../../purchase/purchases/rfq/analyze.rst:47
+#: ../../purchase/purchases/rfq/analyze.rst:46
 msgid "Generate flexible reports"
 msgstr "生成灵活弹性的报表"
 
-#: ../../purchase/purchases/rfq/analyze.rst:49
+#: ../../purchase/purchases/rfq/analyze.rst:48
 msgid ""
 "You have access to your vendors' performances on the Reports menu. By "
 "default, the report groups all your purchase orders on a pivot table by "
@@ -1121,7 +465,7 @@ msgstr ""
 "你可以在报告菜单访问你的供应商的表现。默认的, 这个报告是以你的采购单按 **每个月** , **每个供应商** 的 **总价** , **产品数量**"
 " 和 **平均价** 来分组的透析表。从这个基本报表中, 你可以得到一个快捷你的变现的概况。你可以通过 **衡量** 图标添加许多其他数据到你的报告中。"
 
-#: ../../purchase/purchases/rfq/analyze.rst:60
+#: ../../purchase/purchases/rfq/analyze.rst:59
 msgid ""
 "By clicking on the **+** and **-** icons, you can drill up and down your "
 "report in order to change the way your information is displayed. For "
@@ -1132,7 +476,7 @@ msgstr ""
 "通过点击 **+** 和 **-** 图标, 你可以向上和向下更改信息的显示方式。例如, 我要看到本月所有采购的产品, 我需要点击 **+** "
 "图标在纵轴的产品上。"
 
-#: ../../purchase/purchases/rfq/analyze.rst:67
+#: ../../purchase/purchases/rfq/analyze.rst:66
 msgid ""
 "Depending on the data you want to highlight, you may need to display your "
 "reports in a more visual view. You can transform your report in just a click"
@@ -1143,17 +487,17 @@ msgstr ""
 "对于你要突显的数据, 你也许需要用更强的视觉感显示你的报告报告。你可以点击3个图形视图 : **饼图** , **条形图** , **折线图** "
 "来转换你的报告: 这些视图通过下面截屏上的突显的图标访问。"
 
-#: ../../purchase/purchases/rfq/analyze.rst:77
+#: ../../purchase/purchases/rfq/analyze.rst:76
 msgid ""
 "On the contrary to the pivot table, a graph can only be computed with one "
 "dependent and one independent measure."
 msgstr "相对于透视表, 图形表只能用一个相关和一个非相关的衡量来计算。"
 
-#: ../../purchase/purchases/rfq/analyze.rst:81
+#: ../../purchase/purchases/rfq/analyze.rst:80
 msgid "Customize reports"
 msgstr "定制报表"
 
-#: ../../purchase/purchases/rfq/analyze.rst:83
+#: ../../purchase/purchases/rfq/analyze.rst:82
 msgid ""
 "You can easily customize your purchase reports depending on your needs. To "
 "do so, use the **Advanced search view** located in the right hand side of "
@@ -1167,7 +511,7 @@ msgstr ""
 "你可以按你的需求方便地定制你的采购报告。为此, 点击搜索栏最后的放大镜, 使用在你右手边的 **高级搜索视图** 。 **过滤** "
 "选项对显示数据的类别非常有用, **分组** 选项可以提高你的报告的可读性。注意你可以过滤和分组现存的字段, 使你的定制非常地弹性化和强大。"
 
-#: ../../purchase/purchases/rfq/analyze.rst:97
+#: ../../purchase/purchases/rfq/analyze.rst:96
 msgid ""
 "You can save and reuse any customized filter by clicking on **Favorites** "
 "from the **Advanced search view** and then on **Save current search**. The "
@@ -1176,63 +520,52 @@ msgstr ""
 "您可以保存并再次使用定制的过滤, 从 **高级搜索视图** 中点击 **收藏** , 然后 **保存当前的搜索** 。保存的过滤器将从 **收藏** "
 "菜单访问。"
 
-#: ../../purchase/purchases/rfq/analyze.rst:103
-#: ../../purchase/purchases/rfq/create.rst:76
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:86
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:81
-#: ../../purchase/purchases/tender/partial_purchase.rst:77
-msgid ":doc:`../../overview/process/from_po_to_invoice`"
-msgstr ":doc:`../../overview/process/from_po_to_invoice` "
-
 #: ../../purchase/purchases/rfq/approvals.rst:3
-msgid "How to setup two levels of approval for purchase orders?"
-msgstr "如何设置采购订单的两步验证？"
+msgid "Request managers approval for expensive orders"
+msgstr ""
 
-#: ../../purchase/purchases/rfq/approvals.rst:6
-msgid "Two level approval setup"
-msgstr "两步验证设置"
-
-#: ../../purchase/purchases/rfq/approvals.rst:8
+#: ../../purchase/purchases/rfq/approvals.rst:5
 msgid ""
-"Double validation on purchases forces a validation when the purchased amount"
-" exceeds a certain limit."
-msgstr "采购的两步验证强迫当采购金额超过一定限度时采取验证。"
+"In case of expensive purchases you may want a manager approval to validate "
+"the orders, Odoo let's you easily set that up."
+msgstr ""
 
 #: ../../purchase/purchases/rfq/approvals.rst:11
 msgid ""
-"Install **Purchase Management** module and then go to **General Settings** "
-"to configure the company data."
-msgstr "安装 **采购管理** 模块到 **常规设置** 配置公司数据。"
+"For this feature to work, go to :menuselection:`Purchases --> Configuration "
+"--> Settings` and activate the *Order Approval* feature. From there you can "
+"also set the minimum amount required to activate this feature."
+msgstr ""
 
-#: ../../purchase/purchases/rfq/approvals.rst:17
+#: ../../purchase/purchases/rfq/approvals.rst:20
+msgid "Create a new Request for Quotation"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/approvals.rst:22
 msgid ""
-"Set here the amount limit for second approval and set approval from manager "
-"side."
-msgstr "在这里设置第二步批复的金额限额并设置从经理处批复。"
+"While working on a new RfQ, if the order is made by a user and not a manager"
+" and the amount of the order is above the minimum amount you specified, a "
+"new *To Approve* status will be introduced in the process."
+msgstr ""
 
-#: ../../purchase/purchases/rfq/approvals.rst:21
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:47
-msgid "Process"
-msgstr "处理"
+#: ../../purchase/purchases/rfq/approvals.rst:31
+msgid "Approve the order"
+msgstr ""
 
-#: ../../purchase/purchases/rfq/approvals.rst:23
+#: ../../purchase/purchases/rfq/approvals.rst:33
 msgid ""
-"Logged as a purchase user, create a purchase order for more than the amount "
-"set above, and confirm it. The purchase order is set in a state **To "
-"Approve**"
-msgstr "以采购用户登录, 创建一个超过上述金额的采购单并确认。此时采购单被设为 **等待批复** 。"
+"If you are a purchase manager, you can now go to the purchase order and "
+"approve the order if everything is alright with it. Giving you full control "
+"of what your users can or can't do."
+msgstr ""
 
-#: ../../purchase/purchases/rfq/approvals.rst:29
-msgid "The manager gets the order to approve and validates the final order."
-msgstr "经理看到要验证的订单并确认最后的订单。"
-
-#: ../../purchase/purchases/rfq/approvals.rst:34
+#: ../../purchase/purchases/rfq/approvals.rst:37
 msgid "Once approved, the purchase order follows the normal process."
 msgstr "一旦确认, 采购订单就按照正常的步骤。"
 
 #: ../../purchase/purchases/rfq/bills.rst:3
-msgid "How to control supplier bills?"
-msgstr "如何管理供应商账单？"
+msgid "Control supplier bills"
+msgstr ""
 
 #: ../../purchase/purchases/rfq/bills.rst:5
 msgid ""
@@ -1572,8 +905,8 @@ msgstr ""
 "账单会关联到所有相应的采购单。"
 
 #: ../../purchase/purchases/rfq/cancel.rst:3
-msgid "How to cancel a purchase order?"
-msgstr "如何取消一个采购单"
+msgid "Cancel a purchase order"
+msgstr ""
 
 #: ../../purchase/purchases/rfq/cancel.rst:5
 msgid ""
@@ -1609,47 +942,40 @@ msgstr ""
 "确认你的询价单生成采购单。"
 
 #: ../../purchase/purchases/rfq/cancel.rst:25
-msgid ""
-"To learn more about the purchase order process, read the documentation page "
-":doc:`../../overview/process/from_po_to_invoice`"
-msgstr ""
-"要了解更多关于采购单的过程, 可以阅读文档 : : doc :`../../overview/process/from_po_to_invoice` "
-
-#: ../../purchase/purchases/rfq/cancel.rst:30
 msgid "Cancel your Purchase Order"
 msgstr "取消你的采购订单"
 
-#: ../../purchase/purchases/rfq/cancel.rst:33
+#: ../../purchase/purchases/rfq/cancel.rst:28
 msgid "Use case 1 : you didn't receive your goods yet"
 msgstr "用例 1 :你还没有收到货物"
 
-#: ../../purchase/purchases/rfq/cancel.rst:35
+#: ../../purchase/purchases/rfq/cancel.rst:30
 msgid ""
 "If you confirmed your purchase order and did not received your goods yet, "
 "you can simply cancel the PO it by clicking the cancel button."
 msgstr "如果你确认了你的采购单, 但还没收到货物, 你可以简单地通过取消按钮取消这个采购单。"
 
-#: ../../purchase/purchases/rfq/cancel.rst:41
+#: ../../purchase/purchases/rfq/cancel.rst:36
 msgid ""
 "Odoo will automatically cancel the outstanding shipments related to this PO "
 "and the status bar will switch from **Purchase order** to **Cancelled**."
 msgstr "Odoo 会自动取消和这个采购单相关的未完成的运输。 **采购单** 的状态栏上会变成 **取消** "
 
-#: ../../purchase/purchases/rfq/cancel.rst:48
+#: ../../purchase/purchases/rfq/cancel.rst:43
 msgid "Use case 2 : partially delivered goods"
 msgstr "用例 2 :部分已交货"
 
-#: ../../purchase/purchases/rfq/cancel.rst:50
+#: ../../purchase/purchases/rfq/cancel.rst:45
 msgid ""
 "In this case, **2** of the **3 iPad Mini** arrived before you needed to "
 "cancel the PO."
 msgstr "在这个用例中, 在你取消采购单前 **3 个 iPad Mini** 中的 **2个** 已经到货"
 
-#: ../../purchase/purchases/rfq/cancel.rst:54
+#: ../../purchase/purchases/rfq/cancel.rst:49
 msgid "Register good received and cancel backorder"
 msgstr "登记已收货物并取消欠单。"
 
-#: ../../purchase/purchases/rfq/cancel.rst:56
+#: ../../purchase/purchases/rfq/cancel.rst:51
 msgid ""
 "The first thing to do will be to register the goods received and to cancel "
 "the arrival of the **third iPad Mini** that is still supposed to be shipped."
@@ -1659,29 +985,29 @@ msgstr ""
 "第一要做的事是登记已收货物并取消准备发货的 **第三个 iPad Mini** 。在采购单中, 点击 **收货** 并在 **iPad Mini "
 "定单行** 上, 在 **完成** 栏, 手动更改已收数量。"
 
-#: ../../purchase/purchases/rfq/cancel.rst:66
+#: ../../purchase/purchases/rfq/cancel.rst:61
 msgid "To learn more, see :doc:`reception`"
 msgstr "更多内容请参阅 :doc:`reception` "
 
-#: ../../purchase/purchases/rfq/cancel.rst:68
+#: ../../purchase/purchases/rfq/cancel.rst:63
 msgid ""
 "When clicking on **Validate**, Odoo will warn you that you have processed "
 "less products than the initial demand (2 instead of 3 in our case) and will "
 "ask you the permission to create a backorder."
 msgstr "当点击 **验证** , Odoo 会提示你已完成的产品小于要求的(在这个例子中是2个而不是3个), 并会要求你生成一个欠单。"
 
-#: ../../purchase/purchases/rfq/cancel.rst:75
+#: ../../purchase/purchases/rfq/cancel.rst:70
 msgid ""
 "Click on **No backorder** to cancel the supply of the remaining product. You"
 " will notice than the quantity to receive has been changed accordingly and, "
 "therefore, the delivery status has switched to **Done**."
 msgstr "点击 **不需要欠单** 来取消剩下的定购, 你会发现要接收的货物数量已更改, 交货情况变成 **完成** 。"
 
-#: ../../purchase/purchases/rfq/cancel.rst:83
+#: ../../purchase/purchases/rfq/cancel.rst:78
 msgid "Create reverse transfer"
 msgstr "创建逆转调拨。"
 
-#: ../../purchase/purchases/rfq/cancel.rst:85
+#: ../../purchase/purchases/rfq/cancel.rst:80
 msgid ""
 "Now, you need to return the iPad Minis that you have received to your vendor"
 " location. To do so, click on the **Reverse** button from the same document."
@@ -1691,31 +1017,31 @@ msgstr ""
 "现在, 你需要返还你已经收到的iPad Minis 给你的供应商。点击 **逆转** 按钮。一个反向调拨窗口会跳出。输入数量和要返回的库位, 点击 "
 "**返还** "
 
-#: ../../purchase/purchases/rfq/cancel.rst:93
+#: ../../purchase/purchases/rfq/cancel.rst:88
 msgid ""
 "Process the return shipment and control that the stock move is from your "
 "stock to your vendor location."
 msgstr "在库存中进行返还发货和控制库存移动到你供应商的库位。"
 
-#: ../../purchase/purchases/rfq/cancel.rst:99
+#: ../../purchase/purchases/rfq/cancel.rst:94
 msgid ""
 "When the reverse transfer is done, the status of your purchase order will be"
 " automatically set to done, meaning that your PO has been completely "
 "cancelled."
 msgstr "当逆转调拨完成后, 你的采购单的状态会自动变成完成, 意味着你的采购单被完全取消了。"
 
-#: ../../purchase/purchases/rfq/cancel.rst:104
-#: ../../purchase/purchases/rfq/reception.rst:120
+#: ../../purchase/purchases/rfq/cancel.rst:99
+#: ../../purchase/purchases/rfq/reception.rst:116
 msgid ":doc:`bills`"
 msgstr ":doc:`bills` "
 
-#: ../../purchase/purchases/rfq/cancel.rst:105
+#: ../../purchase/purchases/rfq/cancel.rst:100
 msgid ":doc:`reception`"
 msgstr ":doc:`reception` "
 
 #: ../../purchase/purchases/rfq/create.rst:3
-msgid "How to create a Request for Quotation?"
-msgstr "如何创建询价单？"
+msgid "Create a Request for Quotation"
+msgstr ""
 
 #: ../../purchase/purchases/rfq/create.rst:5
 msgid ""
@@ -1728,23 +1054,17 @@ msgstr ""
 "询价单(RFQ)用来当你打算采购一些产品并希望收到报价。在Odoo中, 询价单用来发送你想采购的产品清单给你的供应商。一旦供应商回复了你的请求, "
 "你可以选择继续以这个报价采购还是驳回。"
 
-#: ../../purchase/purchases/rfq/create.rst:12
-msgid ""
-"For more information on best uses, please read the chapter "
-":doc:`../../overview/process/difference`"
-msgstr "详阅章节 :doc:`../../overview/process/difference` "
-
-#: ../../purchase/purchases/rfq/create.rst:19
+#: ../../purchase/purchases/rfq/create.rst:16
 msgid "Creating a Request for Quotation"
 msgstr "创建一张询价单"
 
-#: ../../purchase/purchases/rfq/create.rst:21
+#: ../../purchase/purchases/rfq/create.rst:18
 msgid ""
 "In the Purchases module, open :menuselection:`Purchase --> Requests for "
 "Quotation` and click on **Create**."
 msgstr "在采购模块, 打开 :菜单选择:'采购-->询价'点击 **创建** "
 
-#: ../../purchase/purchases/rfq/create.rst:27
+#: ../../purchase/purchases/rfq/create.rst:24
 msgid ""
 "Select your supplier in the **Vendor** menu, or create it on-the-fly by "
 "clicking on **Create and Edit**. In the **Order Date** field, select the "
@@ -1752,86 +1072,11 @@ msgid ""
 msgstr ""
 "在 **供应商** 菜单选择你的供应商, 或者通过点击 **创建并编辑** 来创建。在 **订单日期** 字段, 选择你实际希望处理的日期。"
 
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid "Shipment"
-msgstr "送货"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid "Incoming Shipments"
-msgstr "入库"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid "Vendor Reference"
-msgstr "供应商编号"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid ""
-"Reference of the sales order or bid sent by the vendor. It's used to do the "
-"matching when you receive the products as this reference is usually written "
-"on the delivery order sent by your vendor."
-msgstr "供应商会发送销售订单或投标的有关信息。这些信息是你收到货物后用来核对的."
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid "Order Date"
-msgstr "订购日期"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid ""
-"Depicts the date where the Quotation should be validated and converted into "
-"a purchase order."
-msgstr "当确认报价, 并将之转成订单时, 填入相关日期."
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid "Source Document"
-msgstr "源单据"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid ""
-"Reference of the document that generated this purchase order request (e.g. a"
-" sales order)"
-msgstr "生成此采购订单请求的文档的引用（例如销售订单）"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid "Deliver To"
-msgstr "交货到"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid "This will determine operation type of incoming shipment"
-msgstr "这将决定进货的操作类型。"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid "Drop Ship Address"
-msgstr "直运地址"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid ""
-"Put an address if you want to deliver directly from the vendor to the "
-"customer. Otherwise, keep empty to deliver to your own company."
-msgstr "输入地址,如果你想直接把货直接从供应商发给客户。空着就是发自己公司。"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid "Destination Location Type"
-msgstr "目标位置类型"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid "Technical field used to display the Drop Ship Address"
-msgstr "字段用于显示直接发运地址"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid "Incoterm"
-msgstr "贸易条款"
-
-#: ../../purchase/purchases/rfq/create.rst:0
-msgid ""
-"International Commercial Terms are a series of predefined commercial terms "
-"used in international transactions."
-msgstr "国际商业条款是一系列用于国际交易的商业条款。"
-
-#: ../../purchase/purchases/rfq/create.rst:35
+#: ../../purchase/purchases/rfq/create.rst:32
 msgid "View *Request for Quotation* in our Online Demonstration"
 msgstr "在线演示中显示 **询价单** "
 
-#: ../../purchase/purchases/rfq/create.rst:37
+#: ../../purchase/purchases/rfq/create.rst:34
 msgid ""
 "In **Products**, click on Add an item. Select the product you wish to order "
 "in the **Product** menu. Specify the **Quantity** by inserting the number "
@@ -1846,13 +1091,13 @@ msgstr ""
 "指定你想要得到的价格(你也可以留空, 如果你不知道该是多少价格), 在计划日期字段填写希望的交货日期.点击 **保存** , 然后 **打印询价单** "
 "或 **通过邮件发送询价单** (确认邮件地址已经指定给这个供应商或者输入一个新的)"
 
-#: ../../purchase/purchases/rfq/create.rst:51
+#: ../../purchase/purchases/rfq/create.rst:48
 msgid ""
 "After having clicked on **Send**, you will notice that the RFQ's status will"
 " switch from **Draft** to **RFQ Sent**."
 msgstr "点击 **发送** 后, 你可以看到询价单的状态会从 **草稿** 到 **询价单已发出** 。"
 
-#: ../../purchase/purchases/rfq/create.rst:57
+#: ../../purchase/purchases/rfq/create.rst:54
 msgid ""
 "Once your supplier has replied with an offer, update the RfQ by clicking on "
 "**Edit** to fit the quotation (prices, taxes, expected delivery lead time, "
@@ -1861,21 +1106,112 @@ msgstr ""
 "一旦你的供应商回复了你的询价, 点击 **编辑** 更新询价单来匹配这个询价(价格, 税, 预期交货时间, 付款条款, 等等.)然后点击 **保存** "
 "来发布一个采购单。"
 
-#: ../../purchase/purchases/rfq/create.rst:62
+#: ../../purchase/purchases/rfq/create.rst:59
 msgid ""
 "To proceed with the order, click on **Confirm Order** to send the order to "
 "the supplier. The RfQ's status will switch to **Purchase Order**."
 msgstr "为了处理这个订单, 点击 **确认订单** 发送订单给供应商。询价单的状态会变成 **采购单** 。"
 
-#: ../../purchase/purchases/rfq/create.rst:68
+#: ../../purchase/purchases/rfq/create.rst:65
 msgid ""
 "The status of the RfQ will change to PURCHASE ORDER. Tabs in the upper right"
 " corner of the order will show 1 Shipment and 0 Invoice."
 msgstr "询价单的状态会变成采购订单。在右上角的标签会显示1个发货单和0个发票。"
 
+#: ../../purchase/purchases/rfq/dropshipping.rst:3
+msgid "Dropship products"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/dropshipping.rst:5
+msgid ""
+"Dropshipping is a method in which the vendor does not keep products in stock"
+" but instead transfers the products directly from the supplier to the "
+"customer."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/dropshipping.rst:10
+msgid ""
+"You need the *Sales*, *Inventory* and *Purchases* modules for this feature "
+"to work."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/dropshipping.rst:14
+msgid "Activate the dropshipping feature"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/dropshipping.rst:16
+msgid ""
+"Go to :menuselection:`Purchases --> Configuration --> Settings` and select "
+"*Dropshipping*."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/dropshipping.rst:22
+msgid ""
+"A new route *Dropshipping* has been created. You can go on a product and "
+"tick the dropshipping route. You also need to define to which vendor you "
+"will buy the product. Now, each time this product will be sold, it will be "
+"drop shipped."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/dropshipping.rst:30
+msgid ""
+"If you don't always dropship that product, you can go to "
+":menuselection:`Sales --> Configuration --> Settings` and tick the box in "
+"front of *Order-Specific Routes*."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/dropshipping.rst:37
+msgid ""
+"When you create a quotation or sales order, you can now decide, order line "
+"per order line, which products should be drop shipped by selecting the "
+"dropship route on the SO line."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/dropshipping.rst:45
+msgid "Drop ship a product"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/dropshipping.rst:47
+msgid ""
+"Once a sale order with products to dropship is confirmed, a request for "
+"quotation is generated by Odoo to buy the product to the vendor. If you "
+"confirm that request for quotation into a purchase order, it will create a "
+"transfer from your vendor directly to your customer. The products doesn't go"
+" through your own stock."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/lock_orders.rst:3
+msgid "Lock a purchase order"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/lock_orders.rst:5
+msgid ""
+"Once an order is confirmed, you can lock it preventing any further editing."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/lock_orders.rst:11
+msgid ""
+"For this feature to work, go to :menuselection:`Purchases --> Configuration "
+"--> Settings` and activate the *Lock Confirmed Orders* feature"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/lock_orders.rst:19
+msgid "Lock an order"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/lock_orders.rst:21
+msgid ""
+"While working on a purchase order, when you confirm it, you can then lock "
+"the order preventing any further modification on the document."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/lock_orders.rst:28
+msgid "You can unlock the document if you need to make additional changes"
+msgstr ""
+
 #: ../../purchase/purchases/rfq/reception.rst:3
-msgid "How to control product received? (entirely & partially)"
-msgstr "如何控制产品收到了？(全部&部分)"
+msgid "Control product received (entirely & partially)"
+msgstr ""
 
 #: ../../purchase/purchases/rfq/reception.rst:5
 msgid ""
@@ -1957,16 +1293,10 @@ msgstr ""
 "字段里。这可以帮你在稍后方便地对应交货单(因为交货单很可能包含他的销售订单 **供应商参照** )"
 
 #: ../../purchase/purchases/rfq/reception.rst:67
-msgid ""
-"See the documentation page :doc:`../../overview/process/from_po_to_invoice` "
-"for a full overview of the purchase process."
-msgstr "参看文档 : : doc :`../../overview/process/from_po_to_invoice` 关于采购全部流程。"
-
-#: ../../purchase/purchases/rfq/reception.rst:71
 msgid "Receive Products"
 msgstr "接收产品"
 
-#: ../../purchase/purchases/rfq/reception.rst:73
+#: ../../purchase/purchases/rfq/reception.rst:69
 msgid ""
 "If you purchased physical goods (stockable or consumable products), you can "
 "receive the products from the **Inventory** application. From the "
@@ -1976,13 +1306,13 @@ msgstr ""
 "如果你采购实际产品(可库存货可消费产品), 你可以从 **库存** 程序收取产品。从 **库存** 仪表盘, 你可以在相关仓库的收货框中看到一个按钮 "
 "**X 可以收货** 。"
 
-#: ../../purchase/purchases/rfq/reception.rst:81
+#: ../../purchase/purchases/rfq/reception.rst:77
 msgid ""
 "Click on this button and you access a list of all awaiting orders for this "
 "warehouse."
 msgstr "点击者个按钮你可以进入这个仓库的等待收货的清单。"
 
-#: ../../purchase/purchases/rfq/reception.rst:87
+#: ../../purchase/purchases/rfq/reception.rst:83
 msgid ""
 "If you have a lot of awaiting orders, you can use the filter bar to search "
 "on the **Vendor** (also called **Partner** in Odoo), the product or the "
@@ -1993,7 +1323,7 @@ msgstr ""
 "如果你有很多等待的订单, 你可以使用过滤功能来搜索你的采购单的参考信息, 比如 **供应商** (在Odoo中也叫 **合作伙伴** ), "
 "产品或者源文档。你可以打开符合条件的交货单并处理它。"
 
-#: ../../purchase/purchases/rfq/reception.rst:96
+#: ../../purchase/purchases/rfq/reception.rst:92
 msgid ""
 "You may validate the whole document at once by clicking on the **Validate** "
 "button or you can control all products, one by one, by manually change the "
@@ -2003,20 +1333,20 @@ msgstr ""
 "您可以通过点击 **验证** 按钮一次验证整个订单, 也可以逐个控制所有的产品, 通过手动更改 **完成量** (实际上已收到)。当产品行是绿色, "
 "则表示已收和预期的量匹配。"
 
-#: ../../purchase/purchases/rfq/reception.rst:103
+#: ../../purchase/purchases/rfq/reception.rst:99
 msgid ""
 "If you work with lots or serial numbers, you can not set the processed "
 "quantity, but you have to provide all the lots or serial numbers to record "
 "the quantity received."
 msgstr "如果你使用批次号或序列号, 则不能直接设定已收的数量, 你必须提供所有批次或序列号记录已收到的数量。"
 
-#: ../../purchase/purchases/rfq/reception.rst:107
+#: ../../purchase/purchases/rfq/reception.rst:103
 msgid ""
 "When you validate the reception, if you have received less products than the"
 " initial demand, Odoo will ask youthe permission to create a backorder."
 msgstr "当你验证已收的货物少于初始需求时, Odoo会要求你产生一个欠单。"
 
-#: ../../purchase/purchases/rfq/reception.rst:114
+#: ../../purchase/purchases/rfq/reception.rst:110
 msgid ""
 "If you plan to receive the remaining product in the future, select **Create "
 "Backorder**. Odoo will create a new documents for the awaiting products. If "
@@ -2025,344 +1355,221 @@ msgstr ""
 "如果你打算将来收取剩下的产品, 选择 **创建欠单** 。Odoo会产生一个文件为等待的产品。如果你选择 **没有欠单** , "
 "这个订单会被认为已经完成了。"
 
-#: ../../purchase/purchases/rfq/reception.rst:121
+#: ../../purchase/purchases/rfq/reception.rst:117
 msgid ":doc:`cancel`"
 msgstr ":doc:`cancel` "
 
+#: ../../purchase/purchases/rfq/warning.rst:3
+msgid "Raise warnings on purchase orders"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/warning.rst:5
+msgid ""
+"The *Warnings* feature allows you to raise warnings or blocking messages on "
+"purchase orders based on a vendor or a product."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/warning.rst:8
+msgid ""
+"For example, if you often have a problem with a vendor, you might want to "
+"raise a warning when purchasing from that vendor. If a product is about to "
+"be discontinued, you may want to raise a blocking message on the purchase "
+"order."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/warning.rst:16
+msgid ""
+"For this feature to work, go to :menuselection:`Purchases --> Configuration "
+"--> Settings` and activate the *Warnings* feature."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/warning.rst:24
+msgid "Add a warning on a vendor"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/warning.rst:26
+msgid ""
+"When you activate the feature, you get a new option under the *Internal "
+"Notes* tab on vendors. You can decide to write a simple warning or a "
+"blocking message."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/warning.rst:34
+msgid "Add a warning on a product"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/warning.rst:36
+msgid ""
+"When you activate the feature, you get a new option under the *Purchase* tab"
+" on the product page where you can add a warning or a blocking message."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/warning.rst:44
+msgid "Trying to buy with warnings or blocking messages"
+msgstr ""
+
+#: ../../purchase/purchases/rfq/warning.rst:46
+msgid ""
+"If you try to validate a *Purchase Order* from a vendor or with a product "
+"with a warning, a message will be raised. You can ignore it by clicking ok."
+msgstr ""
+
+#: ../../purchase/purchases/rfq/warning.rst:53
+msgid "However, if it is a blocking message, you can not ignore it."
+msgstr ""
+
 #: ../../purchase/purchases/tender.rst:3
-msgid "Purchase Tenders"
-msgstr "采购招标"
+msgid "Purchase Agreements"
+msgstr "采购协议"
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:3
-msgid "How to manage Blanket Orders"
-msgstr "如何管理总括订单"
-
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:5
-msgid ""
-"A **Blanket Order** is a contract between you (the customer) and your "
-"supplier. It is used to negotiate a discounted price. The supplier is "
-"benefited by the economies of scale inherent in a large order. You are "
-"benefited by being allowed to take multiple smaller deliveries over a period"
-" of time, at a lower price, without paying for the large order immediately. "
-"Each small periodic delivery is called a release or call-off."
-msgstr ""
-"**总括订单**维系着你（客户）和你的供应商。它被用来帮助你议价。供应商得益于大规模订单所固有的规模效益。你被允许在一段时间内以更低的价格接收多个小量的交货，而不必立即支付大订单。每个小期间的交货被称为释放或者取消。"
-
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:12
-msgid ""
-"As the blanket order is a contract, it will have some prearranged "
-"conditions. These usually include:"
-msgstr "由于总括订单是一份合同，它将会有一些 前置的条件。通常包括："
-
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:15
-msgid "Total quantity of each product to be delivered"
-msgstr "每种产品的交付总量"
-
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:17
-msgid ""
-"Completion deadline, by which you must take delivery of the total quantity"
-msgstr "在最后期限，你必须接收所有的产品量。"
-
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:19
-msgid "Unit price for each product"
-msgstr "每种产品的单价"
-
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:21
-msgid "Delivery lead time in days for each release"
+#: ../../purchase/purchases/tender/blanket_orders.rst:3
+msgid "Manage Blanket Orders"
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:24
-msgid "Activate the Purchase Agreements"
-msgstr ""
-
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:26
+#: ../../purchase/purchases/tender/blanket_orders.rst:5
 msgid ""
-"The Blanket Order function is provided by the Purchase Agreements feature. "
-"By default, the Purchase Agreements is not activated. To be able to use "
-"blanket orders, you must first activate the option."
+"A Blanket Order is a purchase order which a customer places with its "
+"supplier to allow multiple delivery dates over a period of time, often "
+"negotiated to take advantage of predetermined pricing."
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:30
+#: ../../purchase/purchases/tender/blanket_orders.rst:12
 msgid ""
-"In the Purchases module, open the Configuration menu and click on Settings. "
-"In the **Orders** section, locate the **Purchase Agreements** and tick the "
-"box, then click on **Save**."
+"For this feature to work, go to :menuselection:`Purchases --> Configuration "
+"--> Settings` and activate the *Purchase Agreements* feature"
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:38
-msgid "Create a Blanket Order"
+#: ../../purchase/purchases/tender/blanket_orders.rst:20
+msgid "Start a Blanket Order"
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:40
+#: ../../purchase/purchases/tender/blanket_orders.rst:22
+#: ../../purchase/purchases/tender/call_for_tender.rst:21
 msgid ""
-"To create a new blanket order, open :menuselection:`Purchase --> Purchase "
+"To use this feature go to :menuselection:`Purchases --> Purchase "
 "Agreements`."
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:45
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:39
+#: ../../purchase/purchases/tender/blanket_orders.rst:24
 msgid ""
-"In the Purchase Agreements window, click on **Create**. A new Purchase "
-"Agreement window opens."
-msgstr "在“采购协议”窗口中点击**创建**，开启一个新的“采购协议”窗口。"
-
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:48
-msgid "In the **Agreement Type** field, choose Blanket Order."
+"Once you are creating the purchase agreement, access the *Agreement Type* "
+"drop down menu and select *Blanket Order*."
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:50
-msgid "Choose the **Vendor** with whom you will make the agreement."
+#: ../../purchase/purchases/tender/blanket_orders.rst:30
+msgid ""
+"You can then create your new blanket order, select your vendor, the "
+"product(s), agreement deadline, ordering date and delivery date."
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:52
-msgid "Set the **Agreement Deadline** as per the conditions of the agreement."
+#: ../../purchase/purchases/tender/blanket_orders.rst:33
+msgid ""
+"When you are satisfied with your purchase agreement, confirm it. Its status "
+"will change from*Draft* to *Ongoing* and a new *RFQs/Orders* will appear in "
+"the top right corner of the document."
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:54
-msgid "Set the **Ordering Date** to the starting date of the contract."
+#: ../../purchase/purchases/tender/blanket_orders.rst:41
+msgid "RFQ from the Blanket Order"
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:56
+#: ../../purchase/purchases/tender/blanket_orders.rst:43
 msgid ""
-"Leave the **Delivery Date** empty because we will have different delivery "
-"dates with each release."
+"From your blanket order you can create a new quotation, Odoo will auto-fill "
+"the document with the product(s) from your blanket order, you only have to "
+"choose the quantity and confirm the order."
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:59
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:52
+#: ../../purchase/purchases/tender/blanket_orders.rst:47
 msgid ""
-"In the **Products** section, click on **Add an item**. Select products in "
-"the Product list, then insert **Quantity**. You can add as many products as "
-"you wish."
-msgstr "在**产品**节点击**添加项目**，从产品列表中选择产品，然后输入**数量**。可以添加多个产品。"
-
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:66
-msgid "Click on **Confirm**."
+"When you will go back on the blanket order, you will see how many quantities"
+" you have already ordered from your blanket order."
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:68
-msgid ""
-"Now click on the button **New Quotation**. A RfQ is created for this vendor,"
-" with the products chosen on the PT. Repeat this operation for each release."
+#: ../../purchase/purchases/tender/blanket_orders.rst:51
+msgid "Vendors prices on your product"
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:71
+#: ../../purchase/purchases/tender/blanket_orders.rst:53
 msgid ""
-"Be careful to change the **Quantity** field on the RFQ.  By default, the RFQ"
-" quantity will be for the entire remaining quantity. Your individual "
-"releases should be for some smaller quantity."
+"When a blanket order is validated, a new vendor line is added in your "
+"product. You can see which one are linked to a blanket order and give "
+"priority to the ones you want with the arrows on the left of the vendor "
+"name."
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:78
+#: ../../purchase/purchases/tender/blanket_orders.rst:58
 msgid ""
-"When all of the releases (purchase orders) have been delivered and paid, you"
-" can click on **Validate** and **Done**."
+"Thanks to this, a blanket order can be used for automated replenishment "
+"(using *reordering rules* or *made to order* configuration)."
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:81
+#: ../../purchase/purchases/tender/blanket_orders.rst:65
 msgid ""
-"View `Purchase Agreements "
-"<https://demo.odoo.com/?module=purchase_requisition.action_purchase_requisition>`__"
-" in our Online Demonstration."
+"You can also create a *Request for Quotation* from the classic RFQ Menu and "
+"link them with an existing *Blanket Order*"
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_blanket_orders.rst:88
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:83
-msgid ":doc:`../../overview/process/difference`"
-msgstr ":doc:`../../overview/process/difference` "
-
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:3
-msgid "How to manage Purchase Tenders"
-msgstr "如何管理采购招标"
-
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:12
-msgid ""
-"For more information on best uses, please read the chapter `Request for "
-"Quotation, Purchase Tender or Purchase Order? "
-"<https://www.odoo.com/documentation/user/11.0/purchase/overview/process/difference.html>`__"
+#: ../../purchase/purchases/tender/call_for_tender.rst:3
+msgid "Manage Call for Tender"
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:17
-msgid "Activate the Purchase Tender function"
-msgstr "激活采购招标功能"
-
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:19
+#: ../../purchase/purchases/tender/call_for_tender.rst:5
 msgid ""
-"By default, the Purchase Tender is not activated. To be able to use PTs, you"
-" must first activate the option."
-msgstr "默认下, 采购招标是未激活的。为了使用采购招标, 你首先要激活这个选项。"
-
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:22
-msgid ""
-"In the Purchases module, open the Configuration menu and click on Settings. "
-"In the Purchase Order section, locate the **Calls for Tenders** and tick the"
-" box Allow using call for tenders... (advanced), then click on **Apply**."
-msgstr "在采购模块下，打开配置菜单并点击“设置”。在采购订单节，找到**邀请招标**，再选择“允许邀请招标...(高级)，然后点击**应用**。"
-
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:31
-msgid "Create a Purchase Tender"
-msgstr "创建一个采购招标"
-
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:33
-msgid ""
-"To create a new Purchase Tender, open :menuselection:`Purchase --> Purchase "
-"Agreements (PA)`."
-msgstr "要创建一个新的采购招标，请在选单中打开采购->采购协议(PA)。"
-
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:42
-msgid "In the **Agreement Type** field, choose Purchase Tender."
-msgstr "在**协议类型**字段中选择“采购招标”。"
-
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:44
-msgid ""
-"The **Agreement Deadline** field tells the vendors when to have their offers"
-" submitted."
+"A Call for Tender is a special procedure to request offers from multiple "
+"vendors to obtain the most interesting price."
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:46
+#: ../../purchase/purchases/tender/call_for_tender.rst:11
 msgid ""
-"The **Ordering Date** field tells the vendors when we will submit a purchase"
-" order to the chosen vendor."
+"For this feature to work, go to :menuselection:`Purchases --> Configuration "
+"--> Settings` and activate the *Purchase Agreements* feature."
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:48
-msgid ""
-"The **Delivery Date** field tells the vendors when the product will have to "
-"be delivered."
+#: ../../purchase/purchases/tender/call_for_tender.rst:19
+msgid "Create a Call for Tender"
 msgstr ""
 
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:50
-msgid "You do not have to define a **Vendor**."
-msgstr "不需要定义**供应商**。"
-
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:59
-msgid "Click on **Confirm Call**."
-msgstr "点击**确认邀请**。"
-
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:61
+#: ../../purchase/purchases/tender/call_for_tender.rst:23
 msgid ""
-"Now click on the button **New Quotation**. A RfQ is created with the "
-"products chosen on the PT. Choose a **Vendor** and send the RfQ to the "
-"vendor. Repeat this operation for each vendor."
+"Create a new purchase agreement, access the *Agreement Type* drop down menu "
+"and select *Call for Tender*."
 msgstr ""
-"点击**新报价**按钮。会为采购招标上选择的产品创建一个询价单。选择一个**供应商**然后将询价单发给该供应商。每个供应商都要重复这一操作。"
 
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:68
-msgid "Once all the RfQs are sent, you can click on **Validate** on the PT."
-msgstr "全部询价单发送完毕后，在采购招标上点击**确认**。"
-
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:70
+#: ../../purchase/purchases/tender/call_for_tender.rst:26
 msgid ""
-"The vendors will send their offers, you can update the RfQs accordingly. "
-"Then, choose the ones you want to accept by clicking on **Confirm Order** on"
-" the RfQs and **Cancel** the others."
-msgstr "供应商将发送报价，你可以相应地更新询价单。对于选中的供应商，你可以在询价单上点击“确认订单”并**取消**其他询价单。"
-
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:74
-msgid "You can now click on **Done** on the PT."
-msgstr "现在可以在采购招标上点击**完成**。"
-
-#: ../../purchase/purchases/tender/manage_multiple_offers.rst:76
-msgid ""
-"View `Purchase Tenders "
-"<https://demo.odoo.com/?module=purchase_requisition.action_purchase_requisition>`__"
-" in our Online Demonstration."
+"When you are satisfied with your purchase agreement, confirm it will move "
+"from *Draft* to *Confirmed* and a new *RFQs/Orders* appeared in the top "
+"right corner of the document."
 msgstr ""
-"在https://demo.odoo.com/?module=purchase_requisition.action_purchase_requisition在线的演示系统中查看采购招标"
 
-#: ../../purchase/purchases/tender/partial_purchase.rst:3
-msgid ""
-"How to purchase partially at two vendors for the same purchase tenders?"
-msgstr "如何在一个采购招标中从两个不同的供应商采购部分产品。"
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:5
-msgid ""
-"For some Purchase Tenders (PT), you might sometimes want to be able to "
-"select only a part of some of the offers you received. In Odoo, this is made"
-" possible through the advanced mode of the **Purchase** module."
-msgstr "对于某些采购招标(PT).也许有时你只需要从你收到的报价中选择一部分。在Odoo中, 通过 **采购** 模式中的高级模式可以实现。"
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:10
-msgid ""
-"If you want to know how to handle a simple **Purchase Tender**, read the "
-"document on :doc:`manage_multiple_offers`."
-msgstr "如果你想知道如何处理一个简单的 **采购招标** , 请阅读文档 :doc:`manage_multiple_offers` ."
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:19
-msgid "From the **Apps** menu, install the **Purchase Management** app."
-msgstr "从 **Apps** 菜单, 安装 **采购管理** 程序。"
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:25
-msgid "Activating the Purchase Tender and Purchase Tender advanced mode"
-msgstr "激活采购招标和采购招标高级模式。"
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:27
-msgid ""
-"In order to be able to select elements of an offer, you must activate the "
-"advanced mode."
-msgstr "为了可以从一个报价中选择一部分, 你必须激活高级模式。"
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:30
-msgid ""
-"To do so, go into the **Purchases** module, open the **Configuration** menu "
-"and click on **Settings**."
-msgstr "在 **采购** 模块, 打开 **配置** 菜单点击 **设置** 来激活高级模式。"
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:33
-msgid ""
-"In the **Calls for Tenders** section, tick the option **Allow using call for"
-" tenders to get quotes from multiple suppliers(...)**, and in the **Advanced"
-" Calls for Tenders** section, tick the option **Advanced call for tender "
-"(...)** then click on **Apply**."
+#: ../../purchase/purchases/tender/call_for_tender.rst:34
+msgid "Request new quotations from the Call for Tender"
 msgstr ""
-"在 **招标** 部分, 勾选 **允许使用从不同供应商(...)得到报价** , 并且在 **高级招标** 部分, 勾选 **高级招标(...)** "
-"然后点击 **应用** ."
 
-#: ../../purchase/purchases/tender/partial_purchase.rst:42
-msgid "Selecting elements of a RFQ/Bid"
-msgstr "选择询价单/招标的部分。"
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:44
+#: ../../purchase/purchases/tender/call_for_tender.rst:36
 msgid ""
-"Go to :menuselection:`Purchase --> Purchase Tenders`. Create a purchase "
-"tender containing several products, and follow the usual sequence all the "
-"way to the **Bid Selection** status."
-msgstr "在 :菜单选择 :'采购-->采购招标'.创建一个包含一些产品的采购招标, 并按照通常的顺序一路到 **投标选择** 状态"
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:49
-msgid ""
-"When you closed the call, click on **Choose Product Lines** to access the "
-"list of products and the bids received for all of them."
-msgstr "当你结束招标, 点击 **选择产品行** 进入所有产品清单和收到的投标。"
-
-#: ../../purchase/purchases/tender/partial_purchase.rst:55
-msgid ""
-"Unroll the list of offers you received for each product, and click on the "
-"*v* symbol (**Confirm order**) next to the offers you wish to proceed with. "
-"The lines for which you've confirmed the order turn blue. When you're "
-"finished, click on **Generate PO** to create a purchase order for each "
-"product and supplier."
+"From the Call for Tender, Odoo will auto-fill the RFQ with the product(s) "
+"from your Call for Tender."
 msgstr ""
-"展开你收到的每种产品的列表, 点击你希望与继续的报价后的 * V * 符号( **确认订单** )。对于确认订单会变成蓝色。完成后, 点击 "
-"**生成采购单** 来为每一个产品和供应商生成采购订单。"
 
-#: ../../purchase/purchases/tender/partial_purchase.rst:64
+#: ../../purchase/purchases/tender/call_for_tender.rst:40
+msgid "Select the best offer"
+msgstr ""
+
+#: ../../purchase/purchases/tender/call_for_tender.rst:42
 msgid ""
-"When you come back to you purchase tender, you can see that the status has "
-"switched to **PO Created** and that the **Requests for Quotations** now have"
-" a status of **Purchase Order** or **Cancelled**."
-msgstr "当你会到采购招标, 你可以看到状态已变成 **PO 已生成** 并且 **询价单** 现在已经是 **采购单** 或 **取消** 状态。"
+"The various RFQs and orders linked to the Call for Tenders will be under the"
+" *RFQs/Orders* button where you can select and confirm the best offer."
+msgstr ""
 
-#: ../../purchase/purchases/tender/partial_purchase.rst:72
-msgid ""
-"From there, follow the documentation "
-":doc:`../../overview/process/from_po_to_invoice` to proceed with the "
-"delivery and invoicing."
-msgstr "按文档 :doc:`../../overview/process/from_po_to_invoice` 来进行交货和开票。"
+#: ../../purchase/purchases/tender/call_for_tender.rst:50
+msgid "Close the Call for Tender"
+msgstr ""
 
-#: ../../purchase/purchases/tender/partial_purchase.rst:76
-msgid ":doc:`manage_multiple_offers`"
-msgstr ":doc:`manage_multiple_offers` "
+#: ../../purchase/purchases/tender/call_for_tender.rst:52
+msgid "Once you're done with your *Call for Tender* don't forget to close it."
+msgstr ""
 
 #: ../../purchase/replenishment.rst:3
 msgid "Replenishment"
@@ -2373,226 +1580,152 @@ msgid "Replenishment Flows"
 msgstr "补货流程"
 
 #: ../../purchase/replenishment/flows/compute_date.rst:3
-msgid "How are the order date and scheduled dates computed?"
-msgstr "订单日期和计划日期是如何计算的？"
+msgid "Schedule your receipts and deliveries"
+msgstr ""
 
 #: ../../purchase/replenishment/flows/compute_date.rst:5
 msgid ""
-"Scheduled dates are computed in order to be able to plan deliveries, "
-"receptions and so on. Depending on the habits of your company, Odoo "
-"automatically generates scheduled dates via the scheduler. The Odoo "
-"scheduler computes everything per line, whether it's a manufacturing order, "
-"a delivery order, a sale order, etc. The dates that are computed are "
-"dependent on the different leads times configured in Odoo."
+"To manage your supply chain scheduling, you will need to use Odoo *Lead "
+"Times*."
 msgstr ""
-"计算计划日期是为了能够为交货, 收货等做计划。按照您的公司的习惯, Odoo自动通过排程器生成计划日期。Odoo排程器按行计算每件事, 无论是工单, "
-"交货单, 销售订单, 等等。日期按在Odoo中不同的提前期计算。"
 
-#: ../../purchase/replenishment/flows/compute_date.rst:13
-msgid "Configuring lead times"
-msgstr "配置提前期"
+#: ../../purchase/replenishment/flows/compute_date.rst:8
+msgid ""
+"*Lead Times* are the expected times needed to receive, deliver or "
+"manufacture products."
+msgstr ""
+
+#: ../../purchase/replenishment/flows/compute_date.rst:12
+msgid "Configure Lead Times"
+msgstr ""
 
 #: ../../purchase/replenishment/flows/compute_date.rst:15
-msgid ""
-"Configuring **lead times** is an essential move in order to compute "
-"scheduled dates. Lead times are the delays (in term of delivery, "
-"manufacturing, ...) promised to your different partners and/or clients. "
-"Configuration of the different lead times are made as follows:"
+msgid "Vendor Lead Time"
 msgstr ""
-"配置 **提前期** 是为了计算计划日期的重要步骤。提前期是(在交付, 制造期限, "
-"......)时答应你的不同的合作伙伴和/或客户的延迟时间。不同的提前时间的配置是由如下 :"
 
-#: ../../purchase/replenishment/flows/compute_date.rst:21
-msgid "On a product level"
-msgstr "在产品层面。"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:24
-msgid "Supplier lead time:"
-msgstr "供应商提前期"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:26
+#: ../../purchase/replenishment/flows/compute_date.rst:17
 msgid ""
-"The supplier lead time is the time needed for the supplier to deliver your "
-"purchased product. To configure the Supplier lead time select a product "
-"(from the Purchase module, go to :menuselection:`Purchase --> Product`), and"
-" go in the **Inventory** tab. You will have to add a **Vendor** to your "
-"product in order to select a supplier lead time."
+"The vendor lead time is the time needed by your vendor to deliver the "
+"product to you."
 msgstr ""
-"供应商交货提前时间是供应商需要提供您购买的产品的时间。要配置供应商交货时间选择一个产品(从采购模块, 请访问 :菜单选择:`购买 - > "
-"Product` ), 并在 **库存** 标签。您要添加一个 **供应商** 添加到您的产品, 并选择交货提前期。"
 
-#: ../../purchase/replenishment/flows/compute_date.rst:36
+#: ../../purchase/replenishment/flows/compute_date.rst:20
 msgid ""
-"It is possible to add more than one vendor per product and thus different "
-"delivery lead times depending on the vendor."
-msgstr "可以为一个产品添加多个供应商, 然而不同的交货提前期对应不同的供应商。"
+"To configure your vendor lead times, go to a product page, under the "
+"purchase tab, click on a *Vendor* once there you can change the delivery "
+"lead time for that Vendor & Product."
+msgstr ""
 
-#: ../../purchase/replenishment/flows/compute_date.rst:39
+#: ../../purchase/replenishment/flows/compute_date.rst:28
+msgid "Customer Lead Time"
+msgstr "客户前置时间"
+
+#: ../../purchase/replenishment/flows/compute_date.rst:30
 msgid ""
-"Once a vendor is selected, click on it to open its form and indicate its "
-"delivery lead time."
-msgstr "当供应商被选定后, 点击打开界面并制定交货提前期。"
+"The customer lead time, on the other hand, is the time you need to deliver "
+"the product to your customer."
+msgstr ""
 
-#: ../../purchase/replenishment/flows/compute_date.rst:46
+#: ../../purchase/replenishment/flows/compute_date.rst:33
 msgid ""
-"In this case security days have no influence, the scheduled delivery days "
-"will be equal to: Date of the purchase order + Delivery Lead Time."
-msgstr "在这种情况下, 安全天数没有影响, 计划交货天数将等于 :采购订单日期+交货提前期。"
+"To configure your customer lead time open a product and go under the "
+"*Inventory* tab. You can then add how many days you need."
+msgstr ""
 
-#: ../../purchase/replenishment/flows/compute_date.rst:50
-msgid "Customer lead time"
-msgstr "客户提前期。"
+#: ../../purchase/replenishment/flows/compute_date.rst:40
+msgid "Manufacturing lead time"
+msgstr ""
+
+#: ../../purchase/replenishment/flows/compute_date.rst:42
+msgid ""
+"The manufacturing lead time is the time you need to manufacture the product."
+msgstr ""
+
+#: ../../purchase/replenishment/flows/compute_date.rst:45
+msgid ""
+"To configure your manufacturing lead time open a product and go under the "
+"*Inventory* tab. You can then add how many days you need."
+msgstr ""
 
 #: ../../purchase/replenishment/flows/compute_date.rst:52
-msgid ""
-"The customer lead time is the time needed to get your product from your "
-"store/warehouse to your customer. It can be configured for any product. "
-"Simply select a product (from the **Sales** module, go to "
-":menuselection:`Sales --> Product`), and go into the **Sales** tab to "
-"indicate your customer lead time."
+msgid "Configure Security Lead Times"
 msgstr ""
-"客户提前期是货物从你的仓库到你的客人处的时间。它可以为任何产品配置。简单地选择一个产品(从 **销售** 模块, 访问 "
-":菜单选择:'销售-->产品'), 并来到 **销售** 标签来制定你的客户提前期。"
 
-#: ../../purchase/replenishment/flows/compute_date.rst:62
-msgid "On the company level"
-msgstr "在公司层面"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:64
+#: ../../purchase/replenishment/flows/compute_date.rst:54
 msgid ""
-"On company level, it is possible to parameter **security days** in order to "
-"cope with eventual delays and to be sure to meet your engagements. The idea "
-"is to subtract **backup** days from the computed scheduled date in case of "
-"delays."
+"Odoo also lets you configure *Security Days* allowing you to cope with "
+"potential delays along the supply chain and make sure you meet your "
+"engagements."
 msgstr ""
-"在公司层面, 可以使用参数 **安全天数** 来应付最终可能的延误并保证满足你的约定。方法是在延迟的情况下, 从所计算的预定日期减去 **备份** "
-"天数。"
 
-#: ../../purchase/replenishment/flows/compute_date.rst:70
-msgid "Sales Safety days"
-msgstr "销售安全天数"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:72
+#: ../../purchase/replenishment/flows/compute_date.rst:58
 msgid ""
-"Sales Safety days are **back-up** days to ensure you will be able to deliver"
-" your clients engagements on time. They are margins of errors for delivery "
-"lead times. Security days are the same logic as the early wristwatch, in "
-"order to arrive on time. The idea is to subtract the numbers of security "
-"days from the calculation and thus to compute a scheduled date earlier than "
-"the one you promised to your client. That way you are sure to be able to "
-"keep your commitment."
+"The easiest way is to go to *Settings* from any module and type **Lead "
+"Time** in the search bar. From there, tick each box and configure your "
+"various *Security Lead Time* for your needs."
 msgstr ""
-"销售安全天使就是 **备份** 天数, 用来保证你能在约定期内及时交付产品给你的客户。它们是交货提前期的错误边际。安全天数和腕表提前是一个逻辑, "
-"为了及时到达。方法是从计算出来的计划日期中减去安全天数, 并且计算一个比你承诺给你的客户的更早的计划日期。这样你可以保证实现你的承诺。"
 
-#: ../../purchase/replenishment/flows/compute_date.rst:80
+#: ../../purchase/replenishment/flows/compute_date.rst:65
 msgid ""
-"To set up your security dates, go to the app :menuselection:`Settings --> "
-"General settings`, and click on **Configure your company data**."
+"Alternatively, you can go in the settings of the *Inventory* module and "
+"*Manufacturing* module to configure those settings."
+msgstr ""
+
+#: ../../purchase/replenishment/flows/compute_date.rst:69
+msgid "Lead & security times in a use case"
+msgstr ""
+
+#: ../../purchase/replenishment/flows/compute_date.rst:71
+msgid ""
+"For example you sell a car today (January 1st), that is purchased on order, "
+"and you promise to deliver your customer within 20 days (January 20). Here "
+"is your product’s configuration:"
+msgstr ""
+
+#: ../../purchase/replenishment/flows/compute_date.rst:75
+msgid "Security lead time for sales : 1 day"
+msgstr ""
+
+#: ../../purchase/replenishment/flows/compute_date.rst:77
+msgid "Security lead time for purchase : 1 day"
+msgstr ""
+
+#: ../../purchase/replenishment/flows/compute_date.rst:79
+msgid "Vendor delivery lead time : 9 days"
+msgstr ""
+
+#: ../../purchase/replenishment/flows/compute_date.rst:81
+msgid ""
+"In such a scenario, the scheduler will trigger the following events based on"
+" your configuration."
+msgstr ""
+
+#: ../../purchase/replenishment/flows/compute_date.rst:84
+msgid ""
+"January 19: scheduled delivery date (20th January - 1 day of security lead "
+"time for Sales)"
 msgstr ""
-"设置安全天数, 进入 :menuselection:`设置(Settings) -->通用设置(General settings)` 然后点击 "
-"**配置公司数据** 。"
 
 #: ../../purchase/replenishment/flows/compute_date.rst:87
-msgid "Go the **Configuration** tab to indicate the number of safety days"
-msgstr "访问 **配置** 标签来制定安全日期天数。"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:93
 msgid ""
-"Note that you can in this menu configure a default **Manufacturing** lead "
-"time."
-msgstr "注意, 你可以在这个菜单里配置一个默认的 **生产** 提前期。"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:97
-msgid "Purchase days"
-msgstr "采购天数"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:99
-msgid "Purchase days response to the same logic than sales security days."
-msgstr "采购天数和销售安全期的逻辑一样。"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:101
-msgid ""
-"They are margins of error for vendor lead times. When the system generates "
-"purchase orders for procuring products, they will be scheduled in order to "
-"cope with unexpected vendor delays. Purchase lead time can be found in the "
-"same menu as the sales safety days (see screenshot above)."
+"January 18: scheduled receipt date (19th January - 1 day of security lead "
+"time for Purchase)"
 msgstr ""
-"对供应商提前期有一些错误安全边际。当系统生成采购订单对产品进行补货的时候, "
-"它们可以被计划早一些天数用来应付供应商一些未知的不确定的延期。采购提前期可以在销售安全天数的同一个菜单下面看到(看上图的截图)。"
 
-#: ../../purchase/replenishment/flows/compute_date.rst:108
-msgid "On route level"
-msgstr "在路线层面"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:110
+#: ../../purchase/replenishment/flows/compute_date.rst:90
 msgid ""
-"The internal transfers due to the movement of stocks can also influence the "
-"computed date."
-msgstr "内部调拨产生的仓库移动可能也会影响计算日期。"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:113
-msgid ""
-"The delays due to internal transfers can be specified in the **Inventory** "
-"module when creating a new push rule for a new route."
-msgstr "由内部调拨引起的延误可以在为新路线创建一个新的推式规则时在 **仓储** 模块中被定义。"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:117
-msgid ""
-"Read the documentation "
-":doc:`../../../../inventory/routes/concepts/push_rule` to learn more."
-msgstr "阅读文档 :文档 :`../../../../库存/路线/概念/推式_规则` 了解更多."
-
-#: ../../purchase/replenishment/flows/compute_date.rst:125
-msgid "On document level:"
-msgstr "在文档层面。"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:128
-msgid "Requested date"
-msgstr " **需求日期** "
-
-#: ../../purchase/replenishment/flows/compute_date.rst:130
-msgid ""
-"Odoo offers the possibility to indicate a requested date by the client "
-"straight on the sale order, under the tab **Other information**. If this "
-"date is earlier than the theoretically computed date, Odoo will "
-"automatically display a warning."
-msgstr "Odoo提供了在销售订单上 **其他资料** 的标签下直接指定客户的请求日期。如果这个日期比理论计算机日期早, Odoo会自动显示警告。"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:141
-msgid ""
-"As an example, you may sell a car today (January 1st), that is purchased on "
-"order, and you promise to deliver your customer within 20 days (January 20)."
-" In such a scenario, the scheduler may trigger the following events, based "
-"on your configuration:"
+"January 10: order date = deadline to order from your vendor (19th January - "
+"9 days of vendor lead time)"
 msgstr ""
-"例如, 你今天可以销售一辆汽车(一月1号), 该车是按订单补货方式, 并且你已经承诺会在20天内给客户交货(一月20号)。在该情景下, "
-"排程器可能会根据你的配置触发以下事件 :"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:146
-msgid "January 19: actual scheduled delivery (1 day of Sales Safety days)"
-msgstr "分录19 :实际计划发货(销售安全天数的1天)"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:148
-msgid ""
-"January 18: receive the product from your supplier (1 day of Purchase days)"
-msgstr "分录1８ :从供应商收货(采购天数的1天)"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:151
-msgid ""
-"January 10: deadline to order at your supplier (9 days of supplier delivery "
-"lead time)"
-msgstr "分录10 :给供应商下单的最后期限(供应商交货提前期的9天)"
-
-#: ../../purchase/replenishment/flows/compute_date.rst:154
-msgid ""
-"January 8: trigger a purchase request to your purchase team, since the team "
-"needs on average 2 days to find the right supplier and order."
-msgstr "分录8 :触发一个采购需求给采购团队, 因为采购部分平均需要2天询价并下单。"
 
 #: ../../purchase/replenishment/flows/dropshipping.rst:3
-msgid "How to setup drop-shipping?"
-msgstr "如何设置直销"
+msgid "Setup drop-shipping"
+msgstr ""
+
+#: ../../purchase/replenishment/flows/dropshipping.rst:6
+#: ../../purchase/replenishment/multicompany/setup.rst:6
+msgid "Overview"
+msgstr "概览"
 
 #: ../../purchase/replenishment/flows/dropshipping.rst:8
 msgid ""
@@ -2641,503 +1774,144 @@ msgid ""
 msgstr "为了能给发货开发票, 你必须在你的产品上设置你的开票政策为 **已订数量** "
 
 #: ../../purchase/replenishment/flows/purchase_triggering.rst:3
-msgid "How to trigger the purchase of products based on sales?"
-msgstr "如何基于销售触发采购订单。"
+msgid "Trigger purchase of products based on sales (Make to Order)"
+msgstr ""
+
+#: ../../purchase/replenishment/flows/purchase_triggering.rst:5
+msgid ""
+"If you don't keep stock of your products, you may need to trigger purchase "
+"orders on each sale you make."
+msgstr ""
 
 #: ../../purchase/replenishment/flows/purchase_triggering.rst:8
 msgid ""
-"When you work in just-in-time, you don't manage stock so you directly order "
-"the product you need from your vendor."
-msgstr "当你采用无库存方式生产方式时, 你无须管理库存所以你直接从你的供应商处采购所需产品。"
+"Thanks to being a fully integrated solution, Odoo lets you do that easily in"
+" just one step."
+msgstr ""
 
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:11
-msgid "The usual flow is:"
-msgstr "通常的流程是 :"
+#: ../../purchase/replenishment/flows/purchase_triggering.rst:12
+msgid "Configure the product"
+msgstr ""
 
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:13
-msgid "Create a sale order"
-msgstr "创建销售订单"
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:15
-msgid "Purchase the product"
-msgstr "采购产品"
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:17
-msgid "Receive and pay the bill"
-msgstr "接收和支付账单"
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:19
-msgid "Deliver your product"
-msgstr "产品交货"
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:21
-msgid "Invoice your customer"
-msgstr "给客户开票"
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:24
-msgid "Product configuration"
-msgstr "产品配置"
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:26
+#: ../../purchase/replenishment/flows/purchase_triggering.rst:14
 msgid ""
-"In the purchases application, open the **Purchase** menu and click on "
-"**Products**. Open the product on which you want to do your purchases based "
-"on sales."
-msgstr "在采购模块, 打开 **采购** 菜单并点击 **产品** 。打开你基于销售所要采购的产品。"
+"Open a product form and, under the inventory tab, tick the routes *Buy* and "
+"*Make To Order*."
+msgstr ""
 
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:30
+#: ../../purchase/replenishment/flows/purchase_triggering.rst:20
+msgid "Don't forget to also set a vendor under the *Purchase* tab."
+msgstr ""
+
+#: ../../purchase/replenishment/flows/purchase_triggering.rst:23
 msgid ""
-"Next to Routes, tick **Buy** and **Make to order** as a procurement method. "
-"When you are generating sales order, Odoo will automatically reorder the "
-"same quantity through procurement."
-msgstr "下一步到路线, 勾选 **购买** 和 **按订单生产** 作为补货方式。当你生成销售订单时, Odoo会通过补货自动重新订购相同的数量。"
+"The *Inventory*, *Sales* and *Purchases* modules have to be installed in "
+"Odoo for this feature to work."
+msgstr ""
 
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:37
-msgid "Don't forget to set a vendor otherwise the rule won't be triggered."
-msgstr "不要忘了设置供应商否则规则不会被触发。"
+#: ../../purchase/replenishment/flows/purchase_triggering.rst:27
+msgid "Create a sales order using Buy & MTO"
+msgstr ""
 
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:39
+#: ../../purchase/replenishment/flows/purchase_triggering.rst:29
 msgid ""
-"You can also configure minimum stock rules that will trigger the purchase "
-"orders."
-msgstr "你也可以配置最小库存规则来触发采购订单。"
+"Create a new sales order with your product. When you confirm the order, a "
+"delivery order is created with the status *Waiting for another operation*."
+msgstr ""
 
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:43
+#: ../../purchase/replenishment/flows/purchase_triggering.rst:33
 msgid ""
-"To know how to configure a minimum stock rule, please read the document "
-":doc:`setup_stock_rule`."
-msgstr "为了知道如何设置最小库存规设则, 请阅读文档 :文档:'设置_库存_规则'."
+"A new RfQ will automatically be created in your *Purchases* module. Note "
+"that you can see for which SO this RfQ has been created thanks to the "
+"*Source Document* field, visible on the RfQ."
+msgstr ""
 
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:50
-msgid "Sale order"
-msgstr "销售订单"
+#: ../../purchase/replenishment/flows/purchase_triggering.rst:40
+msgid ""
+"When you confirm the RfQ into a purchase order, a receipt is automatically "
+"created and directly accessible from your purchase order with the use of the"
+" *Shipment* button."
+msgstr ""
+
+#: ../../purchase/replenishment/flows/purchase_triggering.rst:47
+msgid ""
+"You can validate the receipt of your products. When you will go back to the "
+"delivery order, you will see that the products are now ready to be shipped."
+msgstr ""
 
 #: ../../purchase/replenishment/flows/purchase_triggering.rst:52
 msgid ""
-"To create a sale order, go to the **Sales** application, "
-":menuselection:`Sales --> Sales order` and create a new sale order."
-msgstr "为了创建一个销售订单, 在 **销售** 模块, 菜单选择 :’销售-->销售订单'并创建一个新的销售订单。"
+"As long as your RfQ is not confirmed, Odoo will keep adding PO Lines "
+"automatically under it."
+msgstr ""
 
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:58
-msgid ""
-"After confirming it, you will see one **Delivery** associated with this sale"
-" order on the **button** on the top of it."
-msgstr "确认后, 你会在顶部看到一个 **发货** **按钮** 关联到这个销售订单。"
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:64
-msgid ""
-"Click on the **Delivery** button to see the transfer order. The status of "
-"the outgoing shipment is **Waiting Another Operation**. It won't be done "
-"until the purchase order is confirmed and received."
-msgstr "点击 **发货** 按钮查看挑拨单, 出去的运输状态是 **等待另外的操作** 。直到采购单被确认并收货后才会变成完成。"
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:69
-msgid "Purchase order"
-msgstr "采购订单"
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:71
-msgid ""
-"The purchase order is automatically created. Go to the **Purchase** "
-"application :menuselection:`Purchase --> Request for Quotation`. The source "
-"document is the sale order that triggered the procurement."
-msgstr "采购订单被自动创建了。来到 **采购** 模块 :菜单项:'采购'-->报价需求'。源文档是触发了补货的销售订单。"
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:79
-msgid ""
-"If you make some more sales that trigger procurements to the same vendor, it"
-" will be added to the existing request for quotation. Once it is confirmed, "
-"the next procurements will create a new request for quotation."
-msgstr "如果你做一些更多的销售触发补货到相同的供应商, 它会被添加到现有的报价请求。一旦被证实, 下一个补货将为生成一个新的报价请求。"
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:85
-msgid "Receipt and delivery"
-msgstr "收货和交货"
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:87
-msgid ""
-"Go the the **Inventory** application. Click on **# To Receive** on the "
-"**Receipts** tile."
-msgstr "去到 **库存** 模块, 在 **接收** 标题下点击 **#收取** "
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:93
-msgid "Select the receipt from your vendor and **Validate** it."
-msgstr "选择从你的供应商处接收并 **验证** 。"
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:98
-msgid ""
-"Go back to the **Inventory** dashboard. In the delivery order, click on **# "
-"To Do**. The delivery order is now ready to ship."
-msgstr "回到 **库存** 仪表盘。在交货单, 点击 **#待办** 。发货单现在已经准备好可以被运输了。"
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:104
-msgid ""
-"The status of the delivery changed from **Waiting Availability** to "
-"**Available**. Validate the transfer to confirm the delivery."
-msgstr "交货的状态从 **等待可用** 到 **可用** 。验证调拨确认交货。"
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:111
-msgid ":doc:`setup_stock_rule`"
-msgstr ":doc:`setup_stock_rule` "
-
-#: ../../purchase/replenishment/flows/purchase_triggering.rst:112
-msgid ":doc:`warning_triggering`"
-msgstr ":doc:`warning_triggering` "
+#: ../../purchase/replenishment/flows/purchase_triggering.rst:57
+msgid ":doc:`../../../purchase/replenishment/flows/setup_stock_rule`"
+msgstr ""
 
 #: ../../purchase/replenishment/flows/setup_stock_rule.rst:3
-msgid "How to setup a minimum stock rule?"
-msgstr "如何设置最小库存规则？"
+msgid "Don’t run out of stock thanks to Reordering Rules"
+msgstr ""
 
 #: ../../purchase/replenishment/flows/setup_stock_rule.rst:5
 msgid ""
-"For some items you hold in stock, it might be useful to have rules making "
-"sure you never run out of stocks (for example, products with a high demand, "
-"or large items requiring a lot of storage space meaning they're harder to "
-"stock)."
-msgstr "对于某些库存的物品, 设置规则保证来保证有库存是很有用的。(比如, 产品有很高的要求, 需要大量存储空间的不易于保存的物品)"
+"To make sure you never run out of stock, you might want to define "
+"*Reordering Rules* on products. Thanks to reordering rules, Odoo will help "
+"you to replenish your stock when it reaches a minimum stock level."
+msgstr ""
 
 #: ../../purchase/replenishment/flows/setup_stock_rule.rst:10
-msgid ""
-"Odoo allows you to set up rules so that an automatic replenishment for those"
-" items is made, based on minimum stocks available."
-msgstr "Odoo 允许你设置规则以便基于最小库存自动对这些东西进行补货。"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:14
-msgid "When should I use Reordering Rules?"
-msgstr "什么时候应该使用订货规则。"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:16
-msgid ""
-"Reordering Rules work best for items that have a high demand and high flow. "
-"It will relieve you from a lot of work to focus on the rest of your "
-"activities knowing that stocks will always be right."
-msgstr "订货规则最好用在高需求, 高流动的物品上。这将把你从繁重工作中解放出来, 更多地关注其他事情。"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:20
-msgid ""
-"It can also be used when you have limited storage space and you need to keep"
-" large items in stock. In this case, you can keep as little as 1 item in "
-"stock, and have a new one ordered as a stock replenishment as soon as the "
-"item in stock is sold."
+msgid "Set a reordering rule"
 msgstr ""
-"它也可以被用在你已经限制了存储空间并且你需要大量物品在仓库中的情况。你可以保持一部分在仓库中, 当库存中的物品被卖出时, 订购新的物品作为补充。"
 
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:26
-msgid "When should I avoid Reordering Rules?"
-msgstr "什么时候应该避免订货规则。"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:28
-msgid ""
-"If you are offering a new product and don't know yet how fast it will go, "
-"you should handle stocks yourself first, and setup reordering rules only a "
-"few months into the sale to have better forecasts of the demand."
-msgstr "如果你在卖一个不知道多久才能卖出的产品。你应该首先自己处理你的库存, 并在销售中设置重订货规则来得到更好的预测。"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:32
-msgid ""
-"If you sell items that have a limited lifetime, such as fashion items, "
-"technology items, or products working together with a system that is meant "
-"to evolve, you have to be very well informed on when to stop automated "
-"replenishments, in order to avoid having to sell these items at a price that"
-" will not allow you to break even."
+#: ../../purchase/replenishment/flows/setup_stock_rule.rst:12
+msgid "Open a stockable product, you'll find the *Reordering Rules* tab."
 msgstr ""
-"如果你卖的东西具有一定的生命周期, 例如流行物品, 科技产品, 或此产品只是为了某系统的共同发展所需的, 你最好灵活地停止自动补货, "
-"以便避免你不得不低价出售它们。"
 
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:41
+#: ../../purchase/replenishment/flows/setup_stock_rule.rst:15
 msgid ""
-"My company sells modern furniture. We sell a set of table and chairs that "
-"are available in 4 seatings and 6 seatings."
-msgstr "我公司销售的现代家具。我们卖了一套桌子和椅子, 椅子配4把和6把两种。"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:44
-msgid ""
-"To keep things simple, we stock tables and chairs separately, but sell them "
-"all together to our clients as a kit. In order to make sure we can always "
-"deliver a complete set of table and chairs, I setup a Reordering Rule for "
-"the chairs to make sure I always have at least 10 chairs in stock, but no "
-"more than 20. This way, I can sell up to 5 sets of table at once while "
-"keeping my stock low enough not to eat up all my storage space."
+"You can also access all your reordering rules from :menuselection:`Inventory"
+" --> Master Data --> Reordering Rules`."
 msgstr ""
-"为了简单起见, 我们分开桌子和椅子的库存, "
-"但是卖给客人时作为一套卖。为了保证我们总能交货一套桌椅。我为椅子设置了一个重订货规则来保证总有10把椅子在仓库中, "
-"但不超过20把。这样我能卖一次卖出5套桌子, 同时保证我的库存较低, 不至于占用我所有的存储空间。"
 
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:52
+#: ../../purchase/replenishment/flows/setup_stock_rule.rst:21
 msgid ""
-"The last table I sold was a 4 seatings, and there were 12 chairs left in my "
-"stock. Because the stock in chairs is now only 8 chairs, Odoo will "
-"automatically order 12 new chairs to fill up my stock to the maximum amount."
-msgstr "最后卖的桌子配4把椅子, 在我的库存里只有12把椅子。因为库存只剩下8把椅子了, Odoo会自动订购12把新椅子来补充库存到最大数量。"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:61
-msgid "Set up your product"
-msgstr "设置你的产品"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:63
-msgid ""
-"In the Purchases module, open the Purchase menu and click on Products. Open "
-"the product to which you would like to add a Reordering Rule (or create a "
-"new one)."
-msgstr "在采购模块, 打开采购菜单点击产品。打开你要添加重订货规则(或者创建一个新的)的产品。"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:67
-msgid "3 conditions for correct reordering rule :"
-msgstr "3 种情况修改订货规则 :"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:69
-msgid ""
-"In :menuselection:`General information --> Product type`, make the product "
-"stockable (as soon as this is done, the icon \"Reordering rule will appear)"
-msgstr "在 :菜单选项:'普通信息-->产品类型', 设置产品为可库存(一旦设好, \" 重订货规则\\ \\ \\ \"图标会马上显现)"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:71
-msgid ""
-"In :menuselection:`Inventory --> route`, tick the \"Buy\" box (and untick "
-"the Make To Order box)"
-msgstr "在 :菜单选项 :'库存-->路线'勾选\" 买\\ \\ \\ \"选项(同时不能勾选Make To Order 选项)"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:73
-msgid ""
-"Select a vendor (don't forget to put a minimal quantity greater than 0)"
-msgstr "选择一个供应商(别忘了设置最小数量大于0)"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:76
-msgid "Create a reordering rule"
-msgstr "创建一个订货规则"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:78
-msgid "Click on the Reordering Rules tab, click on Create. A new page opens."
-msgstr "点击订货规则页卡, 点击创建。会打开新的创建页面。"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:83
-msgid ""
-"By default, Reordering Rules in Odoo are named as \"OP/XXXXX\" but you are "
-"free to use any nomenclature. You can modify it via the **Name** field."
-msgstr "默认情况下, 订货规则在Odoo里被命名为\" OP/XXXXX\\ \"但你也可以使用自己的命名规则。你能通过“名字“字段修改。"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:86
-msgid "The **Product** field is the product you are creating the rule for."
-msgstr " **产品** 字段是你要建的规则的产品。"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:88
-msgid ""
-"Select the warehouse to which the product should be delivered in the "
-"**Warehouse** field."
-msgstr "在仓库字段, 选择该产品送货的仓库"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:91
-msgid ""
-"If you have configured multiple warehouses and location, specify the "
-"location in which the product will be stored in the **Location** field."
-msgstr "如果你设置了多仓库和库位, 在 **库位** 字段指定该产品储存的库位。"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:96
-msgid ""
-":doc:`../../../inventory/settings/warehouses/difference_warehouse_location`"
+"Once in the next menu, you can create the reordering rules linked to your "
+"product. From now on, every time this product reaches the minimum quantity "
+"it will replenish your stock to your **maximum quantity**."
 msgstr ""
-":doc:`../../../inventory/settings/warehouses/difference_warehouse_location` "
 
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:102
+#: ../../purchase/replenishment/flows/setup_stock_rule.rst:29
 msgid ""
-"In the **Minimum Quantity** field, insert the quantity to which the system "
-"will trigger a new order for replenishment."
-msgstr "在 **最小数量** 字段, 写入系统要触发补货规则的数量。"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:105
-msgid ""
-"In the **Maximum Quantity** field, insert the maximum of items that has to "
-"be stocked. The replenishing order will be based on that quantity to "
-"reorder."
-msgstr "在 **最大数量** 字段, 填写你要库存的最大数量。这个补货订单将基于数量来补货。"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:109
-msgid ""
-"The **Quantity Multiple** is the lowest number of items that can be ordered "
-"at once. For instance, some items may be only available for purchase in a "
-"set of 2."
-msgstr " **订购数量** 是每次采购的最低数量。比如, 有些产品只适用于采购一套2个。"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:113
-msgid ""
-"In the Misc section, the **Active** box allows you to activate or deactivate"
-" the rule."
-msgstr "在杂项部分, **激活** 选项允许你激活或关闭这个规则。"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:116
-msgid "In the **Lead Time** section, you can enter:"
-msgstr "在 **提前期** 部分, 你可以输入 :"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:118
-msgid ""
-"the number of Day(s) to purchase: correspond to the number of days for the "
-"supplier to receive the order"
-msgstr "采购的天数(s) :是指供应商收到订单的天数"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:120
-msgid "the number of Day(s) to get the products"
-msgstr "拿到产品的天数(s)"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:122
-msgid ""
-"By default, the lead times are in calendar days. You can change that in "
-":menuselection:`Inventory --> Configuration --> Settings --> Minimum Stock "
-"Rules`"
-msgstr "默认, 提前期是日历天数。你可在 :菜单项:'库存-->配置-->设置-->最小库存规则'处更改它。"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:125
-msgid "When you have entered all the info, click on Save."
-msgstr "当你输入了所有的信息后, 点击保存。"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:127
-msgid ""
-"From now on, every time a product with a reordering rule reaches the minimum"
-" stock, the system will automatically send a RfQ to your supplier based on "
-"your maximum quantity to replenish your stock."
-msgstr "从现在起, 每次一个有订货规则的产品达到最小库存时, 系统会自动发送一个基于你的最大补货数量的请购单给你的供应商。"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:131
-msgid ""
-"The replenishments will take place when the scheduler in the Inventory "
+"The replenishments will take place when the scheduler in the *Inventory* "
 "module runs. By default in Odoo, the schedulers will run every night at "
 "12:00PM."
-msgstr "补货会在库存模块的排程器运行时发生。默认情况下, 排程器会在每天晚上12 :00运行。"
-
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:135
-msgid ""
-"To know how to configure and run the schedulers manually, read the document "
-"on :doc:`../../../inventory/management/misc/schedulers`"
 msgstr ""
-"知道如何配置并手动运行排程器, 请阅读如下文档 :doc:`../../../inventory/management/misc/schedulers`"
-" "
 
-#: ../../purchase/replenishment/flows/setup_stock_rule.rst:140
-msgid ":doc:`../../../inventory/management/misc/schedulers`"
-msgstr ":doc:`../../../inventory/management/misc/schedulers` "
+#: ../../purchase/replenishment/flows/setup_stock_rule.rst:33
+msgid "See also: :doc:`../../../inventory/management/misc/schedulers`"
+msgstr ""
 
-#: ../../purchase/replenishment/flows/warning_triggering.rst:3
-#: ../../purchase/replenishment/flows/warning_triggering.rst:69
-msgid "How to trigger a warning when purchasing at a specific vendor?"
-msgstr "如何触发一个警告当在一个指定的供应商采购时？"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:8
+#: ../../purchase/replenishment/flows/setup_stock_rule.rst:35
 msgid ""
-"The **Warning Messages and Alerts** module allow you to configure alerts on "
-"the customers and vendors or products."
-msgstr " **警告信息和提醒** 模块允许你在客户, 供应商或者产品处配置提醒。"
+"From now on, every time a product with a reordering rule reaches the minimum"
+" stock, the system will automatically see how to fulfill that need based on "
+"the product configuration (e.g create an RfQ, create an MO, etc.)."
+msgstr ""
 
-#: ../../purchase/replenishment/flows/warning_triggering.rst:11
+#: ../../purchase/replenishment/flows/setup_stock_rule.rst:41
+msgid "Troubleshooting"
+msgstr "排查"
+
+#: ../../purchase/replenishment/flows/setup_stock_rule.rst:43
 msgid ""
-"You can select the following types of warnings and create different warnings"
-" for purchases and sales:"
-msgstr "你可以选择如下类型的警告并对采购和销售创建不同的警告。"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:14
-msgid ""
-"Warning: This option displays the warning message during the process, but "
-"allows the user to continue."
-msgstr "警告 :这个选项在处理过程中显示警告信息, 但允许用户继续执行。"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:17
-msgid ""
-"Blocking Message: The message displays a warning message, but the user "
-"cannot continue the process further."
-msgstr "锁定信息 :这个信息会显示一个警告, 用户将不能继续操作。"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:24
-msgid "Module Installation"
-msgstr "模块安装"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:26
-msgid ""
-"First, you need to install the **Warning Messages and Alerts** module. Go to"
-" **Apps** and look for it (don't forget to remove the **Apps** filter)."
-msgstr "首先, 你需要安装 **警告信息和提醒** 模块。在 **Apps** 中查找(别忘了移走 **Apps** 的过滤)。"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:33
-msgid "Vendor or Customer warnings"
-msgstr "供应商或客户警告"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:35
-msgid ""
-"Go to :menuselection:`Purchases --> Vendors` or to :menuselection:`Sales -->"
-" Customers`."
-msgstr "转到 :菜单:`采购 -->供应商` 或者到 :菜单:`销售 -->客户` ."
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:37
-msgid "Open the vendor or the customer and click on the **Warnings** tab."
-msgstr "打开供应商或客户, 并且点击 **警告** 页面。"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:42
-#: ../../purchase/replenishment/flows/warning_triggering.rst:62
-msgid "The available warnings are:"
-msgstr "有效的警告是 :"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:44
-msgid "Warning on the **Sales Order**"
-msgstr "在 **销售订单** 上的警告"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:46
-msgid "Warning on the **Purchase Order**"
-msgstr "在 **采购订单** 上的警告"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:48
-msgid "Warning on the **Picking**"
-msgstr " **拣货** 上的警告"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:50
-msgid "Warning on the **Invoice**"
-msgstr " **发票** 上的警告"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:53
-msgid "Product Warnings"
-msgstr "产品警告"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:55
-msgid ""
-"Go to :menuselection:`Purchases --> Products` or to :menuselection:`Sales "
-"--> Products`."
-msgstr "在 :菜单:'采购-->产品'或在 :菜单: 销售-->产品'."
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:57
-msgid "Open the product and click on the **Notes** tab."
-msgstr "打开产品并点击 **便签** 标签。"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:64
-msgid "Warning when selling this product."
-msgstr "当销售产品时的警告。"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:66
-msgid "Warning when Purchasing this product."
-msgstr "当采购产品时的警告。"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:71
-msgid ""
-"Go to the Purchases application, click on :menuselection:`Purchase --> "
-"Vendors`. Go to the **Warnings** tab."
-msgstr "在采购应用下, 点击 :菜单: 采购-->供应商'.进入 **警告** 标签。"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:74
-msgid ""
-"Under **Warning on the Purchase Order**, choose **Warning** and write your "
-"warning."
-msgstr "在 **采购订单的警告** , 选择 **警告** 并写你的警告信息。"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:80
-msgid ""
-"Create a **Request for Quotation**. Go to :menuselection:`Purchase --> "
-"Request for Quotation` and click on **Create**. Choose the vendor on which a"
-" warning was set."
-msgstr "创建一个 **询价单** 。在 :菜单:'采购-->询价'并点击 **创建** 。选择一个设置了警告的供应商。"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:84
-msgid "When choosing the vendor, the warning will appear."
-msgstr "当选择供应商时, 警告会显示。"
-
-#: ../../purchase/replenishment/flows/warning_triggering.rst:90
-msgid ""
-"If you set a blocking message instead of a warning message, you won't be "
-"able to choose the vendor."
-msgstr "如果你设置了锁定信息而不是警告信息, 你将不能选择这个供应商。"
+"For your reordering rules to work, your product needs to be correctly "
+"configured. If you are using *Buy* route, you need a vendor on the product. "
+"If you are using *Manufacturing* route you will been a BoM on the product. "
+"If the product is not fully configured or there is a mistake in your routes,"
+" a next activity will be logged on the product informing you there is an "
+"issue with the configuration."
+msgstr ""
 
 #: ../../purchase/replenishment/multicompany.rst:3
 msgid "Multi-Companies"
@@ -3210,69 +1984,3 @@ msgid ""
 "In order to be able to manage the inter-company rules, be sure that your "
 "user has the rights to manage the companies."
 msgstr "为了能管理内部公司规则, 确认你的用户有权限管理公司。"
-
-#: ../../purchase/replenishment/trouble_shooting.rst:3
-msgid "Trouble-Shooting"
-msgstr "解决问题"
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:3
-msgid "How to check that everything is working fine?"
-msgstr "如果检查所有的事情都运行正常。"
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:6
-msgid "Vendor Bills"
-msgstr "供应商帐单"
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:8
-msgid ""
-"Even if you don't have the rights to the accounting application, you can "
-"still control the vendor bills."
-msgstr "即使你没有财务的权限, 你仍然可以控制供应商账单。"
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:11
-msgid ""
-"Go to the **Purchases** application: :menuselection:`Control --> Vendor "
-"Bills`."
-msgstr "在 **采购** 模块 :菜单'控制-->供应商账单’。"
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:17
-msgid "Incoming Products"
-msgstr "产品入库"
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:19
-msgid ""
-"Even if you don't have the rights to the inventory application, you can "
-"still control the incoming products."
-msgstr "即使你没有库存模块的权限, 你仍然可以控制入库产品。"
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:22
-msgid ""
-"Go to the **Purchases** application: :menuselection:`Control --> Incoming "
-"Products`."
-msgstr "在 **采购** 模块 :菜单:'控制-->入库产品'."
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:28
-msgid "Procurements exceptions"
-msgstr "补货异常"
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:30
-msgid "Here, you need the **Inventory Manager** access rights."
-msgstr "这里你需要有 **采购经理** 的权限。"
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:32
-msgid ""
-"Go to the **Inventory** application: :menuselection:`Control --> Procurement"
-" Exceptions`."
-msgstr "在 **库存** 模块 :菜单: ‘控制-->采购异常’。"
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:37
-msgid ""
-"To understand why the procurement is not running, open the exception and "
-"check the message in the chatter."
-msgstr "知道为什么采购没有运行, 打开异常并检查信息。"
-
-#: ../../purchase/replenishment/trouble_shooting/is_everything_ok.rst:43
-msgid ""
-"Usually, the problem is located on the procurement rules. Either there are "
-"no stock rules, or there are no vendor associated to a product."
-msgstr "通常, 问题在于采购规则, 没有库存规则, 或没有供应商关联到产品。"
diff --git a/locale/zh_CN/LC_MESSAGES/sales.po b/locale/zh_CN/LC_MESSAGES/sales.po
index 6a6649849..cba43301d 100644
--- a/locale/zh_CN/LC_MESSAGES/sales.po
+++ b/locale/zh_CN/LC_MESSAGES/sales.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-23 12:10+0200\n"
+"POT-Creation-Date: 2018-10-19 10:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: John Lin <linyinhuan@139.com>, 2018\n"
+"Last-Translator: bower Guo <124358678@qq.com>, 2018\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -236,668 +236,440 @@ msgstr "当所有的字段被填写后, 你可以通过点击按钮同步种类
 msgid "Invoicing Method"
 msgstr "开票方式"
 
-#: ../../sales/invoicing/services.rst:3
-msgid "Services"
-msgstr "服务"
-
-#: ../../sales/invoicing/services/milestones.rst:3
-msgid "How to invoice milestones of a project?"
-msgstr "如何给项目里程碑开票？"
-
-#: ../../sales/invoicing/services/milestones.rst:5
-msgid ""
-"There are different kind of service sales: prepaid volume of hours/days "
-"(e.g. support contract), billing based on time and material (e.g. billing "
-"consulting hours) or a fixed price contract (e.g. a project)."
+#: ../../sales/invoicing/down_payment.rst:3
+msgid "Request a down payment"
 msgstr ""
-"有各种不同的销售服务 :按小时/天数预付(比如 支持合同), 基于时间和物料的账单(例如 顾问小时数的账单)或者一个固定价格的合同(比如, 一个项目)."
 
-#: ../../sales/invoicing/services/milestones.rst:9
+#: ../../sales/invoicing/down_payment.rst:5
 msgid ""
-"In this section, we will have a look at how to invoice milestones of a "
-"project."
-msgstr "在本节中, 我们将看看如何按项目的里程碑开发票。"
-
-#: ../../sales/invoicing/services/milestones.rst:12
-msgid ""
-"Milestone invoicing can be used for expensive or large scale projects, with "
-"each milestone representing a clear sequence of work that will incrementally"
-" build up to the completion of the contract. For example, a marketing agency"
-" hired for a new product launch could break down a project into the "
-"following milestones, each of them considered as one service with a fixed "
-"price on the sale order :"
+"A down payment is an initial, partial payment, with the agreement that the "
+"rest will be paid later. For expensive orders or projects, it is a way to "
+"protect yourself and make sure your customer is serious."
 msgstr ""
-"按里程碑开票可以用在昂贵的或大型项目上, 每个里程碑代表了一个明确的工作序列号并将逐步建立来完成合同。例如, "
-"聘请的营销机构把一个产品的发布分解成以下的里程碑, 其中每一个在销售订单中都被作为一个固定价格的服务。"
 
-#: ../../sales/invoicing/services/milestones.rst:19
-msgid "Milestone 1 : Marketing strategy audit - 5 000 euros"
-msgstr "里程碑1 :市场营销战略审计 - 5000欧元"
-
-#: ../../sales/invoicing/services/milestones.rst:21
-msgid "Milestone 2 : Brand Identity - 10 000 euros"
-msgstr "里程碑2 :品牌识别 - 10000欧元"
-
-#: ../../sales/invoicing/services/milestones.rst:23
-msgid "Milestone 3 : Campaign launch & PR - 8 500 euros"
-msgstr "里程碑3 :活动启动及公关 - 8500欧元"
-
-#: ../../sales/invoicing/services/milestones.rst:25
-msgid ""
-"In this case, an invoice will be sent to the customer each time a milestone "
-"will be successfully reached. That invoicing method is comfortable both for "
-"the company which is ensured to get a steady cash flow throughout the "
-"project lifetime and for the client who can monitor the project's progress "
-"and pay in several times."
+#: ../../sales/invoicing/down_payment.rst:10
+msgid "First time you request a down payment"
 msgstr ""
-"在这种情况下, "
-"每当一个里程碑将成功地达到目标时发票被发送给客户。这种开票的方法对于想通过项目周期确保得到稳定的现金流的公司和想监控项目进度分几次付款的客户都觉得很舒服。"
 
-#: ../../sales/invoicing/services/milestones.rst:32
+#: ../../sales/invoicing/down_payment.rst:12
 msgid ""
-"You can also use milestones to invoice percentages of the entire project. "
-"For example, for a million euros project, your company might require a 15% "
-"upfront payment, 30% at the midpoint and the balance at the contract "
-"conclusion. In that case, each payment will be considered as one milestone."
+"When you confirm a sale, you can create an invoice and select a down payment"
+" option. It can either be a fixed amount or a percentage of the total "
+"amount."
 msgstr ""
-"你也可以使用里程碑的方式按项目的百分比开票。比如, 对于一个百万欧元的项目, 你的公司也许需要预付15%的款项, 在中点再付30%, "
-"合同结束时付余清余款。在这种情况下, 每个付款都被看作一个里程碑。"
 
-#: ../../sales/invoicing/services/milestones.rst:39
-#: ../../sales/invoicing/services/reinvoice.rst:26
-#: ../../sales/invoicing/services/reinvoice.rst:95
-#: ../../sales/invoicing/services/support.rst:17
-#: ../../sales/send_quotations/quote_template.rst:10
-msgid "Configuration"
-msgstr "配置"
-
-#: ../../sales/invoicing/services/milestones.rst:42
-msgid "Install the Sales application"
-msgstr "安装销售管理"
-
-#: ../../sales/invoicing/services/milestones.rst:44
-#: ../../sales/invoicing/services/reinvoice.rst:28
+#: ../../sales/invoicing/down_payment.rst:16
 msgid ""
-"In order to sell services and to send invoices, you need to install the "
-"**Sales** application, from the **Apps** icon."
-msgstr "为了销售服务和发送发票, 你需要从 **Apps** 图标安装 **销售** 模块。"
-
-#: ../../sales/invoicing/services/milestones.rst:51
-msgid "Create products"
-msgstr "创建产品"
-
-#: ../../sales/invoicing/services/milestones.rst:53
-msgid ""
-"In Odoo, each milestone of your project is considered as a product. From the"
-" **Sales** application, use the menu :menuselection:`Sales --> Products`, "
-"create a new product with the following setup:"
+"The first time you request a down payment you can select an income account "
+"and a tax setting that will be reused for next down payments."
 msgstr ""
-"在Odoo中, 你的项目的每个里程碑都被看作一个产品. 从 **销售模块** 中, 使用菜单 :menuselection:`销售(Sales) -->"
-" 产品(Products)` , 按以下步骤生成一个产品 :"
 
-#: ../../sales/invoicing/services/milestones.rst:57
-msgid "**Name**: Strategy audit"
-msgstr " **名字**:  战略审计"
-
-#: ../../sales/invoicing/services/milestones.rst:59
-#: ../../sales/invoicing/services/support.rst:50
-msgid "**Product Type**: Service"
-msgstr " **产品类型**:  服务"
-
-#: ../../sales/invoicing/services/milestones.rst:61
-msgid ""
-"**Invoicing Policy**: Delivered Quantities, since you will invoice your "
-"milestone after it has been delivered"
-msgstr " **开票策略**:  已发货的数量, 你将在发货后开票。"
-
-#: ../../sales/invoicing/services/milestones.rst:64
-msgid ""
-"**Track Service**: Manually set quantities on order, as you complete each "
-"milestone, you will manually update their quantity from the **Delivered** "
-"tab on your sale order"
-msgstr " **跟踪服务**:  手动在订单上设置数量, 当你完成了每个里程碑, 你将手动在销售订单的\" 已发货“标签更新他们的数量。 "
-
-#: ../../sales/invoicing/services/milestones.rst:72
-msgid "Apply the same configuration for the others milestones."
-msgstr "为其他里程碑做同样的配置。"
-
-#: ../../sales/invoicing/services/milestones.rst:75
-msgid "Managing your project"
-msgstr "管理项目"
-
-#: ../../sales/invoicing/services/milestones.rst:78
-msgid "Quotations and sale orders"
-msgstr "报价单及销售订单"
-
-#: ../../sales/invoicing/services/milestones.rst:80
-msgid ""
-"Now that your milestones (or products) are created, you can create a "
-"quotation or a sale order with each line corresponding to one milestone. For"
-" each line, set the **Ordered Quantity** to ``1`` as each milestone is "
-"completed once. Once the quotation is confirmed and transformed into a sale "
-"order, you will be able to change the delivered quantities when the "
-"corresponding milestone has been achieved."
+#: ../../sales/invoicing/down_payment.rst:22
+msgid "You will then see the invoice for the down payment."
 msgstr ""
-"现在你的里程碑(或产品)生成了, 你能创建一个报价或者订单, 每行对应一个里程碑。每行设置 **订购量** "
-"为1当每个里程碑完成时。当报价被确认并转化成一个销售订单, 你可以更改发货数量当对应的里程碑达到目标时。"
 
-#: ../../sales/invoicing/services/milestones.rst:91
-msgid "Invoice milestones"
-msgstr "里程碑开票"
-
-#: ../../sales/invoicing/services/milestones.rst:93
+#: ../../sales/invoicing/down_payment.rst:27
 msgid ""
-"Let's assume that your first milestone (the strategy audit) has been "
-"successfully delivered and you want to invoice it to your customer. On the "
-"sale order, click on **Edit** and set the **Delivered Quantity** of the "
-"related product to ``1``."
+"On the subsequent or final invoice, any prepayment made will be "
+"automatically deducted."
 msgstr ""
-"让我们假设你的第一个里程碑(战略审计)已成功交付并要其开具发票给客户。在销售订单, 点击 **编辑** , 并设置相关产品的 **交货数量** 为 1。"
 
-#: ../../sales/invoicing/services/milestones.rst:99
+#: ../../sales/invoicing/down_payment.rst:34
+msgid "Modify the income account and customer taxes"
+msgstr ""
+
+#: ../../sales/invoicing/down_payment.rst:36
+msgid "From the products list, search for *Down Payment*."
+msgstr ""
+
+#: ../../sales/invoicing/down_payment.rst:41
 msgid ""
-"As soon as the above modification has been saved, you will notice that the "
-"color of the line has changed to blue, meaning that the service can now be "
-"invoiced. In the same time, the invoice status of the SO has changed from "
-"**Nothing To Invoice** to **To Invoice**"
+"You can then edit it, under the invoicing tab you will be able to change the"
+" income account & customer taxes."
 msgstr ""
-"当上述修改已经保存, 你会发现, 线的颜色变为蓝色, 这意味着该服务现在可以开具发票。在同一时间, 所以发票的状态已经从 **没有可开发票** 到 "
-"**可开票** "
 
-#: ../../sales/invoicing/services/milestones.rst:104
-msgid ""
-"Click on **Create invoice** and, in the new window that pops up, select "
-"**Invoiceable lines** and validate. It will create a new invoice (in draft "
-"status) with only the **strategy audit** product as invoiceable."
+#: ../../sales/invoicing/expense.rst:3
+msgid "Re-invoice expenses to customers"
 msgstr ""
-"点击 **创建发票** , 并在新的弹出窗口中选择 **开票线** 和验证。这将创建一个新的发票(处于草案状态), 只有在 **战略审核** "
-"产品为客户开具发票。"
 
-#: ../../sales/invoicing/services/milestones.rst:112
-msgid ""
-"In order to be able to invoice a product, you need to set up the "
-"**Accounting** application and to configure an accounting journal and a "
-"chart of account. Click on the following link to learn more: "
-":doc:`../../../accounting/overview/getting_started/setup`"
-msgstr ""
-"为了能够为产品开票, 你需要设置的 **会计** 模块和配置会计日记账和科目表。点击以下链接了解详情 :: doc "
-":`../../../accounting/overview/getting_started/setup` "
-
-#: ../../sales/invoicing/services/milestones.rst:117
-msgid ""
-"Back on your sale order, you will notice that the **Invoiced** column of "
-"your order line has been updated accordingly and that the **Invoice Status**"
-" is back to **Nothing to Invoice**."
-msgstr ""
-"回到您的销售订单上, 你会发现, 你的订单行的 **开具发票** 的列进行了相应的更新, 而且 **发票状态** 回到了 **没有可开发票** 。"
-
-#: ../../sales/invoicing/services/milestones.rst:121
-msgid "Follow the same workflow to invoice your remaining milestones."
-msgstr "按一样的流程为你剩下的里程碑开票"
-
-#: ../../sales/invoicing/services/milestones.rst:124
-msgid ":doc:`reinvoice`"
-msgstr ":doc:`reinvoice` "
-
-#: ../../sales/invoicing/services/milestones.rst:125
-#: ../../sales/invoicing/services/reinvoice.rst:185
-msgid ":doc:`support`"
-msgstr ":doc:`support` "
-
-#: ../../sales/invoicing/services/reinvoice.rst:3
-msgid "How to re-invoice expenses to your customers?"
-msgstr "如何为你的客户重开费用发票。"
-
-#: ../../sales/invoicing/services/reinvoice.rst:5
+#: ../../sales/invoicing/expense.rst:5
 msgid ""
 "It often happens that your employees have to spend their personal money "
 "while working on a project for your client. Let's take the example of an "
-"employee paying a parking spot for a meeting with your client. As a company,"
+"consultant paying an hotel to work on the site of your client. As a company,"
 " you would like to be able to invoice that expense to your client."
 msgstr ""
-"如果你的员工在为您的客户的项目工作时经常花自己的个人的钱。别如, 在与您的客户开会时我们的员工支付了停车位费用。作为一家公司, "
-"你希望能够将此花费开票给你的客户。"
 
-#: ../../sales/invoicing/services/reinvoice.rst:11
-msgid ""
-"In this documentation we will see two use cases. The first, very basic, "
-"consists of invoicing a simple expense to your client like you would do for "
-"a product. The second, more advanced, will consist of invoicing expenses "
-"entered in your expense system by your employees directly to your customer."
-msgstr ""
-"在该文档中, 我们将看到两个用例。第一, 非常基本的, 一个简单的费用的开票给您的客户就像为一个产品所做的那样。第二个, 更先进, "
-"由您的员工进入你的费用系统直接开票给你的客户。"
-
-#: ../../sales/invoicing/services/reinvoice.rst:18
-msgid "Use case 1: Simple expense invoicing"
-msgstr "用例 1 :简单的费用开票"
-
-#: ../../sales/invoicing/services/reinvoice.rst:20
-msgid ""
-"Let's take the following example. You are working on a promotion campaign "
-"for one of your customers (``Agrolait``) and you have to print a lot of "
-"copies. Those copies are an expense for your company and you would like to "
-"invoice them."
-msgstr "以下作为示例, 你正在给其中的一个客户(\" Agrolait \\ \")升级并且你需要打印很多复印件, 这些复印件作为公司的费用并且需要为之开票"
-
-#: ../../sales/invoicing/services/reinvoice.rst:35
-msgid "Create product to be expensed"
-msgstr "创建费用产品"
-
-#: ../../sales/invoicing/services/reinvoice.rst:37
-msgid "You will need now to create a product called ``Copies``."
-msgstr "那么现在你就需要创建一个命名为“复印\" 的产品 "
-
-#: ../../sales/invoicing/services/reinvoice.rst:39
-#: ../../sales/invoicing/services/reinvoice.rst:112
-msgid ""
-"From your **Sales** module, go to :menuselection:`Sales --> Products` and "
-"create a product as follows:"
-msgstr ""
-"在 **销售** 模块下, 进入 :menuselection:`销售(Sales) --> 产品(Products)` 并创建一个如下产品 :"
-
-#: ../../sales/invoicing/services/reinvoice.rst:42
-msgid "**Product type**: consumable"
-msgstr " **产品类型**:  可消耗"
-
-#: ../../sales/invoicing/services/reinvoice.rst:44
-msgid ""
-"**Invoicing policy**: on delivered quantities (you will manually set the "
-"quantities to invoice on the sale order)"
-msgstr " **开票原则**:  基于发货数量(你需要对销售订单的发票手工设定数量)"
-
-#: ../../sales/invoicing/services/reinvoice.rst:51
-msgid "Create a sale order"
-msgstr "创建销售订单"
-
-#: ../../sales/invoicing/services/reinvoice.rst:53
-msgid ""
-"Now that your product is correctly set up, you can create a sale order for "
-"that product (from the menu :menuselection:`Sales --> Sales Orders`) with "
-"the ordered quantities set to 0. Click on **Confirm the Sale** to create the"
-" sale order. You will be able then to manually change the delivered "
-"quantities on the sale order to reinvoice the copies to your customer."
-msgstr ""
-"现在产品已经设置好了, 就可以创建该产品的销售订单(从 :menuselection:`销售(Sales) --> 销售订单(Sales "
-"Orders)` ), 数量设置为0。点击 **确认订单** 确认为销售订单。随后你可以手工的在销售订单上更改产品数量在同一张发票单上给客户重复开票"
-
-#: ../../sales/invoicing/services/reinvoice.rst:64
-#: ../../sales/invoicing/services/reinvoice.rst:177
-msgid "Invoice expense to your client"
-msgstr "费用开票给客户"
-
-#: ../../sales/invoicing/services/reinvoice.rst:66
-msgid ""
-"At the end of the month, you have printed ``1000`` copies on behalf of your "
-"client and you want to re-invoice them. From the related sale order, click "
-"on **Delivered Quantities**, manually enter the correct amount of copies and"
-" click on **Save**. Your order line will turn blue, meaning that it is ready"
-" to be invoiced. Click on **Create invoice**."
-msgstr ""
-"到了月末, 你已经为客户打印了1000份并且你想要对他们重新开票。就可以从相关的销售订单上点击 **发货数量** , 手工的输入复印件数量并点击 "
-"***保存* 。订单行就变为蓝色, 意味着可以开票。然后点击** *创建发票*"
-
-#: ../../sales/invoicing/services/reinvoice.rst:73
-msgid ""
-"The total amount on your sale order will be of 0 as it is computed on the "
-"ordered quantities. It is your invoice which will compute the correct amount"
-" due by your customer."
-msgstr "销售订单上的总数量是0因为发票是基于发货数量的。发票会根据发给该客户的正确的数量进行计算"
-
-#: ../../sales/invoicing/services/reinvoice.rst:77
-msgid ""
-"The invoice generated is in draft, so you can always control the quantities "
-"and change the amount if needed. You will notice that the amount to be "
-"invoiced is based here on the delivered quantities."
-msgstr "生成的发票是草稿状态, 所以你总是可以控制数量并且变更总量。你能注意到要开票的数量是基于发货的数量"
-
-#: ../../sales/invoicing/services/reinvoice.rst:84
-msgid "Click on validate to issue the payment to your customer."
-msgstr "点击确认让客户付款"
-
-#: ../../sales/invoicing/services/reinvoice.rst:87
-msgid "Use case 2: Invoice expenses via the expense module"
-msgstr "用例2 :通过报销模块给费用开票"
-
-#: ../../sales/invoicing/services/reinvoice.rst:89
-msgid ""
-"To illustrate this case, let's imagine that your company sells some "
-"consultancy service to your customer ``Agrolait`` and both parties agreed "
-"that the distance covered by your consultant will be re-invoiced at cost."
-msgstr "要解释这个, 让我们假设你的公司卖给你的顾客\" Agrolait \\ \"一些咨询服务并且双方都同意贵司顾问的路费作为成本来开票"
-
-#: ../../sales/invoicing/services/reinvoice.rst:97
-msgid "Here, you will need to install two more modules:"
-msgstr "现在, 你需要再安装两个模块"
-
-#: ../../sales/invoicing/services/reinvoice.rst:99
-msgid "Expense Tracker"
-msgstr "费用追踪"
-
-#: ../../sales/invoicing/services/reinvoice.rst:101
-msgid ""
-"Accounting, where you will need to activate the analytic accounting from the"
-" settings"
-msgstr "需要在会计模块的设置中激活辅助核算会计"
-
-#: ../../sales/invoicing/services/reinvoice.rst:108
-msgid "Create a product to be expensed"
-msgstr "创建一个费用类别的产品"
-
-#: ../../sales/invoicing/services/reinvoice.rst:110
-msgid "You will now need to create a product called ``Kilometers``."
-msgstr "现在你需要创建一个称之为\" 公里 \\ \"的产品。"
-
-#: ../../sales/invoicing/services/reinvoice.rst:115
-msgid "Product can be expensed"
-msgstr "可以被报销的产品"
-
-#: ../../sales/invoicing/services/reinvoice.rst:117
-msgid "Product type: Service"
-msgstr "产品类型 : 服务"
-
-#: ../../sales/invoicing/services/reinvoice.rst:119
-msgid "Invoicing policy: invoice based on time and material"
-msgstr "开票策略 :基于时间和材料开票"
-
-#: ../../sales/invoicing/services/reinvoice.rst:121
-msgid "Expense invoicing policy: At cost"
-msgstr "费用类的开票原则 :基于成本"
-
-#: ../../sales/invoicing/services/reinvoice.rst:123
-msgid "Track service: manually set quantities on order"
-msgstr "追踪服务 :手工的在订单上设置数量"
-
-#: ../../sales/invoicing/services/reinvoice.rst:129
-msgid "Create a sales order"
-msgstr "创建销售订单"
-
-#: ../../sales/invoicing/services/reinvoice.rst:131
-msgid ""
-"Still from the Sales module, go to :menuselection:`Sales --> Sales Orders` "
-"and add your product **Consultancy** on the order line."
-msgstr ""
-"仍是从销售模块, 进入菜单项 :menuselection:`销售(Sales) --> 销售订单(Sales Orders)` 并在订单行上添加产品 "
-"**咨询** 。"
-
-#: ../../sales/invoicing/services/reinvoice.rst:135
-msgid ""
-"If your product doesn't exist yet, you can configure it on the fly from the "
-"SO. Just type the name on the **product** field and click on **Create and "
-"edit** to configure it."
-msgstr "如果产品还不存在, 我们可以在销售订单上即时的创建。只需要在 **产品** 字段输入产品名称并点击 **创建编辑** 就可以创建"
-
-#: ../../sales/invoicing/services/reinvoice.rst:139
-msgid ""
-"Depending on your product configuration, an **Analytic Account** may have "
-"been generated automatically. If not, you can easily create one in order to "
-"link your expenses to the sale order. Do not forget to confirm the sale "
-"order."
-msgstr ""
-"根据产品的配置, 一个 **分析科目** 可以自动的生成, 如果没有的话, 你也可以容易的创建一个, 用来在销售订单上链接费用。不要忘了确认销售订单"
-
-#: ../../sales/invoicing/services/reinvoice.rst:148
-msgid ""
-"Refer to the documentation :doc:`../../../accounting/others/analytic/usage` "
-"to learn more about that concept."
-msgstr ""
-"参考文档\n"
-" :文档:`../../../会计/其余/辅助核算/使用` 中可以了解概念"
-
-#: ../../sales/invoicing/services/reinvoice.rst:152
-msgid "Create expense and link it to SO"
-msgstr "创建相关费用单据并关联到销售订单(SO)"
-
-#: ../../sales/invoicing/services/reinvoice.rst:154
-msgid ""
-"Let's assume that your consultant covered ``1.000km`` in October as part of "
-"his consultancy project. We will create a expense for it and link it to the "
-"related sales order thanks to the analytic account."
-msgstr "假设你们公司的顾问在十月份在咨询项目上的路程是\" 1.000公里 \\ \"。你就可以创建一个费用并且通过分析账户和相关的销售订单关联起来"
-
-#: ../../sales/invoicing/services/reinvoice.rst:158
-msgid ""
-"Go to the **Expenses** module and click on **Create**. Record your expense "
-"as follows:"
-msgstr "进入 **费用** 模块并点击 **创建** 。输入以下费用 :"
-
-#: ../../sales/invoicing/services/reinvoice.rst:161
-msgid "**Expense description**: Kilometers October 2015"
-msgstr " **费用描述**:  2015年10月份公里数"
-
-#: ../../sales/invoicing/services/reinvoice.rst:163
-msgid "**Product**: Kilometers"
-msgstr " **产品**:  公里数"
-
-#: ../../sales/invoicing/services/reinvoice.rst:165
-msgid "**Quantity**: 1.000"
-msgstr " **数量**:  1.000"
-
-#: ../../sales/invoicing/services/reinvoice.rst:167
-msgid "**Analytic account**: SO0019 - Agrolait"
-msgstr " **分析账户**:  SO0019 - Agrolait"
-
-#: ../../sales/invoicing/services/reinvoice.rst:172
-msgid ""
-"Click on **Submit to manager**. As soon as the expense has been validated "
-"and posted to the journal entries, a new line corresponding to the expense "
-"will automatically be generated on the sale order."
-msgstr "点击 **提交经理** 。只要费用被批准并登录到日记账分录, 一个和费用一致的分录记录就会咋订单上自动生成"
-
-#: ../../sales/invoicing/services/reinvoice.rst:179
-msgid "You can now invoice the invoiceable lines to your customer."
-msgstr "现在就可以把所有发票行开票给你的客户了"
-
-#: ../../sales/invoicing/services/reinvoice.rst:186
-msgid ":doc:`milestones`"
-msgstr ":doc:`milestones` "
-
-#: ../../sales/invoicing/services/support.rst:3
-msgid "How to invoice a support contract (prepaid hours)?"
-msgstr "如何刚给支持合同开票(预付小时数)？"
-
-#: ../../sales/invoicing/services/support.rst:5
-msgid ""
-"There are different kinds of service sales: prepaid volume of hours/days "
-"(e.g. support contract), billing based on time and material (e.g. billing "
-"consulting hours) and a fixed price contract (e.g. a project)."
-msgstr "有不同种类的销售服务 :预付小时数／天数(例如支持合同), 基于记工单的开票(例如咨询顾问时间)以及固定价格合同(例如一个项目)。"
-
-#: ../../sales/invoicing/services/support.rst:9
-msgid ""
-"In this section, we will have a look at how to sell and keep track of a pre-"
-"paid support contract."
-msgstr "在本章节, 我们来看一下如何销售和追踪预支付的支持合同"
-
-#: ../../sales/invoicing/services/support.rst:12
-msgid ""
-"As an example, you may sell a pack of ``50 Hours`` of support at "
-"``$25,000``. The price is fixed and charged initially. But you want to keep "
-"track of the support service you did for the customer."
-msgstr "例如, 你可以销售一个价格为\" $25, 000 `的 \\ \"50 小时\" 支持包。价格是固定的并且已经预先付款。但是你想跟踪你给客户的支持服务 "
-
-#: ../../sales/invoicing/services/support.rst:20
-msgid "Install the Sales and Timesheet applications"
-msgstr "安装销售和记工单应用"
-
-#: ../../sales/invoicing/services/support.rst:22
-msgid ""
-"In order to sell services, you need to install the **Sales** application, "
-"from the **Apps** icon. Install also the **Timesheets** application if you "
-"want to track support services you worked on every contract."
-msgstr "为了能销售服务, 你需要从 **APP** 图标安装 **销售** 模块, 并且安装从 **记工单** 应用"
-
-#: ../../sales/invoicing/services/support.rst:33
-msgid "Create Products"
-msgstr "创建产品"
-
-#: ../../sales/invoicing/services/support.rst:35
-msgid ""
-"By default, products are sold by number of units. In order to sell services "
-"``per hour``, you must allow using multiple unit of measures. From the "
-"**Sales** application, go to the menu :menuselection:`Configuration --> "
-"Settings`. From this screen, activate the multiple **Unit of Measures** "
-"option."
-msgstr ""
-"默认状况下, 产品是根据单位数量销售的, 为了能按\" 每小时 \\ \"销售服务, 必须使用产品的多种计量单位, 在销售模块下, 进入菜单选项 "
-":menuselection:`配置(Configuration) --> 设置(Settings)` , 在本页面激活 多种 **计量单位** 选项。"
-
-#: ../../sales/invoicing/services/support.rst:44
-msgid ""
-"In order to sell a support contract, you must create a product for every "
-"support contract you sell. From the **Sales** application, use the menu "
-":menuselection:`Sales --> Products`, create a new product with the following"
-" setup:"
-msgstr ""
-"为了能够销售支持合同, 必须创建一个所有支持合同都能销售的产品。从 **销售** 应用下, 进入菜单选项 "
-":menuselection:`销售(Sales) --> 产品(Products)` , 用以下步骤创建新的产品 :"
-
-#: ../../sales/invoicing/services/support.rst:48
-msgid "**Name**: Technical Support"
-msgstr " **名称**:  技术支持"
-
-#: ../../sales/invoicing/services/support.rst:52
-msgid "**Unit of Measure**: Hours"
-msgstr " **计量单位**:  小时"
-
-#: ../../sales/invoicing/services/support.rst:54
-msgid ""
-"**Invoicing Policy**: Ordered Quantities, since the service is prepaid, we "
-"will invoice the service based on what has been ordered, not based on "
-"delivered quantities."
-msgstr " **开票原则**:  订单数量, 因为服务是预先支付的, 我们可以根据订单数量开票, 而不是根据实际发货数量"
-
-#: ../../sales/invoicing/services/support.rst:58
-msgid ""
-"**Track Service**: Timesheet on contracts. An analytic account will "
-"automatically be created for every order containing this service so that you"
-" can track hours in the related account."
-msgstr " **追踪服务**:  合同上的记工单。一个分析科目会被自动创建用来追踪所有包含这个服务的进出项, 然后就可以在相关的科目下追踪小时数了"
-
-#: ../../sales/invoicing/services/support.rst:66
-msgid ""
-"There are different ways to track the service related to a sales order or "
-"product sold. With the above configuration, you can only sell one support "
-"contract per order. If your customer orders several service contracts on "
-"timesheet, you will have to split the quotation into several orders."
-msgstr ""
-"跟踪与一个销售订单或所售出的产品相关的服务有很多不同的方式。通过上面的配置，你只能为每个订单销售一个支持合同。如果你的客户在工时单上同时订购了多个服务合同，那么你必须将它们拆分到不同的订单中。"
-
-#: ../../sales/invoicing/services/support.rst:72
-msgid ""
-"Note that you can sell in different unit of measure than hours, example: "
-"days, pack of 40h, etc. To do that, just create a new unit of measure in the"
-" **Unit of Measure** category and set a conversion ratio compared to "
-"**Hours** (example: ``1 day = 8 hours``)."
-msgstr ""
-"需要知道除了小时我们还可以使用别的计量单位, 例如 :天, 40/周等。而这些只需要在 **计量单位** 类别下设置一个和 **小时** "
-"的转换规则即可(例如: 1天＝8小时)。"
-
-#: ../../sales/invoicing/services/support.rst:78
-msgid "Managing support contract"
-msgstr "管理支持合同"
-
-#: ../../sales/invoicing/services/support.rst:81
-msgid "Quotations and Sales Orders"
-msgstr "报价单和销售订单"
-
-#: ../../sales/invoicing/services/support.rst:83
-msgid ""
-"Once the product is created, you can create a quotation or a sales order "
-"with the related product. Once the quotation is confirmed and transformed "
-"into a sales order, your users will be able to record services related to "
-"this support contract using the timesheet application."
-msgstr ""
-"一旦产品被创建，你就可以使用相关的产品创建报价单或销售订单。一旦报价单被确认并转换成销售订单，你的用户将能够使用工时单功能来为相关的支持合同登记服务。"
-
-#: ../../sales/invoicing/services/support.rst:93
-msgid "Timesheets"
-msgstr "工时表"
-
-#: ../../sales/invoicing/services/support.rst:95
-msgid ""
-"To track the service you do on a specific contract, you should use the "
-"timesheet application. An analytic account related to the sale order has "
-"been automatically created (``SO009 - Agrolait`` on the screenshot here "
-"above), so you can start tracking services as soon as it has been sold."
-msgstr ""
-"要跟踪一个特定合同上的服务, 需要使用记工单应用 。一个和销售订单关联的分析账户自动创建, (屏幕上的\" SO009 - Agrolait \\ "
-"\"), 然后只要服务被销售掉就可以对之进行跟踪。"
-
-#: ../../sales/invoicing/services/support.rst:104
-msgid "Control delivered support on the sales order"
-msgstr "在销售订单控制交货支持"
-
-#: ../../sales/invoicing/services/support.rst:106
-msgid ""
-"From the **Sales** application, use the menu :menuselection:`Sales --> Sales"
-" Orders`  to control the progress of every order. On the sales order line "
-"related to the support contract, you should see the **Delivered Quantities**"
-" that are updated automatically, based on the number of hours in the "
-"timesheet."
-msgstr ""
-"在 **销售** 应用下, 使用菜单项 :menuselection:`销售(Sales) --> 销售订单(Sales Orders)` "
-"来控制每张订单的进度。在和支持合同相关的销售订单行上, 可以看到 **交货数量** 会根据记工单中的小时数自动更新。"
-
-#: ../../sales/invoicing/services/support.rst:116
-msgid "Upselling and renewal"
-msgstr "向上销售和更新"
-
-#: ../../sales/invoicing/services/support.rst:118
-msgid ""
-"If the number of hours you performed on the support contract is bigger or "
-"equal to the number of hours the customer purchased, you are suggested to "
-"sell an extra contract to the customer since they used all their quota of "
-"service. Periodically (ideally once every two weeks), you should check the "
-"sales order that are in such a case. To do so, go to :menuselection:`Sales "
-"--> Invoicing --> Orders to Upsell`."
+#: ../../sales/invoicing/expense.rst:12
+#: ../../sales/invoicing/time_materials.rst:64
+msgid "Expenses configuration"
 msgstr ""
 
-#: ../../sales/invoicing/services/support.rst:127
+#: ../../sales/invoicing/expense.rst:14
+#: ../../sales/invoicing/time_materials.rst:66
 msgid ""
-"If you use Odoo CRM, a good practice is to create an opportunity for every "
-"sale order in upselling invoice status so that you easily track your "
-"upselling effort."
-msgstr "如果你使用Odoo CRM, 最好的联系就是为每个在向上销售开票状态的销售订单创建一个商机, 这样你就可以容易追踪向上销售"
-
-#: ../../sales/invoicing/services/support.rst:131
-msgid ""
-"If you sell an extra support contract, you can either add a new line on the "
-"existing sales order (thus, you continue to timesheet on the same order) or "
-"create a new order (thus, people will timesheet their hours on the new "
-"contract). To unmark the sales order as **Upselling**, you can set the sales"
-" order as done and it will disappear from your upselling list."
+"To track & invoice expenses, you will need the expenses app. Go to "
+":menuselection:`Apps --> Expenses` to install it."
 msgstr ""
 
-#: ../../sales/invoicing/services/support.rst:138
-msgid "Special Configuration"
-msgstr "特殊配置"
-
-#: ../../sales/invoicing/services/support.rst:140
+#: ../../sales/invoicing/expense.rst:17
+#: ../../sales/invoicing/time_materials.rst:69
 msgid ""
-"When creating the product form, you may set a different approach to track "
-"the service:"
-msgstr "在创建产品表单的时候, 选择不同方式跟踪该服务"
-
-#: ../../sales/invoicing/services/support.rst:143
-msgid ""
-"**Create task and track hours**: in this mode, a task is created for every "
-"sales order line. Then when you do the timesheet, you don't record hours on "
-"a sales order/contract, but you record hours on a task (that represents the "
-"contract). The advantage of this solution is that it allows to sell several "
-"service contracts within the same sales order."
+"You should also activate the analytic accounts feature to link expenses to "
+"the sales order, to do so, go to :menuselection:`Invoicing --> Configuration"
+" --> Settings` and activate *Analytic Accounting*."
 msgstr ""
 
-#: ../../sales/invoicing/services/support.rst:150
-msgid ""
-"**Manually**: you can use this mode if you don't record timesheets in Odoo. "
-"The number of hours you worked on a specific contract can be recorded "
-"manually on the sales order line directly, in the delivered quantity field."
+#: ../../sales/invoicing/expense.rst:22
+#: ../../sales/invoicing/time_materials.rst:74
+msgid "Add expenses to your sales order"
 msgstr ""
 
-#: ../../sales/invoicing/services/support.rst:156
-msgid ":doc:`../../../inventory/settings/products/uom`"
-msgstr ":doc:`../../../inventory/settings/products/uom` "
+#: ../../sales/invoicing/expense.rst:24
+#: ../../sales/invoicing/time_materials.rst:76
+msgid ""
+"From the expense app, you or your consultant can create a new one, e.g. the "
+"hotel for the first week on the site of your customer."
+msgstr ""
+
+#: ../../sales/invoicing/expense.rst:27
+#: ../../sales/invoicing/time_materials.rst:79
+msgid ""
+"You can then enter a relevant description and select an existing product or "
+"create a new one from right there."
+msgstr ""
+
+#: ../../sales/invoicing/expense.rst:33
+#: ../../sales/invoicing/time_materials.rst:85
+msgid "Here, we are creating a *Hotel* product:"
+msgstr ""
+
+#: ../../sales/invoicing/expense.rst:38
+msgid ""
+"Under the invoicing tab, select *Delivered quantities* and either *At cost* "
+"or *Sales price* as well depending if you want to invoice the cost of your "
+"expense or a previously agreed on sales price."
+msgstr ""
+
+#: ../../sales/invoicing/expense.rst:45
+#: ../../sales/invoicing/time_materials.rst:97
+msgid ""
+"To modify or create more products go to :menuselection:`Expenses --> "
+"Configuration --> Expense products`."
+msgstr ""
+
+#: ../../sales/invoicing/expense.rst:48
+#: ../../sales/invoicing/time_materials.rst:100
+msgid ""
+"Back on the expense, add the original sale order in the expense to submit."
+msgstr ""
+
+#: ../../sales/invoicing/expense.rst:54
+#: ../../sales/invoicing/time_materials.rst:106
+msgid "It can then be submitted to the manager, approved and finally posted."
+msgstr ""
+
+#: ../../sales/invoicing/expense.rst:65
+#: ../../sales/invoicing/time_materials.rst:117
+msgid "It will then be in the sales order and ready to be invoiced."
+msgstr ""
+
+#: ../../sales/invoicing/invoicing_policy.rst:3
+msgid "Invoice based on delivered or ordered quantities"
+msgstr ""
+
+#: ../../sales/invoicing/invoicing_policy.rst:5
+msgid ""
+"Depending on your business and what you sell, you have two options for "
+"invoicing:"
+msgstr ""
+
+#: ../../sales/invoicing/invoicing_policy.rst:8
+msgid ""
+"Invoice on ordered quantity: invoice the full order as soon as the sales "
+"order is confirmed."
+msgstr ""
+
+#: ../../sales/invoicing/invoicing_policy.rst:10
+msgid ""
+"Invoice on delivered quantity: invoice on what you delivered even if it's a "
+"partial delivery."
+msgstr ""
+
+#: ../../sales/invoicing/invoicing_policy.rst:13
+msgid "Invoice on ordered quantity is the default mode."
+msgstr ""
+
+#: ../../sales/invoicing/invoicing_policy.rst:15
+msgid ""
+"The benefits of using *Invoice on delivered quantity* depends on your type "
+"of business, when you sell material, liquids or food in large quantities the"
+" quantity might diverge a little bit and it is therefore better to invoice "
+"the actual delivered quantity."
+msgstr ""
+
+#: ../../sales/invoicing/invoicing_policy.rst:21
+msgid ""
+"You also have the ability to invoice manually, letting you control every "
+"options: invoice ready to invoice lines, invoice a percentage (advance), "
+"invoice a fixed advance."
+msgstr ""
+
+#: ../../sales/invoicing/invoicing_policy.rst:26
+msgid "Decide the policy on a product page"
+msgstr ""
+
+#: ../../sales/invoicing/invoicing_policy.rst:28
+msgid ""
+"From any products page, under the invoicing tab you will find the invoicing "
+"policy and select the one you want."
+msgstr ""
+
+#: ../../sales/invoicing/invoicing_policy.rst:35
+msgid "Send the invoice"
+msgstr ""
+
+#: ../../sales/invoicing/invoicing_policy.rst:37
+msgid ""
+"Once you confirm the sale, you can see your delivered and invoiced "
+"quantities."
+msgstr ""
+
+#: ../../sales/invoicing/invoicing_policy.rst:43
+msgid ""
+"If you set it in ordered quantities, you can invoice as soon as the sale is "
+"confirmed. If however you selected delivered quantities, you will first have"
+" to validate the delivery."
+msgstr ""
+
+#: ../../sales/invoicing/invoicing_policy.rst:47
+msgid ""
+"Once the products are delivered, you can invoice your customer. Odoo will "
+"automatically add the quantities to invoiced based on how many you delivered"
+" if you did a partial delivery."
+msgstr ""
+
+#: ../../sales/invoicing/milestone.rst:3
+msgid "Invoice project milestones"
+msgstr ""
+
+#: ../../sales/invoicing/milestone.rst:5
+msgid ""
+"Milestone invoicing can be used for expensive or large-scale projects, with "
+"each milestone representing a clear sequence of work that will incrementally"
+" build up to the completion of the contract. This invoicing method is "
+"comfortable both for the company which is ensured to get a steady cash flow "
+"throughout the project lifetime and for the client who can monitor the "
+"project's progress and pay in several installments."
+msgstr ""
+
+#: ../../sales/invoicing/milestone.rst:13
+msgid "Create milestone products"
+msgstr ""
+
+#: ../../sales/invoicing/milestone.rst:15
+msgid ""
+"In Odoo, each milestone of your project is considered as a product. To "
+"configure products to work this way, go to any product form."
+msgstr ""
+
+#: ../../sales/invoicing/milestone.rst:18
+msgid ""
+"You have to set the product type as *Service* under general information and "
+"select *Milestones* in the sales tab."
+msgstr ""
+
+#: ../../sales/invoicing/milestone.rst:25
+msgid "Invoice milestones"
+msgstr "里程碑开票"
+
+#: ../../sales/invoicing/milestone.rst:27
+msgid ""
+"From the sales order, you can manually edit the quantity delivered as you "
+"complete a milestone."
+msgstr ""
+
+#: ../../sales/invoicing/milestone.rst:33
+msgid "You can then invoice that first milestone."
+msgstr ""
+
+#: ../../sales/invoicing/proforma.rst:3 ../../sales/invoicing/proforma.rst:22
+msgid "Send a pro-forma invoice"
+msgstr ""
+
+#: ../../sales/invoicing/proforma.rst:5
+msgid ""
+"A pro-forma invoice is an abridged or estimated invoice in advance of a "
+"delivery of goods. It notes the kind and quantity of goods, their value, and"
+" other important information such as weight and transportation charges. Pro-"
+"forma invoices are commonly used as preliminary invoices with a quotation, "
+"or for customs purposes in importation. They differ from a normal invoice in"
+" not being a demand or request for payment."
+msgstr ""
+
+#: ../../sales/invoicing/proforma.rst:13
+#: ../../sales/send_quotations/different_addresses.rst:10
+msgid "Activate the feature"
+msgstr ""
+
+#: ../../sales/invoicing/proforma.rst:15
+msgid ""
+"Go to :menuselection:`SALES --> Configuration --> Settings` and activate the"
+" *Pro-Forma Invoice* feature."
+msgstr ""
+
+#: ../../sales/invoicing/proforma.rst:24
+msgid ""
+"From any quotation or sales order, you know have an option to send a pro-"
+"forma invoice."
+msgstr ""
+
+#: ../../sales/invoicing/proforma.rst:30
+msgid ""
+"When you click on send, Odoo will send an email with the pro-forma invoice "
+"in attachment."
+msgstr ""
+
+#: ../../sales/invoicing/subscriptions.rst:3
+msgid "Sell subscriptions"
+msgstr ""
+
+#: ../../sales/invoicing/subscriptions.rst:5
+msgid ""
+"Selling subscription products will give you predictable revenue, making "
+"planning ahead much easier."
+msgstr ""
+
+#: ../../sales/invoicing/subscriptions.rst:9
+msgid "Make a subscription from a sales order"
+msgstr ""
+
+#: ../../sales/invoicing/subscriptions.rst:11
+msgid ""
+"From the sales app, create a quotation to the desired customer, and select "
+"the subscription product your previously created."
+msgstr ""
+
+#: ../../sales/invoicing/subscriptions.rst:14
+msgid ""
+"When you confirm the sale the subscription will be created automatically. "
+"You will see a direct link from the sales order to the Subscription in the "
+"upper right corner."
+msgstr ""
+
+#: ../../sales/invoicing/time_materials.rst:3
+msgid "Invoice based on time and materials"
+msgstr ""
+
+#: ../../sales/invoicing/time_materials.rst:5
+msgid ""
+"Time and Materials is generally used in projects in which it is not possible"
+" to accurately estimate the size of the project, or when it is expected that"
+" the project requirements would most likely change."
+msgstr ""
+
+#: ../../sales/invoicing/time_materials.rst:9
+msgid ""
+"This is opposed to a fixed-price contract in which the owner agrees to pay "
+"the contractor a lump sum for the fulfillment of the contract no matter what"
+" the contractors pay their employees, sub-contractors, and suppliers."
+msgstr ""
+
+#: ../../sales/invoicing/time_materials.rst:14
+msgid ""
+"For this documentation I will use the example of a consultant, you will need"
+" to invoice their time, their various expenses (transport, lodging, ...) and"
+" purchases."
+msgstr ""
+
+#: ../../sales/invoicing/time_materials.rst:19
+msgid "Invoice time configuration"
+msgstr ""
+
+#: ../../sales/invoicing/time_materials.rst:21
+msgid ""
+"To keep track of progress in the project, you will need the *Project* app. "
+"Go to :menuselection:`Apps --> Project` to install it."
+msgstr ""
+
+#: ../../sales/invoicing/time_materials.rst:24
+msgid ""
+"In *Project* you will use timesheets, to do so go to :menuselection:`Project"
+" --> Configuration --> Settings` and activate the *Timesheets* feature."
+msgstr ""
+
+#: ../../sales/invoicing/time_materials.rst:32
+msgid "Invoice your time spent"
+msgstr ""
+
+#: ../../sales/invoicing/time_materials.rst:34
+msgid ""
+"From a product page set as a service, you will find two options under the "
+"invoicing tab, select both *Timesheets on tasks* and *Create a task in a new"
+" project*."
+msgstr ""
+
+#: ../../sales/invoicing/time_materials.rst:41
+msgid "You could also add the task to an existing project."
+msgstr ""
+
+#: ../../sales/invoicing/time_materials.rst:43
+msgid ""
+"Once confirming a sales order, you will now see two new buttons, one for the"
+" project overview and one for the current task."
+msgstr ""
+
+#: ../../sales/invoicing/time_materials.rst:49
+msgid ""
+"You will directly be in the task if you click on it, you can also access it "
+"from the *Project* app."
+msgstr ""
+
+#: ../../sales/invoicing/time_materials.rst:52
+msgid ""
+"Under timesheets, you can assign who works on it. You can or they can add "
+"how many hours they worked on the project so far."
+msgstr ""
+
+#: ../../sales/invoicing/time_materials.rst:58
+msgid "From the sales order, you can then invoice those hours."
+msgstr ""
+
+#: ../../sales/invoicing/time_materials.rst:90
+msgid ""
+"under the invoicing tab, select *Delivered quantities* and either *At cost* "
+"or *Sales price* as well depending if you want to invoice the cost of your "
+"expense or a previously agreed on sales price."
+msgstr ""
+
+#: ../../sales/invoicing/time_materials.rst:120
+msgid "Invoice purchases"
+msgstr ""
+
+#: ../../sales/invoicing/time_materials.rst:122
+msgid ""
+"The last thing you might need to add to the sale order is purchases made for"
+" it."
+msgstr ""
+
+#: ../../sales/invoicing/time_materials.rst:125
+msgid ""
+"You will need the *Purchase Analytics* feature, to activate it, go to "
+":menuselection:`Invoicing --> Configuration --> Settings` and select "
+"*Purchase Analytics*."
+msgstr ""
+
+#: ../../sales/invoicing/time_materials.rst:129
+msgid ""
+"While making the purchase order don't forget to add the right analytic "
+"account."
+msgstr ""
+
+#: ../../sales/invoicing/time_materials.rst:135
+msgid ""
+"Once the PO is confirmed and received, you can create the vendor bill, this "
+"will automatically add it to the SO where you can invoice it."
+msgstr ""
 
 #: ../../sales/products_prices.rst:3
 msgid "Products & Prices"
@@ -1244,7 +1016,7 @@ msgstr ""
 
 #: ../../sales/products_prices/taxes.rst:3
 msgid "Set taxes"
-msgstr ""
+msgstr "设置税率"
 
 #: ../../sales/sale_ebay.rst:3
 msgid "eBay"
@@ -1302,10 +1074,6 @@ msgid ""
 "invoice location."
 msgstr ""
 
-#: ../../sales/send_quotations/different_addresses.rst:10
-msgid "Activate the feature"
-msgstr ""
-
 #: ../../sales/send_quotations/different_addresses.rst:12
 msgid ""
 "Go to :menuselection:`SALES --> Configuration --> Settings` and activate the"
@@ -1504,6 +1272,10 @@ msgid ""
 "complete quotation in no time."
 msgstr ""
 
+#: ../../sales/send_quotations/quote_template.rst:10
+msgid "Configuration"
+msgstr "配置"
+
 #: ../../sales/send_quotations/quote_template.rst:12
 msgid ""
 "For this feature to work, go to :menuselection:`Sales --> Configuration --> "
diff --git a/locale/zh_CN/LC_MESSAGES/website.po b/locale/zh_CN/LC_MESSAGES/website.po
index 8d22c9ec3..6ceb00cb1 100644
--- a/locale/zh_CN/LC_MESSAGES/website.po
+++ b/locale/zh_CN/LC_MESSAGES/website.po
@@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-07-23 12:10+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: 凡 杨 <sailfan_yang@qq.com>, 2018\n"
+"Last-Translator: e2f_cn c7 <e2f_cn_c7@outlook.com>, 2018\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -221,8 +221,7 @@ msgstr "幸运的是, Odoo为您完成所有。下面, 你会发现Odoo使用加
 msgid ""
 "`Google Page Speed "
 "<https://developers.google.com/speed/pagespeed/insights/>`__"
-msgstr ""
-" `谷歌网页速度<https ://developers.google.com/speed/pagespeed/insights/>` __"
+msgstr "`谷歌网页速度<https://developers.google.com/speed/pagespeed/insights/>`__"
 
 #: ../../website/optimize/seo.rst:46
 msgid "`Pingdom Website Speed Test <http://tools.pingdom.com/fpt/>`__"
@@ -742,7 +741,7 @@ msgstr "一些URL有几个动态部分，如这个(一个博客类别和一个
 
 #: ../../website/optimize/seo.rst:355
 msgid "https://www.odoo.com/blog/company-news-5/post/the-odoo-story-56"
-msgstr "https ://www.odoo.com/blog/company-news-5/post/the-odoo-story-56"
+msgstr "https://www.odoo.com/blog/company-news-5/post/the-odoo-story-56"
 
 #: ../../website/optimize/seo.rst:357
 msgid "In the above example:"
@@ -765,7 +764,7 @@ msgstr "当Odoo页面有一个寻呼机，页码直接在URL设置(没有得到G
 
 #: ../../website/optimize/seo.rst:367
 msgid "https://www.odoo.com/blog/page/3"
-msgstr "https ://www.odoo.com/blog/page/3"
+msgstr "https://www.odoo.com/blog/page/3"
 
 #: ../../website/optimize/seo.rst:370
 msgid ""
@@ -893,13 +892,13 @@ msgstr "如果在多个语言中运行一个网站，在不同的URL将看到相
 msgid ""
 "https://www.mywebsite.com/shop/product/my-product-1 (English version = "
 "default)"
-msgstr "https ://www.mywebsite.com/shop/product/my-product-1 (英文 = 默认)"
+msgstr "https://www.mywebsite.com/shop/product/my-product-1 (默认 = 英文)"
 
 #: ../../website/optimize/seo.rst:443
 msgid ""
 "https://www.mywebsite.com\\/fr\\_FR/shop/product/mon-produit-1 (French "
 "version)"
-msgstr "https ://www.mywebsite.com\\/fr\\_FR/shop/product/mon-produit-1 (法文)"
+msgstr "https://www.mywebsite.com\\/fr\\_FR/shop/product/mon-produit-1 (法文版本)"
 
 #: ../../website/optimize/seo.rst:445
 msgid ""
@@ -1121,7 +1120,7 @@ msgstr "用户代理: \\*"
 
 #: ../../website/optimize/seo.rst:580
 msgid "Sitemap: https://www.odoo.com/sitemap.xml"
-msgstr "站点地图 : https: //www.odoo.com/sitemap.xml"
+msgstr "站点地图: https://www.odoo.com/sitemap.xml"
 
 #: ../../website/optimize/seo.rst:583
 msgid "Content is king"
@@ -1239,7 +1238,7 @@ msgstr "你的网址与你公司或组织的品牌同样重要，因此要更改
 
 #: ../../website/publish/domain_name.rst:15
 msgid "Simple and obvious"
-msgstr "显而易见的"
+msgstr "简单和显而易见的"
 
 #: ../../website/publish/domain_name.rst:16
 msgid "Easy to remember and spell"
@@ -1401,7 +1400,7 @@ msgstr "如何进行网址转换"
 
 #: ../../website/publish/translate.rst:6
 msgid "Overview"
-msgstr "概述"
+msgstr "概览"
 
 #: ../../website/publish/translate.rst:8
 msgid ""