From 39ed3e029bedf46484c8adcf8773fae517b4f41b Mon Sep 17 00:00:00 2001 From: Odoo Translation Bot Date: Tue, 9 May 2017 14:33:17 +0200 Subject: [PATCH] [I18N] Update translation terms from Transifex --- locale/es/LC_MESSAGES/accounting.po | 424 +++++------- locale/es/LC_MESSAGES/discuss.po | 216 ++++-- locale/es/LC_MESSAGES/ecommerce.po | 754 ++++++++++++--------- locale/es/LC_MESSAGES/general.po | 342 +++++++--- locale/es/LC_MESSAGES/inventory.po | 30 +- locale/es/LC_MESSAGES/point_of_sale.po | 126 +++- locale/es/LC_MESSAGES/purchase.po | 36 +- locale/es/LC_MESSAGES/sales.po | 226 ++----- locale/es/LC_MESSAGES/website.po | 6 +- locale/fr/LC_MESSAGES/accounting.po | 432 +++++------- locale/fr/LC_MESSAGES/discuss.po | 212 ++++-- locale/fr/LC_MESSAGES/ecommerce.po | 754 ++++++++++++--------- locale/fr/LC_MESSAGES/general.po | 342 +++++++--- locale/fr/LC_MESSAGES/inventory.po | 30 +- locale/fr/LC_MESSAGES/point_of_sale.po | 126 +++- locale/fr/LC_MESSAGES/purchase.po | 36 +- locale/fr/LC_MESSAGES/sales.po | 229 ++----- locale/nl/LC_MESSAGES/accounting.po | 374 +++++------ locale/nl/LC_MESSAGES/discuss.po | 212 ++++-- locale/nl/LC_MESSAGES/ecommerce.po | 760 ++++++++++++---------- locale/nl/LC_MESSAGES/general.po | 342 +++++++--- locale/nl/LC_MESSAGES/inventory.po | 30 +- locale/nl/LC_MESSAGES/point_of_sale.po | 126 +++- locale/nl/LC_MESSAGES/purchase.po | 34 +- locale/nl/LC_MESSAGES/sales.po | 224 ++----- locale/zh_CN/LC_MESSAGES/accounting.po | 386 +++++------ locale/zh_CN/LC_MESSAGES/discuss.po | 212 ++++-- locale/zh_CN/LC_MESSAGES/ecommerce.po | 754 ++++++++++++--------- locale/zh_CN/LC_MESSAGES/general.po | 348 +++++++--- locale/zh_CN/LC_MESSAGES/inventory.po | 30 +- locale/zh_CN/LC_MESSAGES/point_of_sale.po | 126 +++- locale/zh_CN/LC_MESSAGES/purchase.po | 36 +- locale/zh_CN/LC_MESSAGES/sales.po | 200 ++---- 33 files changed, 4931 insertions(+), 3584 deletions(-) diff --git a/locale/es/LC_MESSAGES/accounting.po b/locale/es/LC_MESSAGES/accounting.po index bfbe7f250..eb569aef4 100644 --- a/locale/es/LC_MESSAGES/accounting.po +++ b/locale/es/LC_MESSAGES/accounting.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-04-20 15:45+0200\n" +"POT-Creation-Date: 2017-05-09 14:24+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Christopher Ormaza , 2017\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" @@ -99,7 +99,6 @@ msgstr "" #: ../../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/paypal.rst:23 #: ../../accounting/receivables/getting_paid/automated_followups.rst:31 msgid "Configuration" msgstr "Configuración" @@ -1032,7 +1031,6 @@ msgstr "" #: ../../accounting/bank/misc/batch.rst:124 #: ../../accounting/payables/pay/sepa.rst:113 -#: ../../accounting/receivables/customer_payments/paypal.rst:134 msgid "Troubleshooting" msgstr "Solución de problemas" @@ -1977,6 +1975,11 @@ msgstr "" "En la pestaña Asientos de Diarios, la cuenta Débito y Crédito preestablecida" " puede ser configurada también como la moneda del diario" +#: ../../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 "" @@ -1995,14 +1998,26 @@ msgstr "" msgid "Select 'General' for miscellaneous operations journals." msgstr "" +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Company" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "Company related to this journal" msgstr "Compañía relacionada con este diario" +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Short Code" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "The journal entries of this journal will be named using this prefix." msgstr "Los asientos de este diario será nombrados usando este prefijo." +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Dedicated Refund Sequence" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "" "Check this box if you don't want to share the same sequence for invoices and" @@ -2011,6 +2026,10 @@ msgstr "" "Marque esta casilla si no quiere compartir la misma secuencia para facturas " "y facturas rectificativas hechas desde este diario" +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Entry Sequence" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "" "This field contains the information related to the numbering of the journal " @@ -2019,6 +2038,10 @@ msgstr "" "Este campo contiene información relacionada con la numeración de los " "asientos de este diario." +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Refund Entry Sequence" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "" "This field contains the information related to the numbering of the refund " @@ -2027,18 +2050,34 @@ msgstr "" "Este campo contiene la información relativa a la numeración de los asientos " "rectificativos de este diario." +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Default Debit Account" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "It acts as a default account for debit amount" msgstr "Actúa como una cuenta por defecto para importes en el debe." +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Default Credit Account" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "It acts as a default account for credit amount" msgstr "Actúa como una cuenta por defecto para los importes en el haber." +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Currency" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "The currency used to enter statement" msgstr "La divisa utilizada para introducir asientos." +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Debit Methods" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "" "Means of payment for collecting money. Odoo modules offer various payments " @@ -2049,6 +2088,10 @@ msgstr "" "facilidades de pago, pero usted siempre puede usar el método de pago " "'Manual' para gestionar pagos por fuera del software." +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Payment Methods" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "" "Means of payment for sending money. Odoo modules offer various payments " @@ -2059,6 +2102,10 @@ msgstr "" "facilidades de pago, pero usted siempre puede usar el método de pago " "'Manual' para gestionar pagos por fuera del software." +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Group Invoice Lines" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "" "If this box is checked, the system will try to group the accounting lines " @@ -2067,6 +2114,10 @@ msgstr "" "Si esta opción está marcada, el sistema tratará de agrupar las líneas del " "asiento cuando se generen desde facturas." +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Profit Account" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "" "Used to register a profit when the ending balance of a cash register differs" @@ -2075,6 +2126,10 @@ msgstr "" "Usado para registrar una ganancia cuando el saldo final de un registro de " "caja difiere de lo que el sistema calcula" +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Loss Account" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "" "Used to register a loss when the ending balance of a cash register differs " @@ -2083,10 +2138,18 @@ msgstr "" "Usado para registrar una pérdida cuando el saldo final de un registro de " "caja difiere de lo que el sistema calcula" +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Show journal on dashboard" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "Whether this journal should be displayed on the dashboard or not" msgstr "Si este diario debe mostrarse en el tablero o no" +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Check Printing Payment Method Selected" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "" "Technical feature used to know whether check printing was enabled as payment" @@ -2095,19 +2158,36 @@ msgstr "" "Campo técnico usado para saber si la impresión de cheques se habilitó como " "método de pago." +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Check Sequence" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "Checks numbering sequence." msgstr "Secuencia de numeración de los cheques." +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +#: ../../accounting/payables/pay/check.rst:0 +msgid "Manual Numbering" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 #: ../../accounting/payables/pay/check.rst:0 msgid "Check this option if your pre-printed checks are not numbered." msgstr "Marque esta opción si sus cheques pre-impresos no están numerados." +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Next Check Number" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "Sequence number of the next printed check." msgstr "Número de secuencia del próximo cheque impreso." +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Active in Point of Sale" +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" @@ -2116,6 +2196,10 @@ msgstr "" "Marca esta casilla de selección si este diario define un método de pago que " "puede ser utilizado en el punto de venta." +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Amount Authorized Difference" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "" "This field depicts the maximum difference allowed between the ending balance" @@ -2367,6 +2451,10 @@ msgstr "" msgid "Explanation of the fields:" msgstr "Explicación de los campos:" +#: ../../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 "Cuando un activo es creado, el estado es 'Borrador'." @@ -2388,22 +2476,42 @@ msgstr "" "ú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 "" + #: ../../accounting/others/adviser/assets.rst:0 msgid "Category of asset" msgstr "Categoría del activo" +#: ../../accounting/others/adviser/assets.rst:0 +msgid "Date" +msgstr "" + #: ../../accounting/others/adviser/assets.rst:0 msgid "Date of asset" msgstr "Fecha del activo" +#: ../../accounting/others/adviser/assets.rst:0 +msgid "Gross Value" +msgstr "" + #: ../../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 "" + #: ../../accounting/others/adviser/assets.rst:0 msgid "It is the amount you plan to have that you cannot depreciate." msgstr "Es el importe que prevee tener que no puede depreciar" +#: ../../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 "" @@ -2420,6 +2528,10 @@ msgid "" msgstr "" "Decreciente: Calculado en base de: Valor Residual * Factor Decreciente" +#: ../../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 depreciation " @@ -2444,6 +2556,10 @@ 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 "" + #: ../../accounting/others/adviser/assets.rst:0 msgid "" "Indicates that the first depreciation entry for this asset have to be done " @@ -2453,10 +2569,18 @@ msgstr "" "Indica que el primer asiento de amortización tiene que ser realizado desde " "la compra en vez desde el 1 de Enero / Empieza en la fecha del año fiscal." +#: ../../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 "El número de amortizaciones para amortizar el activo" +#: ../../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 "La cantidad de tiempo entre dos amortizaciones, en meses" @@ -4374,15 +4498,27 @@ msgstr "" "legales específicos de cada país, y establecer las reglas para cerrar un " "ejercicio fiscal y generar los apuntes de apertura." +#: ../../accounting/others/configuration/account_type.rst:0 +msgid "Tags" +msgstr "" + #: ../../accounting/others/configuration/account_type.rst:0 msgid "Optional tags you may want to assign for custom reporting" msgstr "Etiquetas opcionales a asignar en informes de ventas" +#: ../../accounting/others/configuration/account_type.rst:0 +msgid "Account Currency" +msgstr "" + #: ../../accounting/others/configuration/account_type.rst:0 msgid "Forces all moves for this account to have this account currency." msgstr "" "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" +msgstr "" + #: ../../accounting/others/configuration/account_type.rst:0 msgid "" "The 'Internal Type' is used for features available on different types of " @@ -4393,6 +4529,10 @@ msgstr "" "tipos de cuentas: el tipo liquidez es para efectivo o cuentas bancarias, " "pagable/pendiente de pago es para cuentas de proveedores/clientes." +#: ../../accounting/others/configuration/account_type.rst:0 +msgid "Allow Reconciliation" +msgstr "" + #: ../../accounting/others/configuration/account_type.rst:0 msgid "" "Check this box if this account allows invoices & payments matching of " @@ -9418,10 +9558,18 @@ msgstr "" msgid "Explanation of the fields of the payment screen:" msgstr "Explicación de los campos en la pantalla de pago: " +#: ../../accounting/payables/pay/check.rst:0 +msgid "Has Invoices" +msgstr "" + #: ../../accounting/payables/pay/check.rst:0 msgid "Technical field used for usability purposes" msgstr "Campo técnico utilizado por usabilidad" +#: ../../accounting/payables/pay/check.rst:0 +msgid "Hide Payment Method" +msgstr "" + #: ../../accounting/payables/pay/check.rst:0 msgid "" "Technical field used to hide the payment method if the selected journal has " @@ -9430,6 +9578,10 @@ msgstr "" "Campo técnico utilizado para ocultar el método de pago si el diario " "seleccionado tiene únicamente como disponible el 'manual'" +#: ../../accounting/payables/pay/check.rst:0 +msgid "Code" +msgstr "" + #: ../../accounting/payables/pay/check.rst:0 msgid "" "Technical field used to adapt the interface to the payment type selected." @@ -9437,6 +9589,10 @@ msgstr "" "Campo técnico utilizado para adaptar la interfaz al tipo de pago " "seleccionado." +#: ../../accounting/payables/pay/check.rst:0 +msgid "Check Number" +msgstr "" + #: ../../accounting/payables/pay/check.rst:0 msgid "" "The selected journal is configured to print check numbers. If your pre-" @@ -12343,8 +12499,8 @@ msgstr ":doc:`recording`" #: ../../accounting/receivables/customer_payments/credit_cards.rst:167 #: ../../accounting/receivables/customer_payments/recording.rst:128 -msgid ":doc:`paypal`" -msgstr ":doc:`paypal`" +msgid ":doc:`../../bank/feeds/paypal`" +msgstr "" #: ../../accounting/receivables/customer_payments/credit_cards.rst:169 #: ../../accounting/receivables/customer_payments/recording.rst:130 @@ -12653,260 +12809,6 @@ 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/paypal.rst:3 -msgid "How to accept paypal payments on invoices?" -msgstr "¿Cómo aceptar pagos paypal en facturas?" - -#: ../../accounting/receivables/customer_payments/paypal.rst:5 -msgid "" -"The \"Paypal Payment Acquirer\" module allows you to accept payments via " -"paypal, for your sales orders, invoices, or online orders. As paypal accepts" -" payments through credit cards (VISA, Mastercard, …), you will be able to " -"process most payment methods." -msgstr "" -"El módulo \"Comprador de Pagos Paypal\" le permite aceptar pagos vía paypal," -" para sus órdenes de venta, facturas, u órdenes en línea. Como paypal acepta" -" pagos a través de tarjetas de crédito (VISA, Mastercard, ...), Ud. podrá " -"procesar la mayoría de métodos de pago." - -#: ../../accounting/receivables/customer_payments/paypal.rst:10 -msgid "Paypal support two modes:" -msgstr "Paypal soporta dos modos:" - -#: ../../accounting/receivables/customer_payments/paypal.rst:12 -msgid "" -"Paypal Merchant Account: the user is redirected to paypal to do the payment " -"(either with a credit card or a paypal account)" -msgstr "" -"Cuenta Comerciante Paypal: el usuario es redirigido a paypal para hacer el " -"pago (ya sea con una tarjeta de crédito o una cuenta paypal)" - -#: ../../accounting/receivables/customer_payments/paypal.rst:15 -msgid "" -"PayPal PayFlow Pro (S2S, Server 2 Server): the user is not redirected to " -"paypal and the payment can be done in the background. This method is mostly " -"used for subscription businesses where you need to charge your customers " -"periodically." -msgstr "" -"PayPal PayFlow Pro (S2S, Server 2 Server): el usuario no es redirigido a " -"paypal y el pago puede ser hecho en segundo plano. Este método es usado más " -"que todo para suscripciones de negocio donde necesita cargar a sus clientes " -"periódicamente." - -#: ../../accounting/receivables/customer_payments/paypal.rst:20 -msgid "As of today, Odoo only support the normal Paypal Merchant Account." -msgstr "Hasta hoy, Odoo solo soporta la Cuenta Comerciante Paypal normal." - -#: ../../accounting/receivables/customer_payments/paypal.rst:26 -msgid "Install the \"PayPal Payment Acquirer\" module" -msgstr "Instalar el módulo \"Comprador de Pagos Paypal\"" - -#: ../../accounting/receivables/customer_payments/paypal.rst:28 -msgid "Start by installing the **PayPal Payment Acquirer** module." -msgstr "Empezar instalando el módulo **Comprador de Pagos Paypal**." - -#: ../../accounting/receivables/customer_payments/paypal.rst:30 -msgid "" -"Once the module is installed, you should see a new payment acquirer in the " -"Setting application, menu \"Payment Acquirers\"." -msgstr "" -"Una vez el módulo esta instalado, deberá ver un nuevo comprador de pago en " -"la aplicación Ajustes, menú \"Comprador de Pagos\"." - -#: ../../accounting/receivables/customer_payments/paypal.rst:36 -msgid "" -"By default, Paypal is configured to work in a test environment, out-of-the-" -"box. It means you can already test the full order to payment flow with the " -"paypal sandbox, without having to configure the next steps." -msgstr "" -"Por defecto, Paypal es configurado para trabajar en un ambiente de prueba, " -"fuera de la caja. Lo que significa que ya puede probar la órden completa " -"para el flujo de pago con la caja de arena de paypal, sin tener que " -"configuar los siguientes pasos." - -#: ../../accounting/receivables/customer_payments/paypal.rst:42 -msgid "Creating and configuring a PayPal merchant account" -msgstr "Crear y configurar una cuenta de comerciante Paypal" - -#: ../../accounting/receivables/customer_payments/paypal.rst:45 -msgid "Create a basic Paypal account" -msgstr "Crear una cuenta Paypal básica" - -#: ../../accounting/receivables/customer_payments/paypal.rst:47 -msgid "Existing or newly created Personal Paypal account can be used." -msgstr "" -"Las cuentas Paypal Personales existentes o recientemente creadas pueden ser " -"usadas." - -#: ../../accounting/receivables/customer_payments/paypal.rst:49 -msgid "Or upgrade your account to Business account (merchant) if needed" -msgstr "" -"O actualice su cuenta a cuenta de Negocios (Comerciante) si es necesario" - -#: ../../accounting/receivables/customer_payments/paypal.rst:55 -msgid "Paypal Account Summary page" -msgstr "Página de resumen de la Cuenta Paypal" - -#: ../../accounting/receivables/customer_payments/paypal.rst:58 -msgid "Paypal Configuration" -msgstr "Configuración Paypal" - -#: ../../accounting/receivables/customer_payments/paypal.rst:60 -msgid "" -"Access \"Seller preferences\" menu from `PayPal website " -"`__" -msgstr "" -"Acceso al menú \"Preferencias del vendedor\" desde `sitio web PayPal " -"`__" - -#: ../../accounting/receivables/customer_payments/paypal.rst:66 -msgid "" -"Access \"Website preferences\" and configure Auto Return (Payment Data " -"Transfer must be left to Off)" -msgstr "" -"Ingrese a las \"Preferencias del sitio Web\" y configure Auto Devolución (la" -" Transferencia de Datos de Pagos debe ser dejada en Apagado)" - -#: ../../accounting/receivables/customer_payments/paypal.rst:69 -msgid "**Database name**: yourcompany" -msgstr "**Nombre base de datos**: sucompañía" - -#: ../../accounting/receivables/customer_payments/paypal.rst:70 -#: ../../accounting/receivables/customer_payments/paypal.rst:88 -msgid "**Website URL**: https://yourcompany.odoo.com/" -msgstr "**Website URL**: https://yourcompany.odoo.com/" - -#: ../../accounting/receivables/customer_payments/paypal.rst:71 -msgid "**Return URL**: https://yourcompany.odoo.com/shop/confirmation" -msgstr "**Devolución URL**: https://yourcompany.odoo.com/shop/confirmation" - -#: ../../accounting/receivables/customer_payments/paypal.rst:76 -msgid "These settings will redirect your buyer to your web confirmation page." -msgstr "" -"Estos ajustes redirigirán a su comprador a su página web de confirmación." - -#: ../../accounting/receivables/customer_payments/paypal.rst:80 -msgid "Access and edit Instant payment notifications settings - IPN" -msgstr "" -"Ingresar y editar los ajustes para Notificaciones de Pago Instantáneas - IPN" - -#: ../../accounting/receivables/customer_payments/paypal.rst:85 -msgid "Example" -msgstr "Ejemplo" - -#: ../../accounting/receivables/customer_payments/paypal.rst:87 -msgid "**Database name**: \"yourcompany\"" -msgstr "**Nombre base de datos**: \"sucompañía\"" - -#: ../../accounting/receivables/customer_payments/paypal.rst:89 -msgid "**Notification URL**: https://yourcompany.odoo.com/payment/paypal/ipn/" -msgstr "" -"**Notificación URL**: https://yourcompany.odoo.com/payment/paypal/ipn/" - -#: ../../accounting/receivables/customer_payments/paypal.rst:91 -msgid "" -"Verify that your Notify URL uses the correct protocol (HTTP / HTTPS). If you" -" use the odoo.com domain, we advise you to use HTTPS." -msgstr "" -"Verifique que su URL de Notificación use el protocolo correcto (HTTP / " -"HTTPS). Si usa el dominio odoo.com, le recomendamos usar HTTPS." - -#: ../../accounting/receivables/customer_payments/paypal.rst:94 -msgid "" -"Set the encoding to UTF-8 from the menu :menuselection:`Settings --> " -"Language Encoding --> More Options --> More selling tools`" -msgstr "" -"Configurar la codificación a UTF-8 desde el menú :menuselection:`Ajustes -->" -" Lenguaje de Codificación --> Más Opciones --> Más herramientas de ventas`" - -#: ../../accounting/receivables/customer_payments/paypal.rst:103 -msgid "" -"Record your Merchant Paypal ID (personal or business account both will have " -"it) it will be entered in Odoo backend :menuselection:`Paypal Settings --> " -"Account Options`." -msgstr "" -"Registrar su ID de Comerciante Paypal (cuenta personal o de negocios ambas " -"lo tienen) será ingresado en el backend de Odoo :menuselection:`Paypal " -"Ajustes --> Opciones de Cuenta`." - -#: ../../accounting/receivables/customer_payments/paypal.rst:111 -msgid "" -"If you want your customers to be able to pay through Paypal while not having" -" a Paypal account- following setting \"Paypal Account Optional\" needs to be" -" set to **ON**. All users will be able to choose Credit/debit card payment " -"option - Paypal account not required." -msgstr "" -"Si quiere que sus clientes puedan pagar a través de Paypal mientras no tiene" -" una cuenta Paypal- los siguientes ajustes \"Cuenta Paypal Opcional\" " -"necesita ser configurada a **Encendido**. Todos los usuarios podrán elegir " -"la opción de pago con tarjeta Crédito/débito - Cuenta Paypal no es " -"requerido." - -#: ../../accounting/receivables/customer_payments/paypal.rst:120 -msgid "Setup your Paypal Payment Acquirer account credentials in Odoo" -msgstr "Instalar sus credenciales de cuenta Comprador de Pagos Paypal en Odoo" - -#: ../../accounting/receivables/customer_payments/paypal.rst:122 -msgid "" -":menuselection:`Settings --> Payments --> Payment Acquirers --> Paypal`" -msgstr "" -":menuselection:`Ajustes --> Pagos --> Compradores de Pagos --> Paypal`" - -#: ../../accounting/receivables/customer_payments/paypal.rst:124 -msgid "**Paypal Email ID**: your paypal account email address" -msgstr "**Paypal Email ID**: su dirección de email en su cuenta paypal" - -#: ../../accounting/receivables/customer_payments/paypal.rst:126 -msgid "**Paypal Merchant ID**: ID retrieved at previous step" -msgstr "**Paypal Comerciante ID**: ID traído del paso anterior" - -#: ../../accounting/receivables/customer_payments/paypal.rst:136 -msgid "" -"If your eCommerce customer gets this Error Message after completing Paypal " -"payment instead of being redirected to your database:" -msgstr "" -"Si su cliente de comercio electrónico obtiene este Mensaje de Error después " -"de haber completado el pago Paypal en lugar de ser redireccionado a su base " -"de datos:" - -#: ../../accounting/receivables/customer_payments/paypal.rst:142 -msgid "" -"Verify the settings you have `configured in Paypal `_:" -msgstr "" -"Verifique los ajustes que ha `configurado en Paypal `_:" - -#: ../../accounting/receivables/customer_payments/paypal.rst:144 -msgid "" -"Auto Return should be on (the value can be quite generic, like " -"/shop/confirmation; the correct URL will be set for each " -"transaction)" -msgstr "" -"La Auto Devolución debe estar encendida (el valor puede ser algo genérico, " -"como /shop/confirmation; la URL correcta debe ser configurada" -" para cada transacción)" - -#: ../../accounting/receivables/customer_payments/paypal.rst:148 -msgid "Payment Data Transfer should be off" -msgstr "La Transferencia de Datos de Pago debe estar apagada" - -#: ../../accounting/receivables/customer_payments/paypal.rst:150 -msgid "" -"On-premise databases must be accessible through classic HTTP/HTTPS ports " -"(80/443) for Paypal to work correctly, usually through a reverse proxy. " -"Contact your integrating partner if you are unsure this is the case. " -"Databases hosted on odoo.com are already configured correctly." -msgstr "" -"Las bases de datos En-sitio debe ser accesibles a través de los clásicos " -"puertos HTTP/HTTPS (80/443) para que Paypal funcione correctamente, " -"usualmente a través de un proxy inverso. Contacte a su asociado integrador " -"si esta poco seguro de que este sea el caso. Las bases de datos alojadas en " -"odoo.com ya estan configuradas correctamente." - -#: ../../accounting/receivables/customer_payments/paypal.rst:157 -#: ../../accounting/receivables/customer_payments/recording.rst:127 -msgid ":doc:`credit_cards`" -msgstr ":doc:`credit_cards`" - #: ../../accounting/receivables/customer_payments/recording.rst:3 msgid "What are the different ways to record a payment?" msgstr "¿Cuáles son las diferentes formas de registrar un pago?" @@ -13120,6 +13022,10 @@ msgstr "" "a cuenta. No haga este proceso de nuevo en la otra cuenta bancaria o " "terminará con dos entradas de diario para la misma transacción." +#: ../../accounting/receivables/customer_payments/recording.rst:127 +msgid ":doc:`credit_cards`" +msgstr ":doc:`credit_cards`" + #: ../../accounting/receivables/getting_paid.rst:3 msgid "How to get paid?" msgstr "¿Cómo obtener pagos?" diff --git a/locale/es/LC_MESSAGES/discuss.po b/locale/es/LC_MESSAGES/discuss.po index 09425e072..227ae411d 100644 --- a/locale/es/LC_MESSAGES/discuss.po +++ b/locale/es/LC_MESSAGES/discuss.po @@ -6,11 +6,11 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Odoo Business 9.0\n" +"Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-23 15:39+0100\n" +"POT-Creation-Date: 2017-05-09 14:24+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Antonio Trueba , 2017\n" +"Last-Translator: Ruben Dario Machado , 2017\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" @@ -23,146 +23,238 @@ msgid "Discuss" msgstr "Debates" #: ../../discuss/email_servers.rst:3 -msgid "How to use my own email servers to send and receive messages in Odoo" +msgid "How to use my own email servers to send and receive email in Odoo" msgstr "" #: ../../discuss/email_servers.rst:6 msgid "When is it needed" -msgstr "" +msgstr "Cuando sea necesario" #: ../../discuss/email_servers.rst:7 -msgid "You need it if you use Odoo Community or Enterprise." -msgstr "" - -#: ../../discuss/email_servers.rst:10 -msgid "What if I use Odoo Online" -msgstr "" - -#: ../../discuss/email_servers.rst:11 msgid "" -"You are done! Odoo Online comes up with an embedded and ready-to-use email " -"server (*@yourcompany.odoo.com*). We recommend to keep this default setting " -"as is as it is really convenient." +"Using your own email servers is required to send and receive messages in " +"Odoo Community or Enterprise. Odoo Online embeds an out-of-box email " +"solution that works straight away. However you can still use your own email " +"servers with the online edition. Some insights are provided here below." +msgstr "" + +#: ../../discuss/email_servers.rst:14 +msgid "How to set it up" msgstr "" #: ../../discuss/email_servers.rst:15 msgid "" -"Indeed, while it is branded by Odoo, the visible source of any message sent " -"from Odoo will be your personal email address (your Odoo login). Your " -"contacts will therefore trust your messages." -msgstr "" - -#: ../../discuss/email_servers.rst:20 -msgid "How does it work when a contact replies to an email sent from Odoo" +"As a system admin, go to :menuselection:`Settings --> General Settings` and " +"check *External Email Servers* (watch out: this checkbox only shows up after" +" Odoo 10). Then, go through the following steps." msgstr "" #: ../../discuss/email_servers.rst:21 msgid "" -"Default reply-to is a generic address used to automatically route any " -"incoming email to the discussion thread of the origin business object " -"(opportunity, order, task, etc.) and to the inbox of all its followers. By " -"default this address is \"catchall@\" but it can be changed. Thanks to it, " -"you get a perfect message thread in Odoo and you don't pollute your external" -" email box with Odoo-related topics." +"Office 365 doesn't allow external hosts like Odoo. Consequently you can't " +"use Office 365 email servers to send or receive messages in Odoo." msgstr "" -#: ../../discuss/email_servers.rst:29 -msgid "How to use my own email servers" -msgstr "" - -#: ../../discuss/email_servers.rst:30 -msgid "" -"You need to be a system admin to set this up. Go to :menuselection:`Settings" -" --> General Settings` and check *External Email Servers* (watch out: this " -"checkbox only shows up after Odoo 10). Then, go through the following steps." -msgstr "" - -#: ../../discuss/email_servers.rst:36 +#: ../../discuss/email_servers.rst:26 msgid "Set an outgoing email server for outbound messages" msgstr "" -#: ../../discuss/email_servers.rst:37 +#: ../../discuss/email_servers.rst:27 msgid "" "You need the SMTP data of your email provider (Gmail, Outlook, Yahoo, AOL, " "etc.) as well as your admin credentials. Once all the information has been " "filled out, click on *Test Connection*." msgstr "" -#: ../../discuss/email_servers.rst:45 +#: ../../discuss/email_servers.rst:35 msgid "Set an incoming email server for inbound messages" msgstr "" -#: ../../discuss/email_servers.rst:46 +#: ../../discuss/email_servers.rst:36 msgid "" "Fill out the form according to your email provider’s settings. Leave the " "*Actions to Perform on Incoming Mails* blank. Once all the information has " "been filled out, click on *TEST & CONFIRM*." msgstr "" -#: ../../discuss/email_servers.rst:53 +#: ../../discuss/email_servers.rst:43 msgid "" "By default inbound messages are fetched every 5 minutes. You can change this" " value in developer mode. Go to :menuselection:`Settings --> Technical --> " "Automation --> Scheduled Actions` and look for *Mail: Fetchmail Service*." msgstr "" -#: ../../discuss/email_servers.rst:59 +#: ../../discuss/email_servers.rst:49 msgid "Set the domain name" msgstr "" -#: ../../discuss/email_servers.rst:60 +#: ../../discuss/email_servers.rst:50 msgid "" "Enter the domain name of your email servers (e.g. mycompany.com) in General " "Settings." msgstr "" -#: ../../discuss/email_servers.rst:67 +#: ../../discuss/email_servers.rst:57 msgid "Create a catchall address" msgstr "" -#: ../../discuss/email_servers.rst:68 +#: ../../discuss/email_servers.rst:58 +msgid "" +"When a contact replies to an email sent from Odoo, the *reply-to* address is" +" a generic address used to route the reply to the right discussion thread in" +" Odoo (opportunity, order, task, etc.) and to the inbox of all its " +"followers. By default this address is \"catchall@\" but it can be changed." +msgstr "" + +#: ../../discuss/email_servers.rst:63 msgid "" "Create a catchall address in your email server settings. We advise you to " "use \"catchall@\" so that everything works out straight away. If you want to" " use another alias, you have extra steps in Odoo:" msgstr "" -#: ../../discuss/email_servers.rst:72 +#: ../../discuss/email_servers.rst:67 msgid "Activate the developer mode from your Settings Dashboard." msgstr "" -#: ../../discuss/email_servers.rst:77 +#: ../../discuss/email_servers.rst:72 msgid "" "Refresh your screen. Then go to :menuselection:`Settings --> Technical --> " "Parameters --> System Parameters` and enter your custom catchall alias in " "*mail.catchall.alias*." msgstr "" -#: ../../discuss/email_servers.rst:84 +#: ../../discuss/email_servers.rst:79 msgid "You can edit the email alias used for bounced messages the same way." msgstr "" -#: ../../discuss/email_servers.rst:87 -msgid "How to perfectly combine Odoo Discuss and my traditional email tool" +#: ../../discuss/email_servers.rst:82 +msgid "How to use my own email servers with Odoo Online" msgstr "" -#: ../../discuss/email_servers.rst:88 +#: ../../discuss/email_servers.rst:83 +msgid "" +"Odoo Online comes up with an embedded and ready-to-use email server " +"(*@yourcompany.odoo.com*). We recommend to keep this default setting as it " +"is really convenient. Indeed, while it is Odoo-labelled, the visible source " +"of any message sent from Odoo will be your personal email address (your Odoo" +" login). Your contacts will therefore trust your messages." +msgstr "" + +#: ../../discuss/email_servers.rst:90 +msgid "" +"You can still use your own email servers if you want your contacts to see " +"your historic email address when they reply to your messages or if you want " +"to manage the reputation of your email servers yourself." +msgstr "" + +#: ../../discuss/email_servers.rst:94 +msgid "There are 2 methods:" +msgstr "" + +#: ../../discuss/email_servers.rst:96 +msgid "" +"[Recommended] **Use a catchall redirection** (your server -> Odoo server) to" +" receive emails in Odoo in real time thanks to the Odoo email server. Create" +" a catchall address in your email server settings. Then apply following " +"redirection: catchall@yourdomain.ext -> catchall@yourcompany.odoo.com. " +"That's it you're ready to go!" +msgstr "" + +#: ../../discuss/email_servers.rst:102 +msgid "" +"**Use a catchall mailbox** to exclusively use your own email server. That " +"way you can also manage your email server reputation (blacklisting, etc). " +"However, incoming messages are fetched from the email server thanks to a " +"cron running every hour. This is the shortest time lap for crons in Online " +"instances. If you opt for this solution, simply follow the procedure of " +"above section." +msgstr "" + +#: ../../discuss/email_servers.rst:111 +msgid "How to be SPF-compliant when using external email servers in Odoo" +msgstr "" + +#: ../../discuss/email_servers.rst:112 +msgid "" +"Sender Policy Framework (SPF) is an email-validation system that checks that" +" incoming mail from a domain comes from a host authorized by that domain's " +"administrator. Such a security system is used in most email servers. If you " +"don't comply with it, your emails sent from Odoo will be likely flagged as " +"spam." +msgstr "" + +#: ../../discuss/email_servers.rst:118 +msgid "" +"To be SPF-compliant, you need to authorize Odoo as a sending host in your " +"domain name settings:" +msgstr "" + +#: ../../discuss/email_servers.rst:121 +msgid "Sign in to your domain’s account at your domain host." +msgstr "" + +#: ../../discuss/email_servers.rst:122 +msgid "Locate the page for updating your domain’s DNS records." +msgstr "" + +#: ../../discuss/email_servers.rst:123 +msgid "" +"If no TXT record is set, create one with following definition: v=spf1 " +"include:_spf.odoo.com ~all" +msgstr "" + +#: ../../discuss/email_servers.rst:125 +msgid "In case a TXT record is already set, add \"include:_spf.odoo.com\"." +msgstr "" + +#: ../../discuss/email_servers.rst:127 +msgid "e.g. for a Gmail server it should be:" +msgstr "" + +#: ../../discuss/email_servers.rst:129 +msgid "v=spf1 include:_spf.odoo.com include:_spf.google.com ~all" +msgstr "" + +#: ../../discuss/email_servers.rst:131 +msgid "" +"Find `here `__ the exact procedure to " +"create or modify TXT records in your own domain registrar." +msgstr "" + +#: ../../discuss/email_servers.rst:134 +msgid "" +"Your new SPF record can take up to 48 hours to go into effect, but this " +"usually happens more quickly." +msgstr "" + +#: ../../discuss/email_servers.rst:137 +msgid "" +"Adding more than one SPF record for a domain can cause problems with mail " +"delivery and spam classification. Instead, we recommend using only one SPF " +"record by modifying it to authorize Odoo." +msgstr "" + +#: ../../discuss/email_servers.rst:142 +msgid "How to choose between Odoo and my traditional email box" +msgstr "" + +#: ../../discuss/email_servers.rst:143 msgid "" "Odoo Discuss is a perfect tool to send and read messages related to business" -" objects. But it doesn't aim to replace a full-featured email software " -"(Gmail, Outlook, Yahoo, AOL, etc.). We recommend to take the most out of " +" documents. However it doesn't aim to replace a full-featured email solution" +" (Gmail, Outlook, Yahoo, AOL, etc.). We recommend to take the most out of " "both systems without mingling them: What is related to Odoo business objects" -" or applications goes into Odoo; What is not stays into your external email " -"boxes." +" or applications goes into Odoo; What is not can be managed into your " +"external email box." msgstr "" -#: ../../discuss/email_servers.rst:95 +#: ../../discuss/email_servers.rst:150 msgid "" "To do so, create specific email aliases to use in Odoo (to generate leads or" " opportunities, helpdesk tickets, etc.). If you take an email alias already " "used for messaging outside of Odoo, incoming messages will land into both " -"systems. This will negatively impact your productivity when it comes to " -"process them." +"systems. This will negatively impact your productivity." msgstr "" #: ../../discuss/mail_twitter.rst:3 diff --git a/locale/es/LC_MESSAGES/ecommerce.po b/locale/es/LC_MESSAGES/ecommerce.po index f45242ce2..38ff99a2b 100644 --- a/locale/es/LC_MESSAGES/ecommerce.po +++ b/locale/es/LC_MESSAGES/ecommerce.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Odoo Business 9.0\n" +"Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-23 15:39+0100\n" +"POT-Creation-Date: 2017-05-09 14:24+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Mateo Tibaquirá Palacios , 2017\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" @@ -655,23 +655,21 @@ msgid "Launch my website" msgstr "" #: ../../ecommerce/shopper_experience.rst:3 -msgid "Improve shopper experience" +msgid "Get paid" msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:3 -msgid "How to set up payment methods" +msgid "How to get paid with payment acquirers" msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:5 msgid "" -"To collect payments, you can either request your customers to process it " -"manually (e.g. wire transfer) or redirect them to payment acquirers. The " -"payment process described hereunder is common to both eCommerce and online " -"quotations." +"Odoo embeds several payment methods to get paid on eCommerce, Sales and " +"Invoicing apps." msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:10 -msgid "Payment methods" +msgid "What are the payment methods available" msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:13 @@ -681,451 +679,561 @@ msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:15 msgid "" "Wire Transfer is the default payment method available. The aim is providing " -"your customers with your bank details so that they can pay via their bank. " -"This is very easy to start with but slow and inefficient process-wise. Opt " -"for online acquirers as soon as you can!" +"your customers with your bank details so they can pay on their own via their" +" bank. This is very easy to start with but slow and inefficient process-" +"wise. Opt for online acquirers as soon as you can!" msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:21 -msgid "" -"For B2B users: you can create new manually-processed payment methods (check," -" purchase order, etc.) by renaming 'Wire Transfer' or duplicating it." +msgid "Payment acquirers" msgstr "" -#: ../../ecommerce/shopper_experience/payment.rst:25 -msgid "Online payment acquirers" +#: ../../ecommerce/shopper_experience/payment.rst:23 +msgid "" +"Redirect your customers to payment platforms to collect money effortless and" +" track the payment status (call-back). Odoo supports more and more platforms" +" over time:" msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:27 -msgid "" -"Redirect your customers to payment acquirer platforms to collect money " -"effortless. Odoo supports more and more platforms over time: Paypal, " -"Ingenico, Authorize.net, etc. Once the payment accepted, orders are " -"confirmed in Odoo so that the delivery & invoicing processes are triggered " -"automatically." +msgid "`Paypal `__" +msgstr "" + +#: ../../ecommerce/shopper_experience/payment.rst:28 +msgid "Ingenico" +msgstr "" + +#: ../../ecommerce/shopper_experience/payment.rst:29 +msgid "Authorize.net" +msgstr "" + +#: ../../ecommerce/shopper_experience/payment.rst:30 +msgid "Adyen" +msgstr "" + +#: ../../ecommerce/shopper_experience/payment.rst:31 +msgid "Buckaroo" +msgstr "" + +#: ../../ecommerce/shopper_experience/payment.rst:32 +msgid "PayUmoney" msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:33 -msgid "Custom (advanced)" +msgid "Sips" msgstr "" -#: ../../ecommerce/shopper_experience/payment.rst:35 -msgid "" -"Can be used to request payments to any payment acquirer not listed in Odoo." +#: ../../ecommerce/shopper_experience/payment.rst:34 +msgid "Stripe" msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:38 -msgid "Edit a payment method" +msgid "How to go live" msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:40 msgid "" -"To make payment methods intuitive for your customers feel free to customize " -"them by editing:" -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:42 -msgid "the name," -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:44 -msgid "the picture," -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:46 -msgid "" -"the notification messages (thank you & next step, error, cancellation)." +"Once the payment method ready, make it visible in the payment interface and " +"activate the **Production** mode." msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:48 +msgid "How to let customers save and reuse credit cards" +msgstr "" + +#: ../../ecommerce/shopper_experience/payment.rst:49 msgid "" -"Go to :menuselection:`Website Admin --> Configuration --> Payment Acquirers`" -" to do so." +"To ease the payment of returning customers, you can let them save and reuse " +"a credit card if they want to. If so, a payment token will be saved in Odoo." +" This option is available with Ingenico and Authorize.net." msgstr "" -#: ../../ecommerce/shopper_experience/payment.rst:51 -msgid "Generic setup" -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:53 -msgid "Review the elements here above." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:55 -msgid "Enter your credentials (online acquirers only)." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:57 -msgid "Choose your order confirmation preference (see below)." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:59 -msgid "Publish the payment method." +#: ../../ecommerce/shopper_experience/payment.rst:54 +#: ../../ecommerce/shopper_experience/payment.rst:68 +msgid "You can turn this on from the acquirer configuration form." msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:61 -msgid "Test the payment flow in *Test* mode (default mode)." +msgid "How to debit credit cards to pay subscriptions" msgstr "" -#: ../../ecommerce/shopper_experience/payment.rst:63 -msgid "Switch to *Production* mode." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:65 +#: ../../ecommerce/shopper_experience/payment.rst:62 msgid "" -"Se your default payment acquirer in :menuselection:`Accounting --> " -"Configuration --> Settings`. It will be auto-selected for your customers " -"when they enter the payment screen." +"`Odoo Subscription `__ allows to " +"bill services automatically on a recurring basis. Along with it, you can " +"have an automatic debit of the customer's credit card." msgstr "" -#: ../../ecommerce/shopper_experience/payment.rst:69 +#: ../../ecommerce/shopper_experience/payment.rst:66 +msgid "This option is available with Ingenico and Authorize.net." +msgstr "" + +#: ../../ecommerce/shopper_experience/payment.rst:73 msgid "" -"Rely on the documentation related to your payment acquirer to go through " -"step 2, 5 and 6. Some acquirers provides you with specific credentials for " -"test and production modes (Paypal). Others let you switch mode in their " -"setup interface (Authorize.net)." +"That way a payment token will be recorded when the customer goes for the " +"subscription and an automatic debit will occur whenever an invoice is issued" +" from the subscription." msgstr "" -#: ../../ecommerce/shopper_experience/payment.rst:74 +#: ../../ecommerce/shopper_experience/payment.rst:79 +msgid "How to use other acquirers (advanced)" +msgstr "" + +#: ../../ecommerce/shopper_experience/payment.rst:81 msgid "" -"With Ingenico and Authorize.net, you can let your customers save and reuse a" -" payment card to accelerate the process on next checkouts. See *Store Card " -"Data* in Configuration tab." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:78 -msgid "Payment flow" -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:80 -msgid "" -"When choosing the payment method, the customer is taken to the payment " -"acquirer interface to process the payment." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:83 -msgid "" -"Once done he is taken back to Odoo's confirmation page. The transaction " -"status shows up:" +"Odoo can submit single payment requests and redirect to any payment " +"acquirer. But there is no call-back, i.e. Odoo doesn't track the transaction" +" status. So you will confirm orders manually once you get paid." msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:85 -msgid "" -"*Pending*: the order will be confirmed as soon as you authorize the " -"transaction in the acquirer interface." +msgid "How to:" msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:87 -msgid "*Confirmed*: the payment has been authorized automatically." +msgid "Switch to developer mode." msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:89 -msgid "" -"A confirmation email is sent to the customer with a copy of the order in " -"pdf. It shows the payment status." +msgid "Take the **Custom** payment method." msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:91 -msgid "Launch the delivery and invoicing from:" -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:93 msgid "" -"eCommerce: :menuselection:`Website Admin --> Orders --> (Unpaid) Orders`," -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:95 -msgid "" -"online quotations: :menuselection:`Sales --> Sales --> Quotations/Sales " -"Orders`." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:97 -msgid "" -"For internal tracking purposes, a link to the transaction status is provided" -" in the sales order." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:100 -msgid "" -"If the customer cancels the payment while on the payment acquirer form, it " -"is taken back to the store page (or online quotation) in order to reprocess " -"the order. The payment is marked as *Cancelled* in Odoo." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:105 -msgid "" -"You can edit the confirmation email template from :menuselection:`Website " -"Admin --> Configuration --> Settings`." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:109 -msgid "Order confirmation preferences" -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:111 -msgid "There are 4 different behaviors available for any payment acquirer." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:114 -msgid "No automatic confirmation" -msgstr "Sin confirmación automática" - -#: ../../ecommerce/shopper_experience/payment.rst:116 -msgid "" -"This is the default mode for *Wire Transfer*. It means Odoo does not confirm" -" orders but keep them in an intermediary stage (*Quotation Sent* = *Unpaid " -"Order*). Once you get the payment, you are expected to confirm the order " -"manually to pursue the process (delivery, invoicing)." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:121 -msgid "" -"Authorize the amount and confirm the SO on acquirer confirmation (capture " -"manually)" -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:123 -msgid "" -"Odoo confirms the order as soon as the payment success notification comes " -"in. To get the money however, you need to capture it from your payment " -"transaction. In lots of countries you are indeed requested to deliver your " -"goods before capturing the amount." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:128 -msgid "" -"Authorize & capture the amount and confirm the SO on acquirer confirmation" -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:130 -msgid "" -"This is the default mode for payment acquirers. The amount is captured " -"automatically." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:133 -msgid "" -"For B2B: if you use a manual payment method like *Wire Transfer* and don't " -"expect any upfront payment to launch the delivery, switch to this mode as " -"well." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:137 -msgid "" -"Authorize & capture the amount, confirm the SO and auto-validate the invoice" -" on acquirer confirmation" -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:139 -msgid "" -"If you invoice upfront and not at the delivery, switch to this last mode to " -"automate everything. You are requested to select a Payment Journal to record" -" such payments (see " -":doc:`../../accounting/receivables/customer_payments/credit_cards`)." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:144 -msgid "Custom payment acquirers (advanced)" -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:146 -msgid "" -"Odoo can submit payment requests and redirect to any payment acquirer. In " -"such a case, you need to confirm the sale manually in Odoo once you get paid" -" because Odoo cannot read any payment status sent by the acquirer." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:150 -msgid "To configure this:" -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:152 -msgid "switch to developer mode," -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:154 -msgid "edit the *Custom* payment method," -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:156 -msgid "" -"set up the payment form (S2S Form Template) as instructed by your payment " +"Set up the payment form (S2S Form Template) as instructed by your payment " "acquirer. You can start from *default_acquirer_button* that you can " "duplicate." msgstr "" -#: ../../ecommerce/shopper_experience/payment.rst:160 -msgid "Recurring payments & Installment plans" +#: ../../ecommerce/shopper_experience/payment.rst:96 +msgid "Other configurations" msgstr "" -#: ../../ecommerce/shopper_experience/payment.rst:162 +#: ../../ecommerce/shopper_experience/payment.rst:98 msgid "" -"The Ingenico integration allows you to process and manage recurring payments" -" from Odoo Subscriptions app out-of-the-box (more information coming soon)." +"Odoo can also be used for more advanced payment processes like installment " +"plans (e.g. `Paypal Installment Plans " +"`__)." msgstr "" -#: ../../ecommerce/shopper_experience/payment.rst:165 +#: ../../ecommerce/shopper_experience/payment.rst:102 msgid "" -"With some customization, Odoo can also trigger installment plans if this is " -"permitted by your payment acquirer’s API:" +"Such a customization service is made on-demand by our technical experts " +"based on your own requirements. A business advisor can reach you out for " +"such matter. `Contact us. `__" msgstr "" -#: ../../ecommerce/shopper_experience/payment.rst:168 -msgid "" -"e.g. Paypal Installment Plans (see https://developer.paypal.com/docs/classic" -"/paypal-payments-standard/integration-guide/installment_buttons)." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:170 -msgid "" -"Such a service is made on-demand by our technical experts based on your own " -"requirements. Ask our business advisors at info@odoo.com." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:175 +#: ../../ecommerce/shopper_experience/payment.rst:109 msgid ":doc:`paypal`" msgstr ":doc:`paypal`" +#: ../../ecommerce/shopper_experience/payment.rst:110 +msgid ":doc:`wire_transfer`" +msgstr "" + +#: ../../ecommerce/shopper_experience/payment.rst:111 +#: ../../ecommerce/shopper_experience/paypal.rst:155 +msgid ":doc:`payment_acquirer`" +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:3 +msgid "How to manage orders paid with payment acquirers" +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:5 +msgid "" +"Odoo confirms orders automatically as soon as the payment is authorized by a" +" payment acquirer. This triggers the delivery. If you invoice based on " +"ordered quantities, you are also requested to invoice the order." +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:12 +msgid "What are the payment status" +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:13 +msgid "" +"At anytime, the salesman can check the transaction status from the order." +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:18 +msgid "*Draft*: transaction under processing." +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:20 +msgid "" +"*Pending*: the payment acquirer keeps the transaction on hold and you need " +"to authorize it from the acquirer interface." +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:23 +msgid "" +"*Authorized*: the payment has been authorized but not yet captured. In Odoo," +" the order is already confirmed. Once the delivery done, you can capture the" +" amount from the acquirer interface (or from Odoo if you use Authorize.net)." +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:28 +msgid "" +"*Done*: the payment is authorized and captured. The order has been " +"confirmed." +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:30 +msgid "" +"*Error*: an error has occured during the transaction. The customer needs to " +"retry the payment. The order is still in draft." +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:34 +msgid "" +"*Cancelled*: when the customer cancels the payment in the payment acquirer " +"form. They are taken back to Odoo in order to modify the order." +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:37 +msgid "" +"Specific messages are provided to your customers for every payment status, " +"when they are redirected to Odoo after the transaction. To edit such " +"messages, go to the *Messages* tab of the payment method." +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:44 +msgid "Auto-validate invoices at order" +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:46 +msgid "" +"When the order is confirmed you can also have an invoice automatically " +"issued and paid. This fully-automated made for businesses that invoice " +"orders straight on." +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:53 +msgid "" +"If you choose this mode you are requested to select a payment journal in " +"order to record payments in your books. This payment is automatically " +"reconcilied with the invoice, marking it as paid. Select your **bank " +"account** if you get paid immediately on your bank account. If you don't you" +" can create a specific journal for the payment acquirer (type = Bank). That " +"way, you can track online payments in an intermediary account of your books " +"until you get paid into your bank account (see `How to register credit card " +"payments " +"<../../accounting/receivables/customer_payments/credit_cards.html>`__)." +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:64 +msgid "Capture the payment after the delivery" +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:65 +msgid "" +"With this mode, the order is confirmed but the amount is kept on hold. Once " +"the delivery processed, you can capture the payment from Odoo. This mode is " +"only available with Authorize.net." +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:72 +msgid "" +"To capture the payment, open the transaction from the order. Then click " +"*Capture Transaction*." +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:78 +msgid "" +"With other payment acquirers, you can manage the capture in their own " +"interfaces, not from Odoo." +msgstr "" + #: ../../ecommerce/shopper_experience/paypal.rst:3 -msgid "How to collect payments with Paypal" +msgid "How to get paid with Paypal" msgstr "" #: ../../ecommerce/shopper_experience/paypal.rst:5 msgid "" -"Paypal is the easiest payment method to configure. It is also the only one " -"without any subscription free." -msgstr "" - -#: ../../ecommerce/shopper_experience/paypal.rst:9 -msgid "Setup your Paypal account" +"Paypal is the easiest online payment method to configure. It is also the " +"only one without any subscription free. We definitely advise it to any " +"starter." msgstr "" #: ../../ecommerce/shopper_experience/paypal.rst:11 -msgid "" -"1. Create a business account at Paypal.com (see: https://www.paypal.com/in" -"/cgi-bin/webscr?cmd=xpt/Marketing/general/how-to-set-up-a-paypal-account-" -"outside) or upgrade your account to Business account (merchant) if you have " -"a basic account." +msgid "Set up your Paypal account" msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:15 +#: ../../ecommerce/shopper_experience/paypal.rst:13 msgid "" -"2. Log in to your account at Paypal.com and go to :menuselection:`My Account" -" --> Profile --> My Selling Tools`. There click *PayPal button language " -"encoding* under *More Selling Tools* section. Then, click *More Options* and" -" replace the two default encoding formats by *UTF-8*." +"Create a `Paypal Business Account `__ or upgrade " +"your account to *Business account* if you have a basic account." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:20 -msgid "Open Paypal setup form in Odoo and enter your *Email ID*." +#: ../../ecommerce/shopper_experience/paypal.rst:16 +msgid "" +"Log in to `Paypal `__ and open the settings of your " +"**Profile**." msgstr "" #: ../../ecommerce/shopper_experience/paypal.rst:22 -msgid "" -"4. The Paypal Merchant ID is not mandatory (extra verification level). It is" -" provided in Paypal under :menuselection:`My Account --> Overview`." +msgid "Now enter the menu **My selling tools**." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:25 -msgid "" -"5. Configure the IPN feedback (Paypal contacting your Odoo instance without " -"needing the redirection). The setting can be found in " -":menuselection:`Profile --> My Selling Tools --> Instant payment " -"notification`. Activate it and set it to " -"/payment/paypal/ipn." +#: ../../ecommerce/shopper_experience/paypal.rst:27 +msgid "Let's start with the **Website Preferences**." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:30 +#: ../../ecommerce/shopper_experience/paypal.rst:29 msgid "" -"6. To test the workflow, you can create sandbox accounts by logging in at " -"https://developer.paypal.com/webapps/developer/applications/myapps with the " -"same Paypal credentials. Two default sandbox accounts are automatically " -"generated when you register to Paypal: one is a buyer, the other is a " -"shopper." +"Turn on **Auto Return** and enter the **Return URL**: " +"/shop/confirmation. Verify that this address uses the " +"correct protocol (HTTP/HTTPS)." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:35 +#: ../../ecommerce/shopper_experience/paypal.rst:36 msgid "" -"7. Log in with your buyer sandbox account to https://www.sandbox.paypal.com " -"(same password than real account) and apply the same format change." +"Turn on **Payment Data Transfer**. When saving, an **Identity Token** is " +"generated. You will be later requested to enter it in Odoo." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:39 +#: ../../ecommerce/shopper_experience/paypal.rst:43 msgid "" -"To automatically redirect your customers when the payment is completed, go " -"to your Website Preferences and turn *Auto Return* on. Set *Return URL* to " -"/shop/confirmation. Verify that your *Notify URL* uses " -"the correct protocol (HTTP/HTTPS)." +"Then, get back to your profile to activate the **Instant Payment " +"Notification (IPN)** in *My selling tools*." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:44 -msgid "" -"If you want your customers to pay without creating a Paypal account, *Paypal" -" Account Optional* needs to be turned on." +#: ../../ecommerce/shopper_experience/paypal.rst:46 +msgid "Enter the **Notification URL**: /payment/paypal/ipn" msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:48 +#: ../../ecommerce/shopper_experience/paypal.rst:51 +msgid "" +"Now you must change the encoding format of the payment request sent by Odoo " +"to Paypal. To do so, get back to *My selling tools* and click **PayPal " +"button language encoding** in *More Selling Tools* section." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:58 +msgid "" +"Then, click *More Options* and set the two default encoding formats as " +"**UTF-8**." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:66 +msgid "" +"If you want your customers to pay without creating a Paypal account, " +"**Paypal Account Optional** needs to be turned on." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:74 +msgid "Set up Paypal's payment method in Odoo" +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:75 +msgid "" +"Open Paypal setup form in :menuselection:`Website or Sales or Accounting -->" +" Settings --> Payment Acquirers+`. Enter both your **Email ID** and your " +"**Merchant ID** and check **Use IPN**." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:82 +msgid "" +"They are both provided in your Paypal profile, under :menuselection:`My " +"business info`." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:85 +msgid "" +"Enter your **Identity Token** in Odoo (from *Auto Return* option). To do so," +" open the *Settings* and activate the **Developer Mode**." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:91 +msgid "" +"Then, go to :menuselection:`Settings --> Technical --> Parameters --> System" +" Parameters` and create a parameter with following values:" +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:94 +msgid "Key: payment_paypal.pdt_token" +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:95 +msgid "Value: your Paypal *Identity Token*" +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:102 +msgid "Go live" +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:103 +msgid "" +"Your configuration is now ready! You can make Paypal visible on your " +"merchant interface and activate the **Production mode**." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:112 msgid "Transaction fees" msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:50 +#: ../../ecommerce/shopper_experience/paypal.rst:114 msgid "" "You can charge an extra to the customer to cover the transaction fees Paypal" " charges you. Once redirected to Paypal, your customer sees an extra applied" " to the order amount." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:53 +#: ../../ecommerce/shopper_experience/paypal.rst:117 msgid "" -"To activate this, go to the *Configuration* tab and check *Add Extra Fees*. " -"Default fees are the ones charged by Paypal." +"To activate this, go to the *Configuration* tab of Paypal config form in " +"Odoo and check *Add Extra Fees*. Default fees for US can be seen here below." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:123 +msgid "" +"To apply the right fees for your country, please refer to `Paypal Fees " +"`__." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:128 +msgid "Test the payment flow" +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:130 +msgid "" +"You can test the entire payment flow thanks to Paypal Sandbox accounts." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:132 +msgid "" +"Log in to `Paypal Developer Site `__ with your" +" Paypal credentials. This will create two sandbox accounts:" +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:136 +msgid "" +"A business account (to use as merchant, e.g. " +"pp.merch01-facilitator@example.com)." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:137 +msgid "" +"A default personal account (to use as shopper, e.g. " +"pp.merch01-buyer@example.com)." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:139 +msgid "" +"Log in to `Paypal Sandbox `__ with the " +"merchant account and follow the same configuration instructions." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:142 +msgid "" +"Enter your sandbox credentials in Odoo and make sure Paypal is still set on " +"*Test* mode. Also, make sure the confirmation mode of Paypal is not " +"*Authorize & capture the amount, confirm the SO and auto-validate the " +"invoice on acquirer confirmation*. Otherwise a confirmed invoice will be " +"automatically generated when the transaction is completed." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:150 +msgid "Run a test transaction from Odoo using the sandbox personal account." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:154 +msgid ":doc:`payment`" msgstr "" #: ../../ecommerce/shopper_experience/portal.rst:3 -msgid "How customers can access their portal" +msgid "How customers can access their customer account" msgstr "" #: ../../ecommerce/shopper_experience/portal.rst:5 msgid "" -"It has never been so easy for your customers to access their documents " -"through a portal. Forget endless signup forms, Odoo makes it as easy as ABC." -" With eCommerce and Online Quotation apps, your customers are requested to " -"create a portal account (name, email, password only) from the very first " -"order confirmation or online quotation email they get from you." +"It has never been so easy for your customers to access their customer " +"account. Forget endless signup forms, Odoo makes it as easy as ABC. They are" +" suggested to sign up (name, email, password) when the order is placed, and " +"not before. Indeed, nothing is more annoying than going through a signup " +"process before buying something." msgstr "" -#: ../../ecommerce/shopper_experience/portal.rst:12 +#: ../../ecommerce/shopper_experience/portal.rst:14 msgid "Sign up" msgstr "Registrarse" -#: ../../ecommerce/shopper_experience/portal.rst:14 +#: ../../ecommerce/shopper_experience/portal.rst:16 msgid "" -"When clicking the link in the email or when clicking *Sign up* in the " -"checkout process, your customer is directed to the *Sign up* page." -msgstr "" - -#: ../../ecommerce/shopper_experience/portal.rst:21 -msgid "Customer account" +"The invitation to sign up shows up when the customer wants to visualize the " +"order from order confirmation email." msgstr "" #: ../../ecommerce/shopper_experience/portal.rst:23 +msgid "Customer account" +msgstr "" + +#: ../../ecommerce/shopper_experience/portal.rst:25 msgid "" -"Once logged in the customer will access his account by clicking *My Account*" +"Once logged in the customer will access the account by clicking *My Account*" " in the login dropdown menu." msgstr "" -#: ../../ecommerce/shopper_experience/portal.rst:29 +#: ../../ecommerce/shopper_experience/portal.rst:31 msgid "" -"From the portal menu all the customer history can be reviewed. The main " -"address (billing) can also be modified." +"THere they find all their history. The main address (billing) can also be " +"modified." msgstr "" -#: ../../ecommerce/shopper_experience/portal.rst:36 +#: ../../ecommerce/shopper_experience/portal.rst:37 msgid "" -"If a portal user is a contact of a company (*Company* field set in customer " -"detail form), this last will see all the documents of the company and all " -"its other contacts through the portal." +"If the customer is set as a contact of a company in your address book, they " +"will see all the documents whose the customer belongs to this company." +msgstr "" + +#: ../../ecommerce/shopper_experience/wire_transfer.rst:3 +msgid "How to get paid with wire transfers" +msgstr "" + +#: ../../ecommerce/shopper_experience/wire_transfer.rst:5 +msgid "" +"**Wire Transfer** is the default payment method available. The aim is " +"providing your customers with your bank details so they can pay on their " +"own. This is very easy to start with but slow and inefficient process-wise. " +"Opt for payment acquirers as soon as you can!" +msgstr "" + +#: ../../ecommerce/shopper_experience/wire_transfer.rst:13 +msgid "How to provide customers with payment instructions" +msgstr "" + +#: ../../ecommerce/shopper_experience/wire_transfer.rst:14 +msgid "" +"Put your payment instructions in the **Thanks Message** of your payment " +"method." +msgstr "" + +#: ../../ecommerce/shopper_experience/wire_transfer.rst:19 +msgid "They will appear to the customers when they place an order." +msgstr "" + +#: ../../ecommerce/shopper_experience/wire_transfer.rst:26 +msgid "How to manage an order once you get paid" +msgstr "" + +#: ../../ecommerce/shopper_experience/wire_transfer.rst:28 +msgid "" +"Whenever a customer pays by wire transfer, the order stays in an " +"intermediary stage **Quotation Sent** (i.e. unpaid order). When you get " +"paid, you confirm the order manually to launch the delivery." +msgstr "" + +#: ../../ecommerce/shopper_experience/wire_transfer.rst:35 +msgid "How to create other manual payment methods" +msgstr "" + +#: ../../ecommerce/shopper_experience/wire_transfer.rst:37 +msgid "" +"If you manage a B2B business, you can create other manually-processed " +"payment methods like paying by check. To do so, just rename *Wire Transfer* " +"or duplicate it." msgstr "" #: ../../ecommerce/taxes.rst:3 diff --git a/locale/es/LC_MESSAGES/general.po b/locale/es/LC_MESSAGES/general.po index 5aba72237..2572b1167 100644 --- a/locale/es/LC_MESSAGES/general.po +++ b/locale/es/LC_MESSAGES/general.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Odoo Business 9.0\n" +"Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-23 15:39+0100\n" +"POT-Creation-Date: 2017-05-09 14:24+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Sergio Flores , 2017\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" @@ -23,8 +23,8 @@ msgid "General" msgstr "General" #: ../../general/auth.rst:3 -msgid "Authentification" -msgstr "" +msgid "Authentication" +msgstr "Autentificación" #: ../../general/auth/google.rst:3 msgid "How to allow users to sign in with their Google account" @@ -84,64 +84,196 @@ msgid "" msgstr "" #: ../../general/base_import.rst:3 -msgid "BASE IMPORT" +msgid "Data Import" +msgstr "" + +#: ../../general/base_import/adapt_template.rst:3 +msgid "How to adapt an import template" +msgstr "" + +#: ../../general/base_import/adapt_template.rst:5 +msgid "" +"Import templates are provided in the import tool of the most common data to " +"import (contacts, products, bank statements, etc.). You can open them with " +"any spreadsheets software (Microsoft Office, OpenOffice, Google Drive, " +"etc.)." +msgstr "" + +#: ../../general/base_import/adapt_template.rst:11 +msgid "How to customize the file" +msgstr "" + +#: ../../general/base_import/adapt_template.rst:13 +msgid "" +"Remove columns you don't need. We advise to not remove the *ID* one (see why" +" here below)." +msgstr "" + +#: ../../general/base_import/adapt_template.rst:15 +#: ../../general/base_import/import_faq.rst:26 +msgid "" +"Set a unique ID to every single record by dragging down the ID sequencing." +msgstr "" + +#: ../../general/base_import/adapt_template.rst:20 +msgid "" +"When you add a new column, Odoo might not be able to map it automatically if" +" its label doesn't fit any field of the system. If so, find the " +"corresponding field using the search." +msgstr "" + +#: ../../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" +msgstr "" + +#: ../../general/base_import/adapt_template.rst:33 +msgid "" +"The **ID** (External ID) is an unique identifier for the line item. Feel " +"free to use the one of your previous software to ease the transition to " +"Odoo." +msgstr "" + +#: ../../general/base_import/adapt_template.rst:36 +msgid "" +"Setting an ID is not mandatory when importing but it helps in many cases:" +msgstr "" + +#: ../../general/base_import/adapt_template.rst:38 +msgid "" +"Update imports: you can import the same file several times without creating " +"duplicates;" +msgstr "" + +#: ../../general/base_import/adapt_template.rst:39 +msgid "Import relation fields (see here below)." +msgstr "" + +#: ../../general/base_import/adapt_template.rst:42 +msgid "How to import relation fields" +msgstr "" + +#: ../../general/base_import/adapt_template.rst:44 +msgid "" +"An Odoo object is always related to many other objects (e.g. a product is " +"linked to product categories, attributes, vendors, etc.). To import those " +"relations you need to import the records of the related object first from " +"their own list menu." +msgstr "" + +#: ../../general/base_import/adapt_template.rst:48 +msgid "" +"You can do it using either the name of the related record or its ID. The ID " +"is expected when two records have the same name. In such a case add \" / " +"ID\" at the end of the column title (e.g. for product attributes: Product " +"Attributes / Attribute / ID)." msgstr "" #: ../../general/base_import/import_faq.rst:3 -msgid "Import CSV file to Odoo" +msgid "How to import data into Odoo" msgstr "" -#: ../../general/base_import/import_faq.rst:8 -msgid "Frequently Asked Questions" -msgstr "Preguntas más frecuentes" +#: ../../general/base_import/import_faq.rst:6 +msgid "How to start" +msgstr "" -#: ../../general/base_import/import_faq.rst:12 -msgid "Need to import data from an other application?" -msgstr "¿Se necesita importar datos desde otra aplicación?" - -#: ../../general/base_import/import_faq.rst:14 +#: ../../general/base_import/import_faq.rst:7 msgid "" -"In order to re-create relationships between different records, you should " -"use the unique identifier from the original application and map it to the " -"**ID** (External ID) column in Odoo. When you import an other record that " -"links to the first one, use **XXX/ID** (XXX/External ID) to the original " -"unique identifier." +"You can import data on any Odoo's business object using either Excel (.xlsx)" +" or CSV (.csv) formats: contacts, products, bank statements, journal entries" +" and even orders!" +msgstr "" + +#: ../../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 "" -"The **ID** (External ID) will also be used to update the original import if " -"you need to re-import modified data later, it's thus good practice to " -"specify it whenever possible." +"There you are provided with templates you can easily populate with your own " +"data. Such templates can be imported in one click; The data mapping is " +"already done." msgstr "" -#: ../../general/base_import/import_faq.rst:21 -msgid "I cannot find the field I want to map my column to?" +#: ../../general/base_import/import_faq.rst:22 +msgid "How to adapt the template" msgstr "" -#: ../../general/base_import/import_faq.rst:23 -msgid "" -"Odoo try to find with some heuristic, based on the first ten lines of the " -"files, the type of field for each columns inside your file. For example if " -"you have a column only containing numbers, only the fields that are of type " -"integer will be displayed for you to choose from. While this behaviour might" -" be good and easy for most cases scenarios, it is also possible that it goes" -" wrong sometimes or that you want to map your column to a field that is not " -"proposed by default." +#: ../../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 "" -"If that happens, you just have to check the **Show all fields for completion" -" (advanced)** option, you will then be able to choose from the complete list" -" of fields for each columns." +msgid "We advise to not remove the **ID** one (see why in the next section)." msgstr "" -#: ../../general/base_import/import_faq.rst:30 +#: ../../general/base_import/import_faq.rst:31 +msgid "" +"When you add a new column, Odoo might not be able to map it automatically if" +" its label doesn't fit any field in Odoo. Don't worry! You can map new " +"columns manually when you test the import. Search the list for the " +"corresponding field." +msgstr "" + +#: ../../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 "" + +#: ../../general/base_import/import_faq.rst:46 +msgid "" +"In order to re-create relationships between different records, you should " +"use the unique identifier from the original application and map it to the " +"**ID** (External ID) column in Odoo. When you import another record that " +"links to the first one, use **XXX/ID** (XXX/External ID) to the original " +"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 "" + +#: ../../general/base_import/import_faq.rst:54 +msgid "" +"The **ID** will also be used to update the original import if you need to " +"re-import modified data later, it's thus good practice to specify it " +"whenever possible." +msgstr "" + +#: ../../general/base_import/import_faq.rst:60 +msgid "I cannot find the field I want to map my column to" +msgstr "" + +#: ../../general/base_import/import_faq.rst:62 +msgid "" +"Odoo tries to find with some heuristic, based on the first ten lines of the " +"files, the type of field for each column inside your file. For example if " +"you have a column only containing numbers, only the fields that are of type " +"*Integer* will be displayed for you to choose from. While this behavior " +"might be good and easy for most cases, it is also possible that it goes " +"wrong or that you want to map your column to a field that is not proposed by" +" default." +msgstr "" + +#: ../../general/base_import/import_faq.rst:71 +msgid "" +"If that happens, you just have to check the ** Show fields of relation " +"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 "" -#: ../../general/base_import/import_faq.rst:32 +#: ../../general/base_import/import_faq.rst:81 msgid "" "Odoo can automatically detect if a column is a date and it will try to guess" " the date format from a set of most used date format. While this process can" @@ -151,7 +283,7 @@ msgid "" " day and which one is the month in a date like '01-03-2016'." msgstr "" -#: ../../general/base_import/import_faq.rst:34 +#: ../../general/base_import/import_faq.rst:83 msgid "" "To view which date format Odoo has found from your file you can check the " "**Date Format** that is shown when clicking on **Options** under the file " @@ -159,7 +291,7 @@ msgid "" " the *ISO 8601* to define the format." msgstr "" -#: ../../general/base_import/import_faq.rst:37 +#: ../../general/base_import/import_faq.rst:86 msgid "" "If you are importing an excel (.xls, .xlsx) file, you can use date cells to " "store dates as the display of dates in excel is different from the way it is" @@ -167,11 +299,11 @@ msgid "" "whatever your locale date format is." msgstr "" -#: ../../general/base_import/import_faq.rst:42 +#: ../../general/base_import/import_faq.rst:91 msgid "Can I import numbers with currency sign (e.g.: $32.00)?" msgstr "" -#: ../../general/base_import/import_faq.rst:44 +#: ../../general/base_import/import_faq.rst:93 msgid "" "Yes, we fully support numbers with parenthesis to represent negative sign as" " well as numbers with currency sign attached to them. Odoo also " @@ -181,56 +313,56 @@ msgid "" "crash." msgstr "" -#: ../../general/base_import/import_faq.rst:46 +#: ../../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:48 +#: ../../general/base_import/import_faq.rst:97 msgid "32.000,00" msgstr "" -#: ../../general/base_import/import_faq.rst:49 +#: ../../general/base_import/import_faq.rst:98 msgid "32000,00" msgstr "" -#: ../../general/base_import/import_faq.rst:50 +#: ../../general/base_import/import_faq.rst:99 msgid "32,000.00" msgstr "" -#: ../../general/base_import/import_faq.rst:51 +#: ../../general/base_import/import_faq.rst:100 msgid "-32000.00" msgstr "" -#: ../../general/base_import/import_faq.rst:52 +#: ../../general/base_import/import_faq.rst:101 msgid "(32000.00)" msgstr "" -#: ../../general/base_import/import_faq.rst:53 +#: ../../general/base_import/import_faq.rst:102 msgid "$ 32.000,00" msgstr "" -#: ../../general/base_import/import_faq.rst:54 +#: ../../general/base_import/import_faq.rst:103 msgid "(32000.00 €)" msgstr "" -#: ../../general/base_import/import_faq.rst:56 +#: ../../general/base_import/import_faq.rst:105 msgid "Example that will not work:" msgstr "" -#: ../../general/base_import/import_faq.rst:58 +#: ../../general/base_import/import_faq.rst:107 msgid "ABC 32.000,00" msgstr "" -#: ../../general/base_import/import_faq.rst:59 +#: ../../general/base_import/import_faq.rst:108 msgid "$ (32.000,00)" msgstr "" -#: ../../general/base_import/import_faq.rst:64 +#: ../../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:66 +#: ../../general/base_import/import_faq.rst:115 msgid "" "By default the Import preview is set on commas as field separators and " "quotation marks as text delimiters. If your csv file does not have these " @@ -238,20 +370,20 @@ msgid "" " CSV file bar after you select your file)." msgstr "" -#: ../../general/base_import/import_faq.rst:68 +#: ../../general/base_import/import_faq.rst:117 msgid "" "Note that if your CSV file has a tabulation as separator, Odoo will not " "detect the separations. You will need to change the file format options in " "your spreadsheet application. See the following question." msgstr "" -#: ../../general/base_import/import_faq.rst:73 +#: ../../general/base_import/import_faq.rst:122 msgid "" "How can I change the CSV file format options when saving in my spreadsheet " "application?" msgstr "" -#: ../../general/base_import/import_faq.rst:75 +#: ../../general/base_import/import_faq.rst:124 msgid "" "If you edit and save CSV files in speadsheet applications, your computer's " "regional settings will be applied for the separator and delimiter. We " @@ -260,17 +392,17 @@ msgid "" "filter settings' > Save)." msgstr "" -#: ../../general/base_import/import_faq.rst:77 +#: ../../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 "" -#: ../../general/base_import/import_faq.rst:82 +#: ../../general/base_import/import_faq.rst:131 msgid "What's the difference between Database ID and External ID?" msgstr "" -#: ../../general/base_import/import_faq.rst:84 +#: ../../general/base_import/import_faq.rst:133 msgid "" "Some fields define a relationship with another object. For example, the " "country of a contact is a link to a record of the 'Country' object. When you" @@ -280,58 +412,58 @@ msgid "" "import." msgstr "" -#: ../../general/base_import/import_faq.rst:86 +#: ../../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 "" -#: ../../general/base_import/import_faq.rst:88 +#: ../../general/base_import/import_faq.rst:137 msgid "Country: the name or code of the country" msgstr "País: el nombre o código del país" -#: ../../general/base_import/import_faq.rst:89 +#: ../../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 "" -#: ../../general/base_import/import_faq.rst:90 +#: ../../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 "" -#: ../../general/base_import/import_faq.rst:92 +#: ../../general/base_import/import_faq.rst:141 msgid "For the country Belgium, you can use one of these 3 ways to import:" msgstr "" -#: ../../general/base_import/import_faq.rst:94 +#: ../../general/base_import/import_faq.rst:143 msgid "Country: Belgium" msgstr "País: Bélgica" -#: ../../general/base_import/import_faq.rst:95 +#: ../../general/base_import/import_faq.rst:144 msgid "Country/Database ID: 21" msgstr "" -#: ../../general/base_import/import_faq.rst:96 +#: ../../general/base_import/import_faq.rst:145 msgid "Country/External ID: base.be" msgstr "País/Id. externo: base.be" -#: ../../general/base_import/import_faq.rst:98 +#: ../../general/base_import/import_faq.rst:147 msgid "" "According to your need, you should use one of these 3 ways to reference " "records in relations. Here is when you should use one or the other, " "according to your need:" msgstr "" -#: ../../general/base_import/import_faq.rst:100 +#: ../../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 "" -#: ../../general/base_import/import_faq.rst:101 +#: ../../general/base_import/import_faq.rst:150 msgid "" "Use Country/Database ID: You should rarely use this notation. It's mostly " "used by developers as it's main advantage is to never have conflicts (you " @@ -339,13 +471,13 @@ msgid "" "Database ID)" msgstr "" -#: ../../general/base_import/import_faq.rst:102 +#: ../../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 "" -#: ../../general/base_import/import_faq.rst:104 +#: ../../general/base_import/import_faq.rst:153 msgid "" "When you use External IDs, you can import CSV files with the \"External ID\"" " column to define the External ID of each record you import. Then, you will " @@ -354,23 +486,23 @@ msgid "" "Products and their Categories." msgstr "" -#: ../../general/base_import/import_faq.rst:106 +#: ../../general/base_import/import_faq.rst:155 msgid "" "`CSV file for categories " "<../../_static/example_files/External_id_3rd_party_application_product_categories.csv>`_." msgstr "" -#: ../../general/base_import/import_faq.rst:108 +#: ../../general/base_import/import_faq.rst:157 msgid "" "`CSV file for Products " "<../../_static/example_files/External_id_3rd_party_application_products.csv>`_." msgstr "" -#: ../../general/base_import/import_faq.rst:112 +#: ../../general/base_import/import_faq.rst:161 msgid "What can I do if I have multiple matches for a field?" msgstr "¿Qué puedo hacer si tengo múltiples coincidencias para un campo?" -#: ../../general/base_import/import_faq.rst:114 +#: ../../general/base_import/import_faq.rst:163 msgid "" "If for example you have two product categories with the child name " "\"Sellable\" (ie. \"Misc. Products/Sellable\" & \"Other " @@ -381,20 +513,20 @@ msgid "" "the duplicates' values or your product category hierarchy." msgstr "" -#: ../../general/base_import/import_faq.rst:116 +#: ../../general/base_import/import_faq.rst:165 msgid "" "However if you do not wish to change your configuration of product " "categories, we recommend you use make use of the external ID for this field " "'Category'." msgstr "" -#: ../../general/base_import/import_faq.rst:121 +#: ../../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 "" -#: ../../general/base_import/import_faq.rst:123 +#: ../../general/base_import/import_faq.rst:172 msgid "" "The tags should be separated by a comma without any spacing. For example, if" " you want your customer to be linked to both tags 'Manufacturer' and " @@ -402,19 +534,19 @@ msgid "" " of your CSV file." msgstr "" -#: ../../general/base_import/import_faq.rst:125 +#: ../../general/base_import/import_faq.rst:174 msgid "" "`CSV file for Manufacturer, Retailer " "<../../_static/example_files/m2m_customers_tags.csv>`_." msgstr "" -#: ../../general/base_import/import_faq.rst:130 +#: ../../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 "" -#: ../../general/base_import/import_faq.rst:132 +#: ../../general/base_import/import_faq.rst:181 msgid "" "If you want to import sales order having several order lines; for each order" " line, you need to reserve a specific row in the CSV file. The first order " @@ -425,41 +557,41 @@ msgid "" "you can import, based on demo data." msgstr "" -#: ../../general/base_import/import_faq.rst:135 +#: ../../general/base_import/import_faq.rst:184 msgid "" "`File for some Quotations " "<../../_static/example_files/purchase.order_functional_error_line_cant_adpat.csv>`_." msgstr "" -#: ../../general/base_import/import_faq.rst:137 +#: ../../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 "" -#: ../../general/base_import/import_faq.rst:139 +#: ../../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 "" -#: ../../general/base_import/import_faq.rst:141 +#: ../../general/base_import/import_faq.rst:190 msgid "" "The following CSV file shows how to import customers and their respective " "contacts:" msgstr "" -#: ../../general/base_import/import_faq.rst:143 +#: ../../general/base_import/import_faq.rst:192 msgid "" "`Customers and their respective contacts " "<../../_static/example_files/o2m_customers_contacts.csv>`_." msgstr "" -#: ../../general/base_import/import_faq.rst:148 +#: ../../general/base_import/import_faq.rst:197 msgid "Can I import several times the same record?" msgstr "¿Se puede importar varias veces el mismo registro?" -#: ../../general/base_import/import_faq.rst:150 +#: ../../general/base_import/import_faq.rst:199 msgid "" "If you import a file that contains one of the column \"External ID\" or " "\"Database ID\", records that have already been imported will be modified " @@ -469,17 +601,17 @@ msgid "" "depending if it's new or not." msgstr "" -#: ../../general/base_import/import_faq.rst:152 +#: ../../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 "" -#: ../../general/base_import/import_faq.rst:157 +#: ../../general/base_import/import_faq.rst:206 msgid "What happens if I do not provide a value for a specific field?" msgstr "" -#: ../../general/base_import/import_faq.rst:159 +#: ../../general/base_import/import_faq.rst:208 msgid "" "If you do not set all fields in your CSV file, Odoo will assign the default " "value for every non defined fields. But if you set fields with empty values " @@ -487,11 +619,11 @@ msgid "" "assigning the default value." msgstr "" -#: ../../general/base_import/import_faq.rst:164 +#: ../../general/base_import/import_faq.rst:213 msgid "How to export/import different tables from an SQL application to Odoo?" msgstr "" -#: ../../general/base_import/import_faq.rst:166 +#: ../../general/base_import/import_faq.rst:215 msgid "" "If you need to import data from different tables, you will have to recreate " "relations between records belonging to different tables. (e.g. if you import" @@ -499,7 +631,7 @@ msgid "" "person and the company they work for)." msgstr "" -#: ../../general/base_import/import_faq.rst:168 +#: ../../general/base_import/import_faq.rst:217 msgid "" "To manage relations between tables, you can use the \"External ID\" " "facilities of Odoo. The \"External ID\" of a record is the unique identifier" @@ -509,7 +641,7 @@ msgid "" "'company_1', 'person_1' instead of '1')" msgstr "" -#: ../../general/base_import/import_faq.rst:170 +#: ../../general/base_import/import_faq.rst:219 msgid "" "As an example, suppose you have a SQL database with two tables you want to " "import: companies and persons. Each person belong to one company, so you " @@ -519,27 +651,27 @@ msgid "" "PostgreSQL database)" msgstr "" -#: ../../general/base_import/import_faq.rst:172 +#: ../../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 "" -#: ../../general/base_import/import_faq.rst:178 +#: ../../general/base_import/import_faq.rst:227 msgid "This SQL command will create the following CSV file::" msgstr "" -#: ../../general/base_import/import_faq.rst:185 +#: ../../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 "" -#: ../../general/base_import/import_faq.rst:191 +#: ../../general/base_import/import_faq.rst:240 msgid "It will produce the following CSV file::" msgstr "" -#: ../../general/base_import/import_faq.rst:199 +#: ../../general/base_import/import_faq.rst:248 msgid "" "As you can see in this file, Fabien and Laurence are working for the Bigees " "company (company_1) and Eric is working for the Organi company. The relation" @@ -549,7 +681,7 @@ msgid "" " who shared the same ID 1 in the orignial database)." msgstr "" -#: ../../general/base_import/import_faq.rst:201 +#: ../../general/base_import/import_faq.rst:250 msgid "" "The two files produced are ready to be imported in Odoo without any " "modifications. After having imported these two CSV files, you will have 4 " diff --git a/locale/es/LC_MESSAGES/inventory.po b/locale/es/LC_MESSAGES/inventory.po index d669fc034..845d85856 100644 --- a/locale/es/LC_MESSAGES/inventory.po +++ b/locale/es/LC_MESSAGES/inventory.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-04-20 15:45+0200\n" +"POT-Creation-Date: 2017-05-09 14:24+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Julián Andrés Osorio López , 2017\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" @@ -920,6 +920,10 @@ msgstr "" "Crear ** para establecer los valores de las existencias mínimas y máximas " "para un producto determinado." +#: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0 +msgid "Active" +msgstr "" + #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0 msgid "" "If the active field is set to False, it will allow you to hide the " @@ -928,11 +932,19 @@ msgstr "" "Si el campo activo se desmarca, 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" +msgstr "" + #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0 msgid "Default Unit of Measure used for all stock operation." msgstr "" "Unidad de medida por defecto utilizada para todas las operaciones de stock." +#: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0 +msgid "Procurement Group" +msgstr "" + #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0 msgid "" "Moves created through this orderpoint will be put in this procurement group." @@ -944,6 +956,10 @@ msgstr "" "movimientos generados por las reglas de abastecimiento serán agrupados en un" " gran albarán." +#: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0 +msgid "Minimum Quantity" +msgstr "" + #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0 msgid "" "When the virtual stock goes below the Min Quantity specified for this field," @@ -954,6 +970,10 @@ msgstr "" "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" +msgstr "" + #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0 msgid "" "When the virtual stock goes below the Min Quantity, Odoo generates a " @@ -964,6 +984,10 @@ msgstr "" "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" +msgstr "" + #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0 msgid "" "The procurement quantity will be rounded up to this multiple. If it is 0, " @@ -972,6 +996,10 @@ msgstr "" "La cantidad a abastecer se redondeará a este múltiplo. Si es 0, se utilizará" " la cantidad exacta." +#: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0 +msgid "Lead Time" +msgstr "" + #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0 msgid "" "Number of days after the orderpoint is triggered to receive the products or " diff --git a/locale/es/LC_MESSAGES/point_of_sale.po b/locale/es/LC_MESSAGES/point_of_sale.po index 46d442e6f..36052f345 100644 --- a/locale/es/LC_MESSAGES/point_of_sale.po +++ b/locale/es/LC_MESSAGES/point_of_sale.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-04-20 15:45+0200\n" +"POT-Creation-Date: 2017-05-09 14:24+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Mateo Tibaquirá Palacios , 2017\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" @@ -2413,18 +2413,34 @@ msgstr "" "Puede configurar cada punto de venta de acuerdo a su sistema operativo, " "ubicación,..." +#: ../../point_of_sale/overview/start.rst:0 +msgid "Point of Sale Name" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "An internal identification of the point of sale" msgstr "Identificación interna del TPV" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Sales Journal" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "Accounting journal used to post sales entries." msgstr "Diario contable usado para contabilizar los asientos." +#: ../../point_of_sale/overview/start.rst:0 +msgid "Invoice Journal" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "Accounting journal used to create invoices." msgstr "Diario contable utilizado para crear facturas." +#: ../../point_of_sale/overview/start.rst:0 +msgid "Group Journal Items" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "" "Check this if you want to group the Journal Items by Product while closing a" @@ -2433,6 +2449,10 @@ msgstr "" "Marque esta casilla si quiere agrupar los apuntes contable por producto en " "el cierre de sesión." +#: ../../point_of_sale/overview/start.rst:0 +msgid "Barcodes" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "" "Defines what kind of barcodes are available and how they are assigned to " @@ -2441,6 +2461,10 @@ msgstr "" "Define que tipo de códigos de barra están disponibles y como se asignan a " "productos, clientes y cajeros" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Order IDs Sequence" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "" "This sequence is automatically created by Odoo but you can change it to " @@ -2449,18 +2473,34 @@ msgstr "" "La secuencia es creada automáticamente por Odoo, pero puede cambiarla para " "personalizar los números de referencia de sus pedidos." +#: ../../point_of_sale/overview/start.rst:0 +msgid "Sales Channel" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "This Point of sale's sales will be related to this Sales Channel." msgstr "" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Virtual KeyBoard" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "Enables an integrated Virtual Keyboard" msgstr "Habilitar un teclado virtual integrado" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Invoicing" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "Enables invoice generation from the Point of Sale" msgstr "Habilitar generación de facturas desde el TPV" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Prefill Cash Payment" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "" "The payment input will behave similarily to bank payment input, and will be " @@ -2469,6 +2509,10 @@ msgstr "" "La entrada de pago se comportará similarmente a la entrada de pago bancario " ", y se auto rellenará con la cantidad exacta debido" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Start Category" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "" "The point of sale will display this product category by default. If no " @@ -2477,6 +2521,10 @@ msgstr "" "El punto de venta mostrará esta categoría de productos por defecto. Si no se" " especifica una categoría, todos los productos disponibles se mostrarán" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Tip Product" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "" "The product used to encode the customer tip. Leave empty if you do not " @@ -2485,6 +2533,10 @@ msgstr "" "El producto utilizado para codificar la propina del cliente. Dejar en blanco" " si usted no acepta propina ." +#: ../../point_of_sale/overview/start.rst:0 +msgid "Include Taxes in Prices" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "" "The displayed prices will always include all taxes, even if the taxes have " @@ -2493,16 +2545,28 @@ msgstr "" "Los precios mostrados no siempre incluyen todos los impuestos , incluso si " "los impuestos se han configurado de forma diferente" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Large Scrollbars" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "For imprecise industrial touchscreens" msgstr "Para pantallas táctiles industriales imprecisas" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Display Category Pictures" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "The product categories will be displayed with pictures." msgstr "" "El punto de venta mostrará esta categoría de Productos por Defecto . Si no " "se ESPECIFICA Una categoría , Todos los Productos Disponibles se mostrarán" +#: ../../point_of_sale/overview/start.rst:0 +msgid "IP Address" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "" "The hostname or ip address of the hardware proxy, Will be autodetected if " @@ -2511,27 +2575,51 @@ msgstr "" "El nombre de equipo o la dirección IP del proxy hardware. Será autodetectado" " si se deja vacío" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Barcode Scanner" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "Enable barcode scanning with a remotely connected barcode scanner" msgstr "" "Habilitar escaneado de código de barras con un escáner remoto conectado" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Electronic Scale" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "Enables Electronic Scale integration" msgstr "Habilitar integración de una balanza electrónica" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Cashdrawer" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "Automatically open the cashdrawer" msgstr "Abrir automáticamente el cajón de monedas" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Receipt Printer" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "Bypass browser printing and prints via the hardware proxy" msgstr "Saltar impresión del navegador e imprimir vía el proxy hardware" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Automatic Receipt Printing" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "The receipt will automatically be printed at the end of each order" msgstr "El recibo se imprimirá automáticamente al final de cada orden" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Skip Receipt Screen" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "" "The receipt screen will be skipped if the receipt can be printed " @@ -2540,30 +2628,58 @@ msgstr "" "Se omitirá la pantalla de recibo si el recibo se puede imprimir de forma " "automática." +#: ../../point_of_sale/overview/start.rst:0 +msgid "Header" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "A short text that will be inserted as a header in the printed receipt" msgstr "Un texto corto que se insertará como cabecera en el recibo impreso" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Footer" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "A short text that will be inserted as a footer in the printed receipt" msgstr "Un texto corto que se insertará como pie en el recibo impreso" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Cash Control" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "Check the amount of the cashbox at opening and closing." msgstr "Revisar la cantidad en caja al inicio y al cierre." +#: ../../point_of_sale/overview/start.rst:0 +msgid "Bill Splitting" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "Enables Bill Splitting in the Point of Sale" msgstr "Habilita la separación de cuentas en el TPV" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Bill Printing" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "Allows to print the Bill before payment" msgstr "Permitir imprimir la cuenta antes del pago" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Orderline Notes" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "Allow custom notes on Orderlines" msgstr "Permite notas en las líneas de pedido" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Restaurant Floors" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "The restaurant floors served by this point of sale" msgstr "Los pisos del restaurante atendidos en este punto de venta" @@ -3476,11 +3592,19 @@ msgstr "" "Puede estar hecho para todos los productos o para cada uno en específico. " "Haga clic en **Agregar elemento**." +#: ../../point_of_sale/shop/seasonal_discount.rst:0 +msgid "Active" +msgstr "" + #: ../../point_of_sale/shop/seasonal_discount.rst:0 msgid "" "If unchecked, it will allow you to hide the pricelist without removing it." msgstr "Si no está marcado, la tarifa podrá ocultarse sin eliminarla." +#: ../../point_of_sale/shop/seasonal_discount.rst:0 +msgid "Selectable" +msgstr "" + #: ../../point_of_sale/shop/seasonal_discount.rst:0 msgid "Allow the end user to choose this price list" msgstr "Permitirle al usuario escoger esta lista de precios" diff --git a/locale/es/LC_MESSAGES/purchase.po b/locale/es/LC_MESSAGES/purchase.po index 5fcab8438..564e51623 100644 --- a/locale/es/LC_MESSAGES/purchase.po +++ b/locale/es/LC_MESSAGES/purchase.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-04-20 15:45+0200\n" +"POT-Creation-Date: 2017-05-09 14:24+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Miguel Orueta , 2017\n" +"Last-Translator: Alejandro Die Sanchis , 2017\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" @@ -2111,10 +2111,18 @@ 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 " @@ -2126,6 +2134,10 @@ msgstr "" "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 " @@ -2134,16 +2146,28 @@ msgstr "" "Representa la fecha en que el presupuesto debe ser validado 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 or an internal procurement request)" msgstr "" +#: ../../purchase/purchases/rfq/create.rst:0 +msgid "Deliver To" +msgstr "Entregar a" + #: ../../purchase/purchases/rfq/create.rst:0 msgid "This will determine picking type of incoming shipment" msgstr "Esto determinará el tipo de albarán de la recepción" +#: ../../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 " @@ -2152,10 +2176,18 @@ 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 " diff --git a/locale/es/LC_MESSAGES/sales.po b/locale/es/LC_MESSAGES/sales.po index bf335030a..d278a9cef 100644 --- a/locale/es/LC_MESSAGES/sales.po +++ b/locale/es/LC_MESSAGES/sales.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Odoo Business 9.0\n" +"Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-23 15:39+0100\n" +"POT-Creation-Date: 2017-05-09 14:24+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: José Vicente , 2017\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" @@ -937,16 +937,11 @@ msgstr "" #: ../../sales/invoicing/services/support.rst:66 msgid "" -"There are different ways to track the service related to a sale order or " +"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 "" -"Hay diferentes maneras de seguir el servicio relacionado con una orden de " -"venta o producto vendido. Con la configuración anterior, sólo se puede " -"vender un contrato de soporte por pedido. Si sus pedidos de clientes de " -"varios contratos de servicios en parte de horas, que tendrá que dividir el " -"presupuesto en varios órdenes." #: ../../sales/invoicing/services/support.rst:72 msgid "" @@ -966,21 +961,16 @@ msgid "Managing support contract" msgstr "La gestión de contrato de soporte" #: ../../sales/invoicing/services/support.rst:81 -msgid "Quotations and Sale Orders" -msgstr "Órdenes de Citas y Ventas" +msgid "Quotations and Sales Orders" +msgstr "Presupuestos y pedidos de venta" #: ../../sales/invoicing/services/support.rst:83 msgid "" -"Once the product is created, you can create a quotation or a sale order with" -" the related product. Once the quotation is confirmed and transformed into a" -" sale order, your users will be able to record services related to this " -"support contract using the timesheet application." +"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 "" -"Una vez que el productos es creado, usted puede crear una cotización o una " -"orden de venta con el producto relacionado. Una vez que la cotización está " -"confirmada y se transformó en una orden de venta, los usuarios podrán grabar" -" los servicios relacionados con el contrato de soporte utilizando la " -"aplicación de la hoja de horas." #: ../../sales/invoicing/services/support.rst:93 msgid "Timesheets" @@ -1001,8 +991,8 @@ msgstr "" "vendido." #: ../../sales/invoicing/services/support.rst:104 -msgid "Control delivered support on the sale order" -msgstr "Control de entrega de apoyo en la orden de venta" +msgid "Control delivered support on the sales order" +msgstr "" #: ../../sales/invoicing/services/support.rst:106 msgid "" @@ -1025,30 +1015,14 @@ msgstr "Sobreventa y renovación" #: ../../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, the sale order " -"**Invoicing Status** is automatically set to **Upselling**. This means you " -"have an opportunity to sell an extra contract to the customer since he used " -"all his quota of service." +"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`." msgstr "" -"Si el número de horas que trabajó sobre el contrato de soporte es mayor o " -"igual que el número de horas que el cliente compró, la orden de venta de " -"**Estado de Facturación** se ajusta automáticamente a **Vendiendo**. Esto " -"significa que usted tiene la oportunidad de vender un contrato adicional " -"para el cliente ya que él usó toda su cuota de servicio." -#: ../../sales/invoicing/services/support.rst:124 -msgid "" -"Periodically (ideally once every two weeks), you should check the sales " -"order that are in an upselling status. To do this, go to the " -":menuselection:`Sales --> Sales Order` menu and use the **Upselling** filter" -" to get all orders that are in upselling." -msgstr "" -"Periódicamente (idealmente una vez cada dos semanas), usted debe comprobar " -"la orden de venta que se encuentran en un estado de vendiendo. Para ello, " -"vaya a :menuselection:`Ventas --> Orden de Venta` y usar el filtro de " -"**Vendiendo** para obtener todos los pedidos que están en vendidos." - -#: ../../sales/invoicing/services/support.rst:130 +#: ../../sales/invoicing/services/support.rst:127 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 " @@ -1058,26 +1032,20 @@ msgstr "" "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:134 +#: ../../sales/invoicing/services/support.rst:131 msgid "" "If you sell an extra support contract, you can either add a new line on the " -"existing sale order (thus, you continue to timesheet on the same order) or " +"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 sale order as **Upselling**, you can set the sale " -"order as done and it will disappear from your upselling list." +"contract). To unmark the sales order as **Upselling**, you can set the sales" +" order as done and it will disappear from your upselling list." msgstr "" -"Si usted vende un contrato de soporte adicional, puede añadir una nueva " -"línea en la orden de venta existente (por lo tanto, continúa de parte de " -"horas en el mismo orden) o crea una nueva orden (por lo tanto, la gente verá" -" su hoja de horas en el nuevo contrato). Para desmarcar la orden de venta " -"como **Vendiendo**, puede establecer la orden de la venta como hecho y va a " -"desaparecer de su lista de vendiendo." -#: ../../sales/invoicing/services/support.rst:141 +#: ../../sales/invoicing/services/support.rst:138 msgid "Special Configuration" msgstr "Configuración Especial" -#: ../../sales/invoicing/services/support.rst:143 +#: ../../sales/invoicing/services/support.rst:140 msgid "" "When creating the product form, you may set a different approach to track " "the service:" @@ -1085,33 +1053,23 @@ msgstr "" "Al crear la forma del producto, es posible establecer un enfoque diferente " "para realizar el seguimiento del servicio:" -#: ../../sales/invoicing/services/support.rst:146 +#: ../../sales/invoicing/services/support.rst:143 msgid "" "**Create task and track hours**: in this mode, a task is created for every " -"sale order line. Then when you do the timesheet, you don't record hours on a" -" sale order/contract, but you record hours on a task (that represents the " +"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 sale order." +"service contracts within the same sales order." msgstr "" -"**Crear tareas y seguimiento de horas**: en este modo, se crea una tarea " -"para cada línea de la orden de venta. Entonces, cuando usted hace la hoja de" -" tiempos, no grabar las horas en una orden de venta/contrato, pero ustedes " -"registrarán las horas en una tarea (que representa el contrato). La ventaja " -"de esta solución es que permite vender varios contratos de servicio dentro " -"de la misma orden de venta." -#: ../../sales/invoicing/services/support.rst:153 +#: ../../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 sale order line directly, in the delivered quantity field." +"manually on the sales order line directly, in the delivered quantity field." msgstr "" -"**Manualmente**: usted puede utilizar este modo si no desea registrar las " -"hojas de horas en Odoo. El número de horas de Odoo trabajado está " -"especificado en el contrato y puede ser registrado manualmente en la orden " -"de venta en una línea directamente, en el campo de la cantidad entregada." -#: ../../sales/invoicing/services/support.rst:159 +#: ../../sales/invoicing/services/support.rst:156 msgid ":doc:`../../../inventory/settings/products/uom`" msgstr ":doc:`../../../inventory/settings/products/uom`" @@ -1382,15 +1340,11 @@ msgstr ":menuselection:`Orden de Comercio electrónico --> Factura`" #: ../../sales/overview/main_concepts/invoicing.rst:69 msgid "" -"An eCommerce order will also trigger the creation of the order when it is " +"An eCommerce order will also trigger the creation of the invoice when it is " "fully paid. If you allow paying orders by check or wire transfer, Odoo only " "creates an order and the invoice will be triggered once the payment is " "received." msgstr "" -"Una orden de comercio electrónico también se activará la creación de la " -"orden cuando está totalmente pagada. Si usted permite que el pago de pedidos" -" por cheque o transferencia bancaria, Odoo sólo creará un pedido y la " -"factura se activará una vez que se recibe el pago." #: ../../sales/overview/main_concepts/invoicing.rst:75 msgid "Creating an invoice manually" @@ -1709,140 +1663,76 @@ msgid "Manage your products" msgstr "" #: ../../sales/products_prices/products/import.rst:3 -msgid "How to import my products" +msgid "How to import products with categories and variants" msgstr "" -#: ../../sales/products_prices/products/import.rst:6 -msgid "How to start" -msgstr "" - -#: ../../sales/products_prices/products/import.rst:8 -msgid "Download the following import templates:" -msgstr "" - -#: ../../sales/products_prices/products/import.rst:10 +#: ../../sales/products_prices/products/import.rst:5 msgid "" -"Partners: customers, vendors (no relation field, can be imported as is)" +"Import templates are provided in the import tool of the most common data to " +"import (contacts, products, bank statements, etc.). You can open them with " +"any spreadsheets software (Microsoft Office, OpenOffice, Google Drive, " +"etc.)." msgstr "" #: ../../sales/products_prices/products/import.rst:11 -msgid "Products (no relation field, can be imported as is)" -msgstr "" - -#: ../../sales/products_prices/products/import.rst:12 -msgid "Product Website Categories" +msgid "How to customize the file" msgstr "" #: ../../sales/products_prices/products/import.rst:13 -msgid "Product Attributes & Values" +msgid "" +"Remove columns you don't need. We advise to not remove the *ID* one (see why" +" here below)." msgstr "" -#: ../../sales/products_prices/products/import.rst:14 -msgid "Products with Categories & Attributes (3 & 4 must be imported first)" +#: ../../sales/products_prices/products/import.rst:15 +msgid "" +"Set a unique ID to every single record by dragging down the ID sequencing." msgstr "" #: ../../sales/products_prices/products/import.rst:16 msgid "" -"Download link: " -"https://drive.google.com/drive/folders/0B1uIL9E_zXrrTEp5eGI2dXJSUjg?usp=sharing" +"Don't change labels of columns you want to import. Otherwise Odoo won't " +"recognize them anymore and you will have to map them on your own in the " +"import screen." msgstr "" #: ../../sales/products_prices/products/import.rst:18 msgid "" -"You can open them with any spreadsheets software (Microsoft Office, " -"OpenOffice, Google Drive, etc.)." +"To add new columns,Feel free to add new columns but the fields need to exist" +" in Odoo. If Odoo fails in matching the column name with a field, you can " +"make it manually when importing by browsing a list of available fields." msgstr "" -#: ../../sales/products_prices/products/import.rst:21 -msgid "How to customize the file" -msgstr "" - -#: ../../sales/products_prices/products/import.rst:23 -msgid "" -"Remove columns you don't need. Don't remove the first one (called *ID*, see " -"why here below)." -msgstr "" - -#: ../../sales/products_prices/products/import.rst:25 -msgid "" -"Don't change labels of columns you want to import. Otherwse Odoo won't match" -" the columns automatically." -msgstr "" - -#: ../../sales/products_prices/products/import.rst:27 -msgid "" -"Feel free to add new columns but the fields need to exist in Odoo. If Odoo " -"fails in matching the column name with a field, you can make it manually " -"when importing by browsing a list of available fields." -msgstr "" - -#: ../../sales/products_prices/products/import.rst:30 -msgid "Once modified, keep your file in .csv format." -msgstr "" - -#: ../../sales/products_prices/products/import.rst:33 -msgid "How to import the file" -msgstr "" - -#: ../../sales/products_prices/products/import.rst:35 -msgid "Go to the Products menu in Sales, Purchase, Website Admin, etc." -msgstr "" - -#: ../../sales/products_prices/products/import.rst:36 -msgid "Switch to list view (top-right corner)." -msgstr "" - -#: ../../sales/products_prices/products/import.rst:37 -msgid "Click the *Import* button (top-left corner)." -msgstr "" - -#: ../../sales/products_prices/products/import.rst:38 -msgid "" -"Make sure all the columns match an existing field. If not select it manually" -" from the drop-down list." -msgstr "" - -#: ../../sales/products_prices/products/import.rst:40 -msgid "Press * Validate* to test the import." -msgstr "" - -#: ../../sales/products_prices/products/import.rst:41 -msgid "" -"If you get \"Everything seems valid.\" as result message, press *Import* to " -"process the real import. Otherwise correct the issues spotted during the " -"test." -msgstr "" - -#: ../../sales/products_prices/products/import.rst:45 +#: ../../sales/products_prices/products/import.rst:24 msgid "Why an “ID” column" msgstr "" -#: ../../sales/products_prices/products/import.rst:47 +#: ../../sales/products_prices/products/import.rst:26 msgid "" "The ID is an unique identifier for the line item. Feel free to use the one " "of your previous software to ease the transition to Odoo." msgstr "" -#: ../../sales/products_prices/products/import.rst:50 +#: ../../sales/products_prices/products/import.rst:29 msgid "" "Setting an ID is not mandatory when importing but it helps in many cases:" msgstr "" -#: ../../sales/products_prices/products/import.rst:52 +#: ../../sales/products_prices/products/import.rst:31 msgid "" "Update imports: you can import the same file several times without creating " "duplicates;" msgstr "" -#: ../../sales/products_prices/products/import.rst:53 +#: ../../sales/products_prices/products/import.rst:32 msgid "Import relation fields (see here below)." msgstr "" -#: ../../sales/products_prices/products/import.rst:56 +#: ../../sales/products_prices/products/import.rst:35 msgid "How to import relation fields" msgstr "" -#: ../../sales/products_prices/products/import.rst:58 +#: ../../sales/products_prices/products/import.rst:37 msgid "" "An Odoo object is always related to many other objects (e.g. a product is " "linked to product categories, attributes, vendors, etc.). To import those " @@ -1850,7 +1740,7 @@ msgid "" "their own list menu." msgstr "" -#: ../../sales/products_prices/products/import.rst:62 +#: ../../sales/products_prices/products/import.rst:41 msgid "" "You can do it using either the name of the related record or its ID. The ID " "is expected when two records have the same name. In such a case add \" / " diff --git a/locale/es/LC_MESSAGES/website.po b/locale/es/LC_MESSAGES/website.po index eab98b91d..6d711b443 100644 --- a/locale/es/LC_MESSAGES/website.po +++ b/locale/es/LC_MESSAGES/website.po @@ -10,7 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-04-20 15:45+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: RGB Consulting , 2017\n" +"Last-Translator: Luis M. Ontalba , 2017\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" @@ -1499,7 +1499,7 @@ msgstr "" #: ../../website/publish/domain_name.rst:15 msgid "Simple and obvious" -msgstr "" +msgstr "Simple y obvio" #: ../../website/publish/domain_name.rst:16 msgid "Easy to remember and spell" @@ -1507,7 +1507,7 @@ msgstr "Fácilmente de recordar y pronunciar" #: ../../website/publish/domain_name.rst:17 msgid "The shorter the better" -msgstr "" +msgstr "Cuanto más corto mejor" #: ../../website/publish/domain_name.rst:18 msgid "Avoid special characters" diff --git a/locale/fr/LC_MESSAGES/accounting.po b/locale/fr/LC_MESSAGES/accounting.po index 58b805433..06532e458 100644 --- a/locale/fr/LC_MESSAGES/accounting.po +++ b/locale/fr/LC_MESSAGES/accounting.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-04-20 15:45+0200\n" +"POT-Creation-Date: 2017-05-09 14:24+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Cyrille de Lambert , 2017\n" "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n" @@ -99,7 +99,6 @@ msgstr "" #: ../../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/paypal.rst:23 #: ../../accounting/receivables/getting_paid/automated_followups.rst:31 msgid "Configuration" msgstr "Configuration" @@ -1049,7 +1048,6 @@ msgstr "" #: ../../accounting/bank/misc/batch.rst:124 #: ../../accounting/payables/pay/sepa.rst:113 -#: ../../accounting/receivables/customer_payments/paypal.rst:134 msgid "Troubleshooting" msgstr "Dépannage" @@ -1963,6 +1961,11 @@ msgstr "" "Dans l'onglet Pièces Comptables, les comptes de débit et de crédit par " "défaut peuvent être configurés, de même que la devise du journal" +#: ../../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 "" @@ -1981,14 +1984,26 @@ msgstr "" msgid "Select 'General' for miscellaneous operations journals." msgstr "" +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Company" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "Company related to this journal" msgstr "Société associée à ce journal" +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Short Code" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "The journal entries of this journal will be named using this prefix." msgstr "Les pièces comptables de ce journal seront nommées avec ce préfixe." +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Dedicated Refund Sequence" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "" "Check this box if you don't want to share the same sequence for invoices and" @@ -1997,6 +2012,10 @@ msgstr "" "Cochez cette case si vous ne souhaitez pas partager une même numérotation " "pour les factures et avoirs de ce journal" +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Entry Sequence" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "" "This field contains the information related to the numbering of the journal " @@ -2005,6 +2024,10 @@ msgstr "" "Cet champ contient les informations relatives à la numérotation des " "écritures de ce journal." +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Refund Entry Sequence" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "" "This field contains the information related to the numbering of the refund " @@ -2013,18 +2036,34 @@ msgstr "" "Ce champ contient les informations relatives à la numérotation des entrées " "d'avoir de ce journal." +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Default Debit Account" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "It acts as a default account for debit amount" msgstr "Ça sert de compte par défaut pour les montants en débit" +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Default Credit Account" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "It acts as a default account for credit amount" msgstr "Sert de compte par défaut pour le crédit" +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Currency" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "The currency used to enter statement" msgstr "La devise utilisée pour entrer les relevés" +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Debit Methods" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "" "Means of payment for collecting money. Odoo modules offer various payments " @@ -2036,6 +2075,10 @@ msgstr "" "la méthode de paiement \"Manuelle\" afin de pouvoir gérer les paiements en " "dehors du logiciel. " +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Payment Methods" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "" "Means of payment for sending money. Odoo modules offer various payments " @@ -2047,6 +2090,10 @@ msgstr "" "la méthode de paiement \"Manuelle\" afin de pouvoir gérer les paiements en " "dehors du logiciel. " +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Group Invoice Lines" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "" "If this box is checked, the system will try to group the accounting lines " @@ -2055,6 +2102,10 @@ msgstr "" "Si cette case est cochée, le système essaiera de grouper les lignes " "comptables lorsqu'il les créera à partir des factures." +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Profit Account" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "" "Used to register a profit when the ending balance of a cash register differs" @@ -2063,6 +2114,10 @@ msgstr "" "Utilisé pour enregistrer un profit lorsque le solde final de la caisse est " "différent de ce qui a été calculé par le système" +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Loss Account" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "" "Used to register a loss when the ending balance of a cash register differs " @@ -2071,10 +2126,18 @@ msgstr "" "Utilisé pour enregistrer une perte lorsque le solde final de la caisse est " "différent de ce qui a été calculé par le système" +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Show journal on dashboard" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "Whether this journal should be displayed on the dashboard or not" msgstr "Si ce journal doit être affiché sur le tableau de bord ou non." +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Check Printing Payment Method Selected" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "" "Technical feature used to know whether check printing was enabled as payment" @@ -2083,20 +2146,37 @@ msgstr "" "Fonction technique utilisée afin de savoir si l'impression du chèque a été " "activée comme méthode de paiement." +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Check Sequence" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "Checks numbering sequence." msgstr "Séquence de numérotation des chèques." +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +#: ../../accounting/payables/pay/check.rst:0 +msgid "Manual Numbering" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 #: ../../accounting/payables/pay/check.rst:0 msgid "Check this option if your pre-printed checks are not numbered." msgstr "" "Cochez cette option si vos chèques pré-imprimés ne sont pas numérotés." +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Next Check Number" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "Sequence number of the next printed check." msgstr "Numéro de séquence du prochain chèque imprimé." +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Active in Point of Sale" +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" @@ -2105,6 +2185,10 @@ msgstr "" "Cochez cette case si ce journal défini une méthode de paiement qui peut être" " utilisée dans le point de vente." +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Amount Authorized Difference" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "" "This field depicts the maximum difference allowed between the ending balance" @@ -2358,6 +2442,10 @@ msgstr "" msgid "Explanation of the fields:" msgstr "Explication des champs :" +#: ../../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 "Lorsqu'une immobilisation est créée, le statut est « Brouillon »." @@ -2379,22 +2467,42 @@ msgstr "" "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 "" + #: ../../accounting/others/adviser/assets.rst:0 msgid "Category of asset" msgstr "Catégorie d'immobilisation" +#: ../../accounting/others/adviser/assets.rst:0 +msgid "Date" +msgstr "" + #: ../../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 "" + #: ../../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 "" + #: ../../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 "" + #: ../../accounting/others/adviser/assets.rst:0 msgid "Choose the method to use to compute the amount of depreciation lines." msgstr "" @@ -2414,6 +2522,10 @@ 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 "" + #: ../../accounting/others/adviser/assets.rst:0 msgid "" "Choose the method to use to compute the dates and number of depreciation " @@ -2438,6 +2550,10 @@ 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 "" + #: ../../accounting/others/adviser/assets.rst:0 msgid "" "Indicates that the first depreciation entry for this asset have to be done " @@ -2447,11 +2563,19 @@ 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 "" + #: ../../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 "" + #: ../../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" @@ -4388,17 +4512,29 @@ msgstr "" "pour gérer les clôtures d'exercices (et établir les écritures " "correspondantes)" +#: ../../accounting/others/configuration/account_type.rst:0 +msgid "Tags" +msgstr "" + #: ../../accounting/others/configuration/account_type.rst:0 msgid "Optional tags you may want to assign for custom reporting" msgstr "" "Étiquettes optionnelles que vous pourriez assigner pour des rapports " "personnalisés" +#: ../../accounting/others/configuration/account_type.rst:0 +msgid "Account Currency" +msgstr "" + #: ../../accounting/others/configuration/account_type.rst:0 msgid "Forces all moves for this account to have this account currency." msgstr "" "Oblige toutes les écritures de ce compte à avoir cette devise secondaire." +#: ../../accounting/others/configuration/account_type.rst:0 +msgid "Internal Type" +msgstr "" + #: ../../accounting/others/configuration/account_type.rst:0 msgid "" "The 'Internal Type' is used for features available on different types of " @@ -4410,6 +4546,10 @@ msgstr "" "les comptes banquaires, payabls/recevables par les comptes des " "vendeurs/clients" +#: ../../accounting/others/configuration/account_type.rst:0 +msgid "Allow Reconciliation" +msgstr "" + #: ../../accounting/others/configuration/account_type.rst:0 msgid "" "Check this box if this account allows invoices & payments matching of " @@ -9439,10 +9579,18 @@ msgstr "" msgid "Explanation of the fields of the payment screen:" msgstr "Explication des champs de l'écran de paiement :" +#: ../../accounting/payables/pay/check.rst:0 +msgid "Has Invoices" +msgstr "" + #: ../../accounting/payables/pay/check.rst:0 msgid "Technical field used for usability purposes" msgstr "Champ technique utilisé à des fins ergonomiques" +#: ../../accounting/payables/pay/check.rst:0 +msgid "Hide Payment Method" +msgstr "" + #: ../../accounting/payables/pay/check.rst:0 msgid "" "Technical field used to hide the payment method if the selected journal has " @@ -9451,6 +9599,10 @@ msgstr "" "Champ technique utilisé pour cacher la méthode de paiement si le journal " "sélectionné a seulement une méthode possible qui est \"manuelle\"" +#: ../../accounting/payables/pay/check.rst:0 +msgid "Code" +msgstr "" + #: ../../accounting/payables/pay/check.rst:0 msgid "" "Technical field used to adapt the interface to the payment type selected." @@ -9458,6 +9610,10 @@ msgstr "" "Champ technique utilisé pour adapter l'interface au type de paiement " "sélectionné ." +#: ../../accounting/payables/pay/check.rst:0 +msgid "Check Number" +msgstr "" + #: ../../accounting/payables/pay/check.rst:0 msgid "" "The selected journal is configured to print check numbers. If your pre-" @@ -12421,8 +12577,8 @@ msgstr ":doc:`recording`" #: ../../accounting/receivables/customer_payments/credit_cards.rst:167 #: ../../accounting/receivables/customer_payments/recording.rst:128 -msgid ":doc:`paypal`" -msgstr ":doc:`paypal`" +msgid ":doc:`../../bank/feeds/paypal`" +msgstr "" #: ../../accounting/receivables/customer_payments/credit_cards.rst:169 #: ../../accounting/receivables/customer_payments/recording.rst:130 @@ -12730,268 +12886,6 @@ 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/paypal.rst:3 -msgid "How to accept paypal payments on invoices?" -msgstr "Comment accepter les paiements PayPal des factures?" - -#: ../../accounting/receivables/customer_payments/paypal.rst:5 -msgid "" -"The \"Paypal Payment Acquirer\" module allows you to accept payments via " -"paypal, for your sales orders, invoices, or online orders. As paypal accepts" -" payments through credit cards (VISA, Mastercard, …), you will be able to " -"process most payment methods." -msgstr "" -"Le module « Intermédiaire de paiement PayPal » vous permet d'accepter les " -"paiements par PayPal, pour vos commandes client, vos factures, ou vos " -"commandes en ligne. Comme PayPal accepte les paiements par cartes de crédit " -"(VISA, Mastercard, ...), vous serez en mesure de traiter la plupart des " -"méthodes de paiement." - -#: ../../accounting/receivables/customer_payments/paypal.rst:10 -msgid "Paypal support two modes:" -msgstr "Paypal prend en charge deux modes de fonctionnement :" - -#: ../../accounting/receivables/customer_payments/paypal.rst:12 -msgid "" -"Paypal Merchant Account: the user is redirected to paypal to do the payment " -"(either with a credit card or a paypal account)" -msgstr "" -"Compte marchand PayPal : l'utilisateur est redirigé vers PayPal pour faire " -"le paiement (avec une carte de crédit ou un compte PayPal)" - -#: ../../accounting/receivables/customer_payments/paypal.rst:15 -msgid "" -"PayPal PayFlow Pro (S2S, Server 2 Server): the user is not redirected to " -"paypal and the payment can be done in the background. This method is mostly " -"used for subscription businesses where you need to charge your customers " -"periodically." -msgstr "" -"PayPal PayFlow Pro (S2S, Serveur 2 Serveur): l'utilisateur n'est pas " -"redirigé vers PayPal et le paiement peut être fait en arrière-plan. Cette " -"méthode est surtout utilisée par les entreprises vendant des abonnements qui" -" doivent facturer périodiquement leurs clients." - -#: ../../accounting/receivables/customer_payments/paypal.rst:20 -msgid "As of today, Odoo only support the normal Paypal Merchant Account." -msgstr "À ce jour, Odoo ne supporte que la méthode Compte Marchand PayPal." - -#: ../../accounting/receivables/customer_payments/paypal.rst:26 -msgid "Install the \"PayPal Payment Acquirer\" module" -msgstr "Installez le module « Intermédiaire de paiement PayPal »" - -#: ../../accounting/receivables/customer_payments/paypal.rst:28 -msgid "Start by installing the **PayPal Payment Acquirer** module." -msgstr "" -"Commencez par installer le module **Intermédiaire de paiement PayPal**" - -#: ../../accounting/receivables/customer_payments/paypal.rst:30 -msgid "" -"Once the module is installed, you should see a new payment acquirer in the " -"Setting application, menu \"Payment Acquirers\"." -msgstr "" -"Une fois le module installé, vous devriez trouver un nouvel intermédiaire de" -" paiement en allant dans :menuselection:`Configuration -->Intermédiaires de " -"paiement`." - -#: ../../accounting/receivables/customer_payments/paypal.rst:36 -msgid "" -"By default, Paypal is configured to work in a test environment, out-of-the-" -"box. It means you can already test the full order to payment flow with the " -"paypal sandbox, without having to configure the next steps." -msgstr "" -"Par défaut, PayPal est configuré pour fonctionner dans un environnement de " -"test, out-of-the-box. Cela signifie que vous pouvez déjà tester le " -"cheminement complet de la commande au paiement avec le bac à sable PayPal, " -"sans avoir à configurer les prochaines étapes." - -#: ../../accounting/receivables/customer_payments/paypal.rst:42 -msgid "Creating and configuring a PayPal merchant account" -msgstr "Création et configuration d'un compte marchand PayPal" - -#: ../../accounting/receivables/customer_payments/paypal.rst:45 -msgid "Create a basic Paypal account" -msgstr "Créer un compte de base PayPal" - -#: ../../accounting/receivables/customer_payments/paypal.rst:47 -msgid "Existing or newly created Personal Paypal account can be used." -msgstr "" -"Un compte personnel PayPal existant ou nouvellement créé peut être utilisé." - -#: ../../accounting/receivables/customer_payments/paypal.rst:49 -msgid "Or upgrade your account to Business account (merchant) if needed" -msgstr "" -"Et transformez votre compte en un compte Business (marchand) si nécessaire" - -#: ../../accounting/receivables/customer_payments/paypal.rst:55 -msgid "Paypal Account Summary page" -msgstr "Extrait de la page de gestion de compte PayPal" - -#: ../../accounting/receivables/customer_payments/paypal.rst:58 -msgid "Paypal Configuration" -msgstr "Configuration Paypal" - -#: ../../accounting/receivables/customer_payments/paypal.rst:60 -msgid "" -"Access \"Seller preferences\" menu from `PayPal website " -"`__" -msgstr "" -"Accéder au menu \"Préférences de vendeur\" sur le `site PayPal " -"` __" - -#: ../../accounting/receivables/customer_payments/paypal.rst:66 -msgid "" -"Access \"Website preferences\" and configure Auto Return (Payment Data " -"Transfer must be left to Off)" -msgstr "" -"Allez à \"Website preferences\" and activez Auto Return (Payment Data " -"Transfer doit être laissé à Off)" - -#: ../../accounting/receivables/customer_payments/paypal.rst:69 -msgid "**Database name**: yourcompany" -msgstr "**Nom de la base de données** : yourcompany" - -#: ../../accounting/receivables/customer_payments/paypal.rst:70 -#: ../../accounting/receivables/customer_payments/paypal.rst:88 -msgid "**Website URL**: https://yourcompany.odoo.com/" -msgstr "**URL du site web**: https://yourcompany.odoo.com/" - -#: ../../accounting/receivables/customer_payments/paypal.rst:71 -msgid "**Return URL**: https://yourcompany.odoo.com/shop/confirmation" -msgstr "**URL de retour**: https://yourcompany.odoo.com/shop/confirmation" - -#: ../../accounting/receivables/customer_payments/paypal.rst:76 -msgid "These settings will redirect your buyer to your web confirmation page." -msgstr "" -"Ces paramètres redirigerons votre acheteur vers votre page web de " -"confirmation." - -#: ../../accounting/receivables/customer_payments/paypal.rst:80 -msgid "Access and edit Instant payment notifications settings - IPN" -msgstr "" -"Accédez et modifiez les réglages de notification instantanée de paiement - " -"IPN" - -#: ../../accounting/receivables/customer_payments/paypal.rst:85 -msgid "Example" -msgstr "Exemple" - -#: ../../accounting/receivables/customer_payments/paypal.rst:87 -msgid "**Database name**: \"yourcompany\"" -msgstr "**Nom de la base de données** : \"yourcompany\"" - -#: ../../accounting/receivables/customer_payments/paypal.rst:89 -msgid "**Notification URL**: https://yourcompany.odoo.com/payment/paypal/ipn/" -msgstr "" -"**URL de notification**: https://yourcompany.odoo.com/payment/paypal/ipn/" - -#: ../../accounting/receivables/customer_payments/paypal.rst:91 -msgid "" -"Verify that your Notify URL uses the correct protocol (HTTP / HTTPS). If you" -" use the odoo.com domain, we advise you to use HTTPS." -msgstr "" -"Vérifiez que votre Notification URL utilise the bon protocole (HTTP / " -"HTTPS). Si vous utilisez le domaine odoo.com, nous vous conseillons " -"d'utiliser HTTPS." - -#: ../../accounting/receivables/customer_payments/paypal.rst:94 -msgid "" -"Set the encoding to UTF-8 from the menu :menuselection:`Settings --> " -"Language Encoding --> More Options --> More selling tools`" -msgstr "" -"Définissez l'encodage à UTF-8 dans le menu :menuselection:`Paramètres --> " -"Jeu de caractères --> Plus d'Options --> Plus d'outils vente`" - -#: ../../accounting/receivables/customer_payments/paypal.rst:103 -msgid "" -"Record your Merchant Paypal ID (personal or business account both will have " -"it) it will be entered in Odoo backend :menuselection:`Paypal Settings --> " -"Account Options`." -msgstr "" -"Notez votre ID de marchand PayPal (un compte personnel comme un compte " -"business en aura un), il devra être enregistré en retour dans Odoo " -":menuselection:`Réglages PayPal --> Options du Compte`." - -#: ../../accounting/receivables/customer_payments/paypal.rst:111 -msgid "" -"If you want your customers to be able to pay through Paypal while not having" -" a Paypal account- following setting \"Paypal Account Optional\" needs to be" -" set to **ON**. All users will be able to choose Credit/debit card payment " -"option - Paypal account not required." -msgstr "" -"Si vous voulez que vos clients puissent payer avec Paypal sans avoir de " -"compte Paypal, le paramètre \"Compte Paypal Facultatif\" doit être réglé sur" -" **ON**. Tous les utilisateurs pourrront alors choisir l'option de paiement " -"par carte de crédit. Un compte Paypal ne sera pas nécessaire." - -#: ../../accounting/receivables/customer_payments/paypal.rst:120 -msgid "Setup your Paypal Payment Acquirer account credentials in Odoo" -msgstr "" -"Configurez les informations d'identification de votre compte « Intermédiaire" -" de paiement Paypal » dans Odoo" - -#: ../../accounting/receivables/customer_payments/paypal.rst:122 -msgid "" -":menuselection:`Settings --> Payments --> Payment Acquirers --> Paypal`" -msgstr "" -":menuselection:`Configuration --> Paiements --> Intermédiaires de paiement " -"--> Paypal`" - -#: ../../accounting/receivables/customer_payments/paypal.rst:124 -msgid "**Paypal Email ID**: your paypal account email address" -msgstr "" -"**Email du compte Paypal** : l'adresse de courriel de votre compte paypal" - -#: ../../accounting/receivables/customer_payments/paypal.rst:126 -msgid "**Paypal Merchant ID**: ID retrieved at previous step" -msgstr "**ID de marchand Paypal**: ID noté à une étape précédente" - -#: ../../accounting/receivables/customer_payments/paypal.rst:136 -msgid "" -"If your eCommerce customer gets this Error Message after completing Paypal " -"payment instead of being redirected to your database:" -msgstr "" -"Si votre client eCommerce reçoit ce message d'erreur après avoir terminé le " -"paiement PayPal au lieu d'être redirigé vers votre site :" - -#: ../../accounting/receivables/customer_payments/paypal.rst:142 -msgid "" -"Verify the settings you have `configured in Paypal `_:" -msgstr "" -"Vérifiez les réglages que vous avez `configurés dans Paypal " -"`_:" - -#: ../../accounting/receivables/customer_payments/paypal.rst:144 -msgid "" -"Auto Return should be on (the value can be quite generic, like " -"/shop/confirmation; the correct URL will be set for each " -"transaction)" -msgstr "" -"Auto Return doit être sur On (la valeur peut être assez générique, comme " -"/shop/confirmation, l'URL correcte sera définie pour chaque " -"transaction)" - -#: ../../accounting/receivables/customer_payments/paypal.rst:148 -msgid "Payment Data Transfer should be off" -msgstr "Payment Data Transfer doit être sur off" - -#: ../../accounting/receivables/customer_payments/paypal.rst:150 -msgid "" -"On-premise databases must be accessible through classic HTTP/HTTPS ports " -"(80/443) for Paypal to work correctly, usually through a reverse proxy. " -"Contact your integrating partner if you are unsure this is the case. " -"Databases hosted on odoo.com are already configured correctly." -msgstr "" -"Les bases de données sur-site doivent être accessibles par le biais des " -"ports classiques HTTP/HTTPS (80/443) pour que Paypal fonctionne " -"correctement, généralement par le biais d'un proxy inverse. Contactez votre " -"partenaire intégrateur si vous n'êtes pas sûr que ce soit le cas. Les bases " -"de données hébergées sur odoo.com sont déjà correctement configurées." - -#: ../../accounting/receivables/customer_payments/paypal.rst:157 -#: ../../accounting/receivables/customer_payments/recording.rst:127 -msgid ":doc:`credit_cards`" -msgstr ":doc:`credit_cards`" - #: ../../accounting/receivables/customer_payments/recording.rst:3 msgid "What are the different ways to record a payment?" msgstr "Quelles sont les différentes façons d'enregistrer un paiement ?" @@ -13206,6 +13100,10 @@ msgstr "" "Pour faire un transfert interne d'un compte bancaire à un autre, depuis le tableau de bord sélectionnez « Tranfert interne » sur la carte du compte bancaire à débiter. Puis dans l'écran d'enregistrement des paiements, sélectionnez le compte à créditer.\n" "Ne refaites pas la même opération à partir du compte bancaire à créditer, ou vous allez créer deux pièces comptables qui vont s'annuler pour la même transaction." +#: ../../accounting/receivables/customer_payments/recording.rst:127 +msgid ":doc:`credit_cards`" +msgstr ":doc:`credit_cards`" + #: ../../accounting/receivables/getting_paid.rst:3 msgid "How to get paid?" msgstr "Comment se faire payer ?" diff --git a/locale/fr/LC_MESSAGES/discuss.po b/locale/fr/LC_MESSAGES/discuss.po index b813d0c1d..6cdbfb617 100644 --- a/locale/fr/LC_MESSAGES/discuss.po +++ b/locale/fr/LC_MESSAGES/discuss.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Odoo Business 9.0\n" +"Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-23 15:39+0100\n" +"POT-Creation-Date: 2017-05-09 14:24+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Martin Trigaux , 2017\n" "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n" @@ -23,7 +23,7 @@ msgid "Discuss" msgstr "Discussions" #: ../../discuss/email_servers.rst:3 -msgid "How to use my own email servers to send and receive messages in Odoo" +msgid "How to use my own email servers to send and receive email in Odoo" msgstr "" #: ../../discuss/email_servers.rst:6 @@ -31,138 +31,230 @@ msgid "When is it needed" msgstr "" #: ../../discuss/email_servers.rst:7 -msgid "You need it if you use Odoo Community or Enterprise." -msgstr "" - -#: ../../discuss/email_servers.rst:10 -msgid "What if I use Odoo Online" -msgstr "" - -#: ../../discuss/email_servers.rst:11 msgid "" -"You are done! Odoo Online comes up with an embedded and ready-to-use email " -"server (*@yourcompany.odoo.com*). We recommend to keep this default setting " -"as is as it is really convenient." +"Using your own email servers is required to send and receive messages in " +"Odoo Community or Enterprise. Odoo Online embeds an out-of-box email " +"solution that works straight away. However you can still use your own email " +"servers with the online edition. Some insights are provided here below." +msgstr "" + +#: ../../discuss/email_servers.rst:14 +msgid "How to set it up" msgstr "" #: ../../discuss/email_servers.rst:15 msgid "" -"Indeed, while it is branded by Odoo, the visible source of any message sent " -"from Odoo will be your personal email address (your Odoo login). Your " -"contacts will therefore trust your messages." -msgstr "" - -#: ../../discuss/email_servers.rst:20 -msgid "How does it work when a contact replies to an email sent from Odoo" +"As a system admin, go to :menuselection:`Settings --> General Settings` and " +"check *External Email Servers* (watch out: this checkbox only shows up after" +" Odoo 10). Then, go through the following steps." msgstr "" #: ../../discuss/email_servers.rst:21 msgid "" -"Default reply-to is a generic address used to automatically route any " -"incoming email to the discussion thread of the origin business object " -"(opportunity, order, task, etc.) and to the inbox of all its followers. By " -"default this address is \"catchall@\" but it can be changed. Thanks to it, " -"you get a perfect message thread in Odoo and you don't pollute your external" -" email box with Odoo-related topics." +"Office 365 doesn't allow external hosts like Odoo. Consequently you can't " +"use Office 365 email servers to send or receive messages in Odoo." msgstr "" -#: ../../discuss/email_servers.rst:29 -msgid "How to use my own email servers" -msgstr "" - -#: ../../discuss/email_servers.rst:30 -msgid "" -"You need to be a system admin to set this up. Go to :menuselection:`Settings" -" --> General Settings` and check *External Email Servers* (watch out: this " -"checkbox only shows up after Odoo 10). Then, go through the following steps." -msgstr "" - -#: ../../discuss/email_servers.rst:36 +#: ../../discuss/email_servers.rst:26 msgid "Set an outgoing email server for outbound messages" msgstr "" -#: ../../discuss/email_servers.rst:37 +#: ../../discuss/email_servers.rst:27 msgid "" "You need the SMTP data of your email provider (Gmail, Outlook, Yahoo, AOL, " "etc.) as well as your admin credentials. Once all the information has been " "filled out, click on *Test Connection*." msgstr "" -#: ../../discuss/email_servers.rst:45 +#: ../../discuss/email_servers.rst:35 msgid "Set an incoming email server for inbound messages" msgstr "" -#: ../../discuss/email_servers.rst:46 +#: ../../discuss/email_servers.rst:36 msgid "" "Fill out the form according to your email provider’s settings. Leave the " "*Actions to Perform on Incoming Mails* blank. Once all the information has " "been filled out, click on *TEST & CONFIRM*." msgstr "" -#: ../../discuss/email_servers.rst:53 +#: ../../discuss/email_servers.rst:43 msgid "" "By default inbound messages are fetched every 5 minutes. You can change this" " value in developer mode. Go to :menuselection:`Settings --> Technical --> " "Automation --> Scheduled Actions` and look for *Mail: Fetchmail Service*." msgstr "" -#: ../../discuss/email_servers.rst:59 +#: ../../discuss/email_servers.rst:49 msgid "Set the domain name" msgstr "" -#: ../../discuss/email_servers.rst:60 +#: ../../discuss/email_servers.rst:50 msgid "" "Enter the domain name of your email servers (e.g. mycompany.com) in General " "Settings." msgstr "" -#: ../../discuss/email_servers.rst:67 +#: ../../discuss/email_servers.rst:57 msgid "Create a catchall address" msgstr "" -#: ../../discuss/email_servers.rst:68 +#: ../../discuss/email_servers.rst:58 +msgid "" +"When a contact replies to an email sent from Odoo, the *reply-to* address is" +" a generic address used to route the reply to the right discussion thread in" +" Odoo (opportunity, order, task, etc.) and to the inbox of all its " +"followers. By default this address is \"catchall@\" but it can be changed." +msgstr "" + +#: ../../discuss/email_servers.rst:63 msgid "" "Create a catchall address in your email server settings. We advise you to " "use \"catchall@\" so that everything works out straight away. If you want to" " use another alias, you have extra steps in Odoo:" msgstr "" -#: ../../discuss/email_servers.rst:72 +#: ../../discuss/email_servers.rst:67 msgid "Activate the developer mode from your Settings Dashboard." msgstr "" -#: ../../discuss/email_servers.rst:77 +#: ../../discuss/email_servers.rst:72 msgid "" "Refresh your screen. Then go to :menuselection:`Settings --> Technical --> " "Parameters --> System Parameters` and enter your custom catchall alias in " "*mail.catchall.alias*." msgstr "" -#: ../../discuss/email_servers.rst:84 +#: ../../discuss/email_servers.rst:79 msgid "You can edit the email alias used for bounced messages the same way." msgstr "" -#: ../../discuss/email_servers.rst:87 -msgid "How to perfectly combine Odoo Discuss and my traditional email tool" +#: ../../discuss/email_servers.rst:82 +msgid "How to use my own email servers with Odoo Online" msgstr "" -#: ../../discuss/email_servers.rst:88 +#: ../../discuss/email_servers.rst:83 +msgid "" +"Odoo Online comes up with an embedded and ready-to-use email server " +"(*@yourcompany.odoo.com*). We recommend to keep this default setting as it " +"is really convenient. Indeed, while it is Odoo-labelled, the visible source " +"of any message sent from Odoo will be your personal email address (your Odoo" +" login). Your contacts will therefore trust your messages." +msgstr "" + +#: ../../discuss/email_servers.rst:90 +msgid "" +"You can still use your own email servers if you want your contacts to see " +"your historic email address when they reply to your messages or if you want " +"to manage the reputation of your email servers yourself." +msgstr "" + +#: ../../discuss/email_servers.rst:94 +msgid "There are 2 methods:" +msgstr "" + +#: ../../discuss/email_servers.rst:96 +msgid "" +"[Recommended] **Use a catchall redirection** (your server -> Odoo server) to" +" receive emails in Odoo in real time thanks to the Odoo email server. Create" +" a catchall address in your email server settings. Then apply following " +"redirection: catchall@yourdomain.ext -> catchall@yourcompany.odoo.com. " +"That's it you're ready to go!" +msgstr "" + +#: ../../discuss/email_servers.rst:102 +msgid "" +"**Use a catchall mailbox** to exclusively use your own email server. That " +"way you can also manage your email server reputation (blacklisting, etc). " +"However, incoming messages are fetched from the email server thanks to a " +"cron running every hour. This is the shortest time lap for crons in Online " +"instances. If you opt for this solution, simply follow the procedure of " +"above section." +msgstr "" + +#: ../../discuss/email_servers.rst:111 +msgid "How to be SPF-compliant when using external email servers in Odoo" +msgstr "" + +#: ../../discuss/email_servers.rst:112 +msgid "" +"Sender Policy Framework (SPF) is an email-validation system that checks that" +" incoming mail from a domain comes from a host authorized by that domain's " +"administrator. Such a security system is used in most email servers. If you " +"don't comply with it, your emails sent from Odoo will be likely flagged as " +"spam." +msgstr "" + +#: ../../discuss/email_servers.rst:118 +msgid "" +"To be SPF-compliant, you need to authorize Odoo as a sending host in your " +"domain name settings:" +msgstr "" + +#: ../../discuss/email_servers.rst:121 +msgid "Sign in to your domain’s account at your domain host." +msgstr "" + +#: ../../discuss/email_servers.rst:122 +msgid "Locate the page for updating your domain’s DNS records." +msgstr "" + +#: ../../discuss/email_servers.rst:123 +msgid "" +"If no TXT record is set, create one with following definition: v=spf1 " +"include:_spf.odoo.com ~all" +msgstr "" + +#: ../../discuss/email_servers.rst:125 +msgid "In case a TXT record is already set, add \"include:_spf.odoo.com\"." +msgstr "" + +#: ../../discuss/email_servers.rst:127 +msgid "e.g. for a Gmail server it should be:" +msgstr "" + +#: ../../discuss/email_servers.rst:129 +msgid "v=spf1 include:_spf.odoo.com include:_spf.google.com ~all" +msgstr "" + +#: ../../discuss/email_servers.rst:131 +msgid "" +"Find `here `__ the exact procedure to " +"create or modify TXT records in your own domain registrar." +msgstr "" + +#: ../../discuss/email_servers.rst:134 +msgid "" +"Your new SPF record can take up to 48 hours to go into effect, but this " +"usually happens more quickly." +msgstr "" + +#: ../../discuss/email_servers.rst:137 +msgid "" +"Adding more than one SPF record for a domain can cause problems with mail " +"delivery and spam classification. Instead, we recommend using only one SPF " +"record by modifying it to authorize Odoo." +msgstr "" + +#: ../../discuss/email_servers.rst:142 +msgid "How to choose between Odoo and my traditional email box" +msgstr "" + +#: ../../discuss/email_servers.rst:143 msgid "" "Odoo Discuss is a perfect tool to send and read messages related to business" -" objects. But it doesn't aim to replace a full-featured email software " -"(Gmail, Outlook, Yahoo, AOL, etc.). We recommend to take the most out of " +" documents. However it doesn't aim to replace a full-featured email solution" +" (Gmail, Outlook, Yahoo, AOL, etc.). We recommend to take the most out of " "both systems without mingling them: What is related to Odoo business objects" -" or applications goes into Odoo; What is not stays into your external email " -"boxes." +" or applications goes into Odoo; What is not can be managed into your " +"external email box." msgstr "" -#: ../../discuss/email_servers.rst:95 +#: ../../discuss/email_servers.rst:150 msgid "" "To do so, create specific email aliases to use in Odoo (to generate leads or" " opportunities, helpdesk tickets, etc.). If you take an email alias already " "used for messaging outside of Odoo, incoming messages will land into both " -"systems. This will negatively impact your productivity when it comes to " -"process them." +"systems. This will negatively impact your productivity." msgstr "" #: ../../discuss/mail_twitter.rst:3 diff --git a/locale/fr/LC_MESSAGES/ecommerce.po b/locale/fr/LC_MESSAGES/ecommerce.po index 5af805091..fb7d5c46e 100644 --- a/locale/fr/LC_MESSAGES/ecommerce.po +++ b/locale/fr/LC_MESSAGES/ecommerce.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Odoo Business 9.0\n" +"Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-23 15:39+0100\n" +"POT-Creation-Date: 2017-05-09 14:24+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Clo , 2017\n" "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n" @@ -655,23 +655,21 @@ msgid "Launch my website" msgstr "" #: ../../ecommerce/shopper_experience.rst:3 -msgid "Improve shopper experience" +msgid "Get paid" msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:3 -msgid "How to set up payment methods" +msgid "How to get paid with payment acquirers" msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:5 msgid "" -"To collect payments, you can either request your customers to process it " -"manually (e.g. wire transfer) or redirect them to payment acquirers. The " -"payment process described hereunder is common to both eCommerce and online " -"quotations." +"Odoo embeds several payment methods to get paid on eCommerce, Sales and " +"Invoicing apps." msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:10 -msgid "Payment methods" +msgid "What are the payment methods available" msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:13 @@ -681,451 +679,561 @@ msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:15 msgid "" "Wire Transfer is the default payment method available. The aim is providing " -"your customers with your bank details so that they can pay via their bank. " -"This is very easy to start with but slow and inefficient process-wise. Opt " -"for online acquirers as soon as you can!" +"your customers with your bank details so they can pay on their own via their" +" bank. This is very easy to start with but slow and inefficient process-" +"wise. Opt for online acquirers as soon as you can!" msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:21 -msgid "" -"For B2B users: you can create new manually-processed payment methods (check," -" purchase order, etc.) by renaming 'Wire Transfer' or duplicating it." +msgid "Payment acquirers" msgstr "" -#: ../../ecommerce/shopper_experience/payment.rst:25 -msgid "Online payment acquirers" +#: ../../ecommerce/shopper_experience/payment.rst:23 +msgid "" +"Redirect your customers to payment platforms to collect money effortless and" +" track the payment status (call-back). Odoo supports more and more platforms" +" over time:" msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:27 -msgid "" -"Redirect your customers to payment acquirer platforms to collect money " -"effortless. Odoo supports more and more platforms over time: Paypal, " -"Ingenico, Authorize.net, etc. Once the payment accepted, orders are " -"confirmed in Odoo so that the delivery & invoicing processes are triggered " -"automatically." +msgid "`Paypal `__" +msgstr "" + +#: ../../ecommerce/shopper_experience/payment.rst:28 +msgid "Ingenico" +msgstr "" + +#: ../../ecommerce/shopper_experience/payment.rst:29 +msgid "Authorize.net" +msgstr "" + +#: ../../ecommerce/shopper_experience/payment.rst:30 +msgid "Adyen" +msgstr "" + +#: ../../ecommerce/shopper_experience/payment.rst:31 +msgid "Buckaroo" +msgstr "" + +#: ../../ecommerce/shopper_experience/payment.rst:32 +msgid "PayUmoney" msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:33 -msgid "Custom (advanced)" +msgid "Sips" msgstr "" -#: ../../ecommerce/shopper_experience/payment.rst:35 -msgid "" -"Can be used to request payments to any payment acquirer not listed in Odoo." +#: ../../ecommerce/shopper_experience/payment.rst:34 +msgid "Stripe" msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:38 -msgid "Edit a payment method" +msgid "How to go live" msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:40 msgid "" -"To make payment methods intuitive for your customers feel free to customize " -"them by editing:" -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:42 -msgid "the name," -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:44 -msgid "the picture," -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:46 -msgid "" -"the notification messages (thank you & next step, error, cancellation)." +"Once the payment method ready, make it visible in the payment interface and " +"activate the **Production** mode." msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:48 +msgid "How to let customers save and reuse credit cards" +msgstr "" + +#: ../../ecommerce/shopper_experience/payment.rst:49 msgid "" -"Go to :menuselection:`Website Admin --> Configuration --> Payment Acquirers`" -" to do so." +"To ease the payment of returning customers, you can let them save and reuse " +"a credit card if they want to. If so, a payment token will be saved in Odoo." +" This option is available with Ingenico and Authorize.net." msgstr "" -#: ../../ecommerce/shopper_experience/payment.rst:51 -msgid "Generic setup" -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:53 -msgid "Review the elements here above." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:55 -msgid "Enter your credentials (online acquirers only)." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:57 -msgid "Choose your order confirmation preference (see below)." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:59 -msgid "Publish the payment method." +#: ../../ecommerce/shopper_experience/payment.rst:54 +#: ../../ecommerce/shopper_experience/payment.rst:68 +msgid "You can turn this on from the acquirer configuration form." msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:61 -msgid "Test the payment flow in *Test* mode (default mode)." +msgid "How to debit credit cards to pay subscriptions" msgstr "" -#: ../../ecommerce/shopper_experience/payment.rst:63 -msgid "Switch to *Production* mode." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:65 +#: ../../ecommerce/shopper_experience/payment.rst:62 msgid "" -"Se your default payment acquirer in :menuselection:`Accounting --> " -"Configuration --> Settings`. It will be auto-selected for your customers " -"when they enter the payment screen." +"`Odoo Subscription `__ allows to " +"bill services automatically on a recurring basis. Along with it, you can " +"have an automatic debit of the customer's credit card." msgstr "" -#: ../../ecommerce/shopper_experience/payment.rst:69 +#: ../../ecommerce/shopper_experience/payment.rst:66 +msgid "This option is available with Ingenico and Authorize.net." +msgstr "" + +#: ../../ecommerce/shopper_experience/payment.rst:73 msgid "" -"Rely on the documentation related to your payment acquirer to go through " -"step 2, 5 and 6. Some acquirers provides you with specific credentials for " -"test and production modes (Paypal). Others let you switch mode in their " -"setup interface (Authorize.net)." +"That way a payment token will be recorded when the customer goes for the " +"subscription and an automatic debit will occur whenever an invoice is issued" +" from the subscription." msgstr "" -#: ../../ecommerce/shopper_experience/payment.rst:74 +#: ../../ecommerce/shopper_experience/payment.rst:79 +msgid "How to use other acquirers (advanced)" +msgstr "" + +#: ../../ecommerce/shopper_experience/payment.rst:81 msgid "" -"With Ingenico and Authorize.net, you can let your customers save and reuse a" -" payment card to accelerate the process on next checkouts. See *Store Card " -"Data* in Configuration tab." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:78 -msgid "Payment flow" -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:80 -msgid "" -"When choosing the payment method, the customer is taken to the payment " -"acquirer interface to process the payment." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:83 -msgid "" -"Once done he is taken back to Odoo's confirmation page. The transaction " -"status shows up:" +"Odoo can submit single payment requests and redirect to any payment " +"acquirer. But there is no call-back, i.e. Odoo doesn't track the transaction" +" status. So you will confirm orders manually once you get paid." msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:85 -msgid "" -"*Pending*: the order will be confirmed as soon as you authorize the " -"transaction in the acquirer interface." +msgid "How to:" msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:87 -msgid "*Confirmed*: the payment has been authorized automatically." +msgid "Switch to developer mode." msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:89 -msgid "" -"A confirmation email is sent to the customer with a copy of the order in " -"pdf. It shows the payment status." +msgid "Take the **Custom** payment method." msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:91 -msgid "Launch the delivery and invoicing from:" -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:93 msgid "" -"eCommerce: :menuselection:`Website Admin --> Orders --> (Unpaid) Orders`," -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:95 -msgid "" -"online quotations: :menuselection:`Sales --> Sales --> Quotations/Sales " -"Orders`." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:97 -msgid "" -"For internal tracking purposes, a link to the transaction status is provided" -" in the sales order." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:100 -msgid "" -"If the customer cancels the payment while on the payment acquirer form, it " -"is taken back to the store page (or online quotation) in order to reprocess " -"the order. The payment is marked as *Cancelled* in Odoo." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:105 -msgid "" -"You can edit the confirmation email template from :menuselection:`Website " -"Admin --> Configuration --> Settings`." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:109 -msgid "Order confirmation preferences" -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:111 -msgid "There are 4 different behaviors available for any payment acquirer." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:114 -msgid "No automatic confirmation" -msgstr "Pas de confirmation automatique" - -#: ../../ecommerce/shopper_experience/payment.rst:116 -msgid "" -"This is the default mode for *Wire Transfer*. It means Odoo does not confirm" -" orders but keep them in an intermediary stage (*Quotation Sent* = *Unpaid " -"Order*). Once you get the payment, you are expected to confirm the order " -"manually to pursue the process (delivery, invoicing)." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:121 -msgid "" -"Authorize the amount and confirm the SO on acquirer confirmation (capture " -"manually)" -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:123 -msgid "" -"Odoo confirms the order as soon as the payment success notification comes " -"in. To get the money however, you need to capture it from your payment " -"transaction. In lots of countries you are indeed requested to deliver your " -"goods before capturing the amount." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:128 -msgid "" -"Authorize & capture the amount and confirm the SO on acquirer confirmation" -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:130 -msgid "" -"This is the default mode for payment acquirers. The amount is captured " -"automatically." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:133 -msgid "" -"For B2B: if you use a manual payment method like *Wire Transfer* and don't " -"expect any upfront payment to launch the delivery, switch to this mode as " -"well." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:137 -msgid "" -"Authorize & capture the amount, confirm the SO and auto-validate the invoice" -" on acquirer confirmation" -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:139 -msgid "" -"If you invoice upfront and not at the delivery, switch to this last mode to " -"automate everything. You are requested to select a Payment Journal to record" -" such payments (see " -":doc:`../../accounting/receivables/customer_payments/credit_cards`)." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:144 -msgid "Custom payment acquirers (advanced)" -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:146 -msgid "" -"Odoo can submit payment requests and redirect to any payment acquirer. In " -"such a case, you need to confirm the sale manually in Odoo once you get paid" -" because Odoo cannot read any payment status sent by the acquirer." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:150 -msgid "To configure this:" -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:152 -msgid "switch to developer mode," -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:154 -msgid "edit the *Custom* payment method," -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:156 -msgid "" -"set up the payment form (S2S Form Template) as instructed by your payment " +"Set up the payment form (S2S Form Template) as instructed by your payment " "acquirer. You can start from *default_acquirer_button* that you can " "duplicate." msgstr "" -#: ../../ecommerce/shopper_experience/payment.rst:160 -msgid "Recurring payments & Installment plans" +#: ../../ecommerce/shopper_experience/payment.rst:96 +msgid "Other configurations" msgstr "" -#: ../../ecommerce/shopper_experience/payment.rst:162 +#: ../../ecommerce/shopper_experience/payment.rst:98 msgid "" -"The Ingenico integration allows you to process and manage recurring payments" -" from Odoo Subscriptions app out-of-the-box (more information coming soon)." +"Odoo can also be used for more advanced payment processes like installment " +"plans (e.g. `Paypal Installment Plans " +"`__)." msgstr "" -#: ../../ecommerce/shopper_experience/payment.rst:165 +#: ../../ecommerce/shopper_experience/payment.rst:102 msgid "" -"With some customization, Odoo can also trigger installment plans if this is " -"permitted by your payment acquirer’s API:" +"Such a customization service is made on-demand by our technical experts " +"based on your own requirements. A business advisor can reach you out for " +"such matter. `Contact us. `__" msgstr "" -#: ../../ecommerce/shopper_experience/payment.rst:168 -msgid "" -"e.g. Paypal Installment Plans (see https://developer.paypal.com/docs/classic" -"/paypal-payments-standard/integration-guide/installment_buttons)." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:170 -msgid "" -"Such a service is made on-demand by our technical experts based on your own " -"requirements. Ask our business advisors at info@odoo.com." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:175 +#: ../../ecommerce/shopper_experience/payment.rst:109 msgid ":doc:`paypal`" msgstr ":doc:`paypal`" +#: ../../ecommerce/shopper_experience/payment.rst:110 +msgid ":doc:`wire_transfer`" +msgstr "" + +#: ../../ecommerce/shopper_experience/payment.rst:111 +#: ../../ecommerce/shopper_experience/paypal.rst:155 +msgid ":doc:`payment_acquirer`" +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:3 +msgid "How to manage orders paid with payment acquirers" +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:5 +msgid "" +"Odoo confirms orders automatically as soon as the payment is authorized by a" +" payment acquirer. This triggers the delivery. If you invoice based on " +"ordered quantities, you are also requested to invoice the order." +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:12 +msgid "What are the payment status" +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:13 +msgid "" +"At anytime, the salesman can check the transaction status from the order." +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:18 +msgid "*Draft*: transaction under processing." +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:20 +msgid "" +"*Pending*: the payment acquirer keeps the transaction on hold and you need " +"to authorize it from the acquirer interface." +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:23 +msgid "" +"*Authorized*: the payment has been authorized but not yet captured. In Odoo," +" the order is already confirmed. Once the delivery done, you can capture the" +" amount from the acquirer interface (or from Odoo if you use Authorize.net)." +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:28 +msgid "" +"*Done*: the payment is authorized and captured. The order has been " +"confirmed." +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:30 +msgid "" +"*Error*: an error has occured during the transaction. The customer needs to " +"retry the payment. The order is still in draft." +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:34 +msgid "" +"*Cancelled*: when the customer cancels the payment in the payment acquirer " +"form. They are taken back to Odoo in order to modify the order." +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:37 +msgid "" +"Specific messages are provided to your customers for every payment status, " +"when they are redirected to Odoo after the transaction. To edit such " +"messages, go to the *Messages* tab of the payment method." +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:44 +msgid "Auto-validate invoices at order" +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:46 +msgid "" +"When the order is confirmed you can also have an invoice automatically " +"issued and paid. This fully-automated made for businesses that invoice " +"orders straight on." +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:53 +msgid "" +"If you choose this mode you are requested to select a payment journal in " +"order to record payments in your books. This payment is automatically " +"reconcilied with the invoice, marking it as paid. Select your **bank " +"account** if you get paid immediately on your bank account. If you don't you" +" can create a specific journal for the payment acquirer (type = Bank). That " +"way, you can track online payments in an intermediary account of your books " +"until you get paid into your bank account (see `How to register credit card " +"payments " +"<../../accounting/receivables/customer_payments/credit_cards.html>`__)." +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:64 +msgid "Capture the payment after the delivery" +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:65 +msgid "" +"With this mode, the order is confirmed but the amount is kept on hold. Once " +"the delivery processed, you can capture the payment from Odoo. This mode is " +"only available with Authorize.net." +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:72 +msgid "" +"To capture the payment, open the transaction from the order. Then click " +"*Capture Transaction*." +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:78 +msgid "" +"With other payment acquirers, you can manage the capture in their own " +"interfaces, not from Odoo." +msgstr "" + #: ../../ecommerce/shopper_experience/paypal.rst:3 -msgid "How to collect payments with Paypal" +msgid "How to get paid with Paypal" msgstr "" #: ../../ecommerce/shopper_experience/paypal.rst:5 msgid "" -"Paypal is the easiest payment method to configure. It is also the only one " -"without any subscription free." -msgstr "" - -#: ../../ecommerce/shopper_experience/paypal.rst:9 -msgid "Setup your Paypal account" +"Paypal is the easiest online payment method to configure. It is also the " +"only one without any subscription free. We definitely advise it to any " +"starter." msgstr "" #: ../../ecommerce/shopper_experience/paypal.rst:11 -msgid "" -"1. Create a business account at Paypal.com (see: https://www.paypal.com/in" -"/cgi-bin/webscr?cmd=xpt/Marketing/general/how-to-set-up-a-paypal-account-" -"outside) or upgrade your account to Business account (merchant) if you have " -"a basic account." +msgid "Set up your Paypal account" msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:15 +#: ../../ecommerce/shopper_experience/paypal.rst:13 msgid "" -"2. Log in to your account at Paypal.com and go to :menuselection:`My Account" -" --> Profile --> My Selling Tools`. There click *PayPal button language " -"encoding* under *More Selling Tools* section. Then, click *More Options* and" -" replace the two default encoding formats by *UTF-8*." +"Create a `Paypal Business Account `__ or upgrade " +"your account to *Business account* if you have a basic account." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:20 -msgid "Open Paypal setup form in Odoo and enter your *Email ID*." +#: ../../ecommerce/shopper_experience/paypal.rst:16 +msgid "" +"Log in to `Paypal `__ and open the settings of your " +"**Profile**." msgstr "" #: ../../ecommerce/shopper_experience/paypal.rst:22 -msgid "" -"4. The Paypal Merchant ID is not mandatory (extra verification level). It is" -" provided in Paypal under :menuselection:`My Account --> Overview`." +msgid "Now enter the menu **My selling tools**." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:25 -msgid "" -"5. Configure the IPN feedback (Paypal contacting your Odoo instance without " -"needing the redirection). The setting can be found in " -":menuselection:`Profile --> My Selling Tools --> Instant payment " -"notification`. Activate it and set it to " -"/payment/paypal/ipn." +#: ../../ecommerce/shopper_experience/paypal.rst:27 +msgid "Let's start with the **Website Preferences**." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:30 +#: ../../ecommerce/shopper_experience/paypal.rst:29 msgid "" -"6. To test the workflow, you can create sandbox accounts by logging in at " -"https://developer.paypal.com/webapps/developer/applications/myapps with the " -"same Paypal credentials. Two default sandbox accounts are automatically " -"generated when you register to Paypal: one is a buyer, the other is a " -"shopper." +"Turn on **Auto Return** and enter the **Return URL**: " +"/shop/confirmation. Verify that this address uses the " +"correct protocol (HTTP/HTTPS)." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:35 +#: ../../ecommerce/shopper_experience/paypal.rst:36 msgid "" -"7. Log in with your buyer sandbox account to https://www.sandbox.paypal.com " -"(same password than real account) and apply the same format change." +"Turn on **Payment Data Transfer**. When saving, an **Identity Token** is " +"generated. You will be later requested to enter it in Odoo." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:39 +#: ../../ecommerce/shopper_experience/paypal.rst:43 msgid "" -"To automatically redirect your customers when the payment is completed, go " -"to your Website Preferences and turn *Auto Return* on. Set *Return URL* to " -"/shop/confirmation. Verify that your *Notify URL* uses " -"the correct protocol (HTTP/HTTPS)." +"Then, get back to your profile to activate the **Instant Payment " +"Notification (IPN)** in *My selling tools*." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:44 -msgid "" -"If you want your customers to pay without creating a Paypal account, *Paypal" -" Account Optional* needs to be turned on." +#: ../../ecommerce/shopper_experience/paypal.rst:46 +msgid "Enter the **Notification URL**: /payment/paypal/ipn" msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:48 +#: ../../ecommerce/shopper_experience/paypal.rst:51 +msgid "" +"Now you must change the encoding format of the payment request sent by Odoo " +"to Paypal. To do so, get back to *My selling tools* and click **PayPal " +"button language encoding** in *More Selling Tools* section." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:58 +msgid "" +"Then, click *More Options* and set the two default encoding formats as " +"**UTF-8**." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:66 +msgid "" +"If you want your customers to pay without creating a Paypal account, " +"**Paypal Account Optional** needs to be turned on." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:74 +msgid "Set up Paypal's payment method in Odoo" +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:75 +msgid "" +"Open Paypal setup form in :menuselection:`Website or Sales or Accounting -->" +" Settings --> Payment Acquirers+`. Enter both your **Email ID** and your " +"**Merchant ID** and check **Use IPN**." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:82 +msgid "" +"They are both provided in your Paypal profile, under :menuselection:`My " +"business info`." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:85 +msgid "" +"Enter your **Identity Token** in Odoo (from *Auto Return* option). To do so," +" open the *Settings* and activate the **Developer Mode**." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:91 +msgid "" +"Then, go to :menuselection:`Settings --> Technical --> Parameters --> System" +" Parameters` and create a parameter with following values:" +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:94 +msgid "Key: payment_paypal.pdt_token" +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:95 +msgid "Value: your Paypal *Identity Token*" +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:102 +msgid "Go live" +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:103 +msgid "" +"Your configuration is now ready! You can make Paypal visible on your " +"merchant interface and activate the **Production mode**." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:112 msgid "Transaction fees" msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:50 +#: ../../ecommerce/shopper_experience/paypal.rst:114 msgid "" "You can charge an extra to the customer to cover the transaction fees Paypal" " charges you. Once redirected to Paypal, your customer sees an extra applied" " to the order amount." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:53 +#: ../../ecommerce/shopper_experience/paypal.rst:117 msgid "" -"To activate this, go to the *Configuration* tab and check *Add Extra Fees*. " -"Default fees are the ones charged by Paypal." +"To activate this, go to the *Configuration* tab of Paypal config form in " +"Odoo and check *Add Extra Fees*. Default fees for US can be seen here below." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:123 +msgid "" +"To apply the right fees for your country, please refer to `Paypal Fees " +"`__." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:128 +msgid "Test the payment flow" +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:130 +msgid "" +"You can test the entire payment flow thanks to Paypal Sandbox accounts." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:132 +msgid "" +"Log in to `Paypal Developer Site `__ with your" +" Paypal credentials. This will create two sandbox accounts:" +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:136 +msgid "" +"A business account (to use as merchant, e.g. " +"pp.merch01-facilitator@example.com)." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:137 +msgid "" +"A default personal account (to use as shopper, e.g. " +"pp.merch01-buyer@example.com)." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:139 +msgid "" +"Log in to `Paypal Sandbox `__ with the " +"merchant account and follow the same configuration instructions." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:142 +msgid "" +"Enter your sandbox credentials in Odoo and make sure Paypal is still set on " +"*Test* mode. Also, make sure the confirmation mode of Paypal is not " +"*Authorize & capture the amount, confirm the SO and auto-validate the " +"invoice on acquirer confirmation*. Otherwise a confirmed invoice will be " +"automatically generated when the transaction is completed." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:150 +msgid "Run a test transaction from Odoo using the sandbox personal account." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:154 +msgid ":doc:`payment`" msgstr "" #: ../../ecommerce/shopper_experience/portal.rst:3 -msgid "How customers can access their portal" +msgid "How customers can access their customer account" msgstr "" #: ../../ecommerce/shopper_experience/portal.rst:5 msgid "" -"It has never been so easy for your customers to access their documents " -"through a portal. Forget endless signup forms, Odoo makes it as easy as ABC." -" With eCommerce and Online Quotation apps, your customers are requested to " -"create a portal account (name, email, password only) from the very first " -"order confirmation or online quotation email they get from you." +"It has never been so easy for your customers to access their customer " +"account. Forget endless signup forms, Odoo makes it as easy as ABC. They are" +" suggested to sign up (name, email, password) when the order is placed, and " +"not before. Indeed, nothing is more annoying than going through a signup " +"process before buying something." msgstr "" -#: ../../ecommerce/shopper_experience/portal.rst:12 +#: ../../ecommerce/shopper_experience/portal.rst:14 msgid "Sign up" msgstr "S'enregistrer" -#: ../../ecommerce/shopper_experience/portal.rst:14 +#: ../../ecommerce/shopper_experience/portal.rst:16 msgid "" -"When clicking the link in the email or when clicking *Sign up* in the " -"checkout process, your customer is directed to the *Sign up* page." -msgstr "" - -#: ../../ecommerce/shopper_experience/portal.rst:21 -msgid "Customer account" +"The invitation to sign up shows up when the customer wants to visualize the " +"order from order confirmation email." msgstr "" #: ../../ecommerce/shopper_experience/portal.rst:23 +msgid "Customer account" +msgstr "" + +#: ../../ecommerce/shopper_experience/portal.rst:25 msgid "" -"Once logged in the customer will access his account by clicking *My Account*" +"Once logged in the customer will access the account by clicking *My Account*" " in the login dropdown menu." msgstr "" -#: ../../ecommerce/shopper_experience/portal.rst:29 +#: ../../ecommerce/shopper_experience/portal.rst:31 msgid "" -"From the portal menu all the customer history can be reviewed. The main " -"address (billing) can also be modified." +"THere they find all their history. The main address (billing) can also be " +"modified." msgstr "" -#: ../../ecommerce/shopper_experience/portal.rst:36 +#: ../../ecommerce/shopper_experience/portal.rst:37 msgid "" -"If a portal user is a contact of a company (*Company* field set in customer " -"detail form), this last will see all the documents of the company and all " -"its other contacts through the portal." +"If the customer is set as a contact of a company in your address book, they " +"will see all the documents whose the customer belongs to this company." +msgstr "" + +#: ../../ecommerce/shopper_experience/wire_transfer.rst:3 +msgid "How to get paid with wire transfers" +msgstr "" + +#: ../../ecommerce/shopper_experience/wire_transfer.rst:5 +msgid "" +"**Wire Transfer** is the default payment method available. The aim is " +"providing your customers with your bank details so they can pay on their " +"own. This is very easy to start with but slow and inefficient process-wise. " +"Opt for payment acquirers as soon as you can!" +msgstr "" + +#: ../../ecommerce/shopper_experience/wire_transfer.rst:13 +msgid "How to provide customers with payment instructions" +msgstr "" + +#: ../../ecommerce/shopper_experience/wire_transfer.rst:14 +msgid "" +"Put your payment instructions in the **Thanks Message** of your payment " +"method." +msgstr "" + +#: ../../ecommerce/shopper_experience/wire_transfer.rst:19 +msgid "They will appear to the customers when they place an order." +msgstr "" + +#: ../../ecommerce/shopper_experience/wire_transfer.rst:26 +msgid "How to manage an order once you get paid" +msgstr "" + +#: ../../ecommerce/shopper_experience/wire_transfer.rst:28 +msgid "" +"Whenever a customer pays by wire transfer, the order stays in an " +"intermediary stage **Quotation Sent** (i.e. unpaid order). When you get " +"paid, you confirm the order manually to launch the delivery." +msgstr "" + +#: ../../ecommerce/shopper_experience/wire_transfer.rst:35 +msgid "How to create other manual payment methods" +msgstr "" + +#: ../../ecommerce/shopper_experience/wire_transfer.rst:37 +msgid "" +"If you manage a B2B business, you can create other manually-processed " +"payment methods like paying by check. To do so, just rename *Wire Transfer* " +"or duplicate it." msgstr "" #: ../../ecommerce/taxes.rst:3 diff --git a/locale/fr/LC_MESSAGES/general.po b/locale/fr/LC_MESSAGES/general.po index de74fad24..a52e32cf0 100644 --- a/locale/fr/LC_MESSAGES/general.po +++ b/locale/fr/LC_MESSAGES/general.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Odoo Business 9.0\n" +"Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-23 15:39+0100\n" +"POT-Creation-Date: 2017-05-09 14:24+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Olivier Lenoir , 2017\n" "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n" @@ -23,8 +23,8 @@ msgid "General" msgstr "Général" #: ../../general/auth.rst:3 -msgid "Authentification" -msgstr "" +msgid "Authentication" +msgstr "Authentification" #: ../../general/auth/google.rst:3 msgid "How to allow users to sign in with their Google account" @@ -84,64 +84,196 @@ msgid "" msgstr "" #: ../../general/base_import.rst:3 -msgid "BASE IMPORT" +msgid "Data Import" +msgstr "" + +#: ../../general/base_import/adapt_template.rst:3 +msgid "How to adapt an import template" +msgstr "" + +#: ../../general/base_import/adapt_template.rst:5 +msgid "" +"Import templates are provided in the import tool of the most common data to " +"import (contacts, products, bank statements, etc.). You can open them with " +"any spreadsheets software (Microsoft Office, OpenOffice, Google Drive, " +"etc.)." +msgstr "" + +#: ../../general/base_import/adapt_template.rst:11 +msgid "How to customize the file" +msgstr "" + +#: ../../general/base_import/adapt_template.rst:13 +msgid "" +"Remove columns you don't need. We advise to not remove the *ID* one (see why" +" here below)." +msgstr "" + +#: ../../general/base_import/adapt_template.rst:15 +#: ../../general/base_import/import_faq.rst:26 +msgid "" +"Set a unique ID to every single record by dragging down the ID sequencing." +msgstr "" + +#: ../../general/base_import/adapt_template.rst:20 +msgid "" +"When you add a new column, Odoo might not be able to map it automatically if" +" its label doesn't fit any field of the system. If so, find the " +"corresponding field using the search." +msgstr "" + +#: ../../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" +msgstr "" + +#: ../../general/base_import/adapt_template.rst:33 +msgid "" +"The **ID** (External ID) is an unique identifier for the line item. Feel " +"free to use the one of your previous software to ease the transition to " +"Odoo." +msgstr "" + +#: ../../general/base_import/adapt_template.rst:36 +msgid "" +"Setting an ID is not mandatory when importing but it helps in many cases:" +msgstr "" + +#: ../../general/base_import/adapt_template.rst:38 +msgid "" +"Update imports: you can import the same file several times without creating " +"duplicates;" +msgstr "" + +#: ../../general/base_import/adapt_template.rst:39 +msgid "Import relation fields (see here below)." +msgstr "" + +#: ../../general/base_import/adapt_template.rst:42 +msgid "How to import relation fields" +msgstr "" + +#: ../../general/base_import/adapt_template.rst:44 +msgid "" +"An Odoo object is always related to many other objects (e.g. a product is " +"linked to product categories, attributes, vendors, etc.). To import those " +"relations you need to import the records of the related object first from " +"their own list menu." +msgstr "" + +#: ../../general/base_import/adapt_template.rst:48 +msgid "" +"You can do it using either the name of the related record or its ID. The ID " +"is expected when two records have the same name. In such a case add \" / " +"ID\" at the end of the column title (e.g. for product attributes: Product " +"Attributes / Attribute / ID)." msgstr "" #: ../../general/base_import/import_faq.rst:3 -msgid "Import CSV file to Odoo" +msgid "How to import data into Odoo" msgstr "" -#: ../../general/base_import/import_faq.rst:8 -msgid "Frequently Asked Questions" -msgstr "Foire aux questions" +#: ../../general/base_import/import_faq.rst:6 +msgid "How to start" +msgstr "" -#: ../../general/base_import/import_faq.rst:12 -msgid "Need to import data from an other application?" -msgstr "Besoin d'importer des données d'une autre application ?" - -#: ../../general/base_import/import_faq.rst:14 +#: ../../general/base_import/import_faq.rst:7 msgid "" -"In order to re-create relationships between different records, you should " -"use the unique identifier from the original application and map it to the " -"**ID** (External ID) column in Odoo. When you import an other record that " -"links to the first one, use **XXX/ID** (XXX/External ID) to the original " -"unique identifier." +"You can import data on any Odoo's business object using either Excel (.xlsx)" +" or CSV (.csv) formats: contacts, products, bank statements, journal entries" +" and even orders!" +msgstr "" + +#: ../../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 "" -"The **ID** (External ID) will also be used to update the original import if " -"you need to re-import modified data later, it's thus good practice to " -"specify it whenever possible." +"There you are provided with templates you can easily populate with your own " +"data. Such templates can be imported in one click; The data mapping is " +"already done." msgstr "" -#: ../../general/base_import/import_faq.rst:21 -msgid "I cannot find the field I want to map my column to?" +#: ../../general/base_import/import_faq.rst:22 +msgid "How to adapt the template" msgstr "" -#: ../../general/base_import/import_faq.rst:23 -msgid "" -"Odoo try to find with some heuristic, based on the first ten lines of the " -"files, the type of field for each columns inside your file. For example if " -"you have a column only containing numbers, only the fields that are of type " -"integer will be displayed for you to choose from. While this behaviour might" -" be good and easy for most cases scenarios, it is also possible that it goes" -" wrong sometimes or that you want to map your column to a field that is not " -"proposed by default." +#: ../../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 "" -"If that happens, you just have to check the **Show all fields for completion" -" (advanced)** option, you will then be able to choose from the complete list" -" of fields for each columns." +msgid "We advise to not remove the **ID** one (see why in the next section)." msgstr "" -#: ../../general/base_import/import_faq.rst:30 +#: ../../general/base_import/import_faq.rst:31 +msgid "" +"When you add a new column, Odoo might not be able to map it automatically if" +" its label doesn't fit any field in Odoo. Don't worry! You can map new " +"columns manually when you test the import. Search the list for the " +"corresponding field." +msgstr "" + +#: ../../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 "" + +#: ../../general/base_import/import_faq.rst:46 +msgid "" +"In order to re-create relationships between different records, you should " +"use the unique identifier from the original application and map it to the " +"**ID** (External ID) column in Odoo. When you import another record that " +"links to the first one, use **XXX/ID** (XXX/External ID) to the original " +"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 "" + +#: ../../general/base_import/import_faq.rst:54 +msgid "" +"The **ID** will also be used to update the original import if you need to " +"re-import modified data later, it's thus good practice to specify it " +"whenever possible." +msgstr "" + +#: ../../general/base_import/import_faq.rst:60 +msgid "I cannot find the field I want to map my column to" +msgstr "" + +#: ../../general/base_import/import_faq.rst:62 +msgid "" +"Odoo tries to find with some heuristic, based on the first ten lines of the " +"files, the type of field for each column inside your file. For example if " +"you have a column only containing numbers, only the fields that are of type " +"*Integer* will be displayed for you to choose from. While this behavior " +"might be good and easy for most cases, it is also possible that it goes " +"wrong or that you want to map your column to a field that is not proposed by" +" default." +msgstr "" + +#: ../../general/base_import/import_faq.rst:71 +msgid "" +"If that happens, you just have to check the ** Show fields of relation " +"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 "" -#: ../../general/base_import/import_faq.rst:32 +#: ../../general/base_import/import_faq.rst:81 msgid "" "Odoo can automatically detect if a column is a date and it will try to guess" " the date format from a set of most used date format. While this process can" @@ -151,7 +283,7 @@ msgid "" " day and which one is the month in a date like '01-03-2016'." msgstr "" -#: ../../general/base_import/import_faq.rst:34 +#: ../../general/base_import/import_faq.rst:83 msgid "" "To view which date format Odoo has found from your file you can check the " "**Date Format** that is shown when clicking on **Options** under the file " @@ -159,7 +291,7 @@ msgid "" " the *ISO 8601* to define the format." msgstr "" -#: ../../general/base_import/import_faq.rst:37 +#: ../../general/base_import/import_faq.rst:86 msgid "" "If you are importing an excel (.xls, .xlsx) file, you can use date cells to " "store dates as the display of dates in excel is different from the way it is" @@ -167,11 +299,11 @@ msgid "" "whatever your locale date format is." msgstr "" -#: ../../general/base_import/import_faq.rst:42 +#: ../../general/base_import/import_faq.rst:91 msgid "Can I import numbers with currency sign (e.g.: $32.00)?" msgstr "" -#: ../../general/base_import/import_faq.rst:44 +#: ../../general/base_import/import_faq.rst:93 msgid "" "Yes, we fully support numbers with parenthesis to represent negative sign as" " well as numbers with currency sign attached to them. Odoo also " @@ -181,56 +313,56 @@ msgid "" "crash." msgstr "" -#: ../../general/base_import/import_faq.rst:46 +#: ../../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:48 +#: ../../general/base_import/import_faq.rst:97 msgid "32.000,00" msgstr "" -#: ../../general/base_import/import_faq.rst:49 +#: ../../general/base_import/import_faq.rst:98 msgid "32000,00" msgstr "" -#: ../../general/base_import/import_faq.rst:50 +#: ../../general/base_import/import_faq.rst:99 msgid "32,000.00" msgstr "" -#: ../../general/base_import/import_faq.rst:51 +#: ../../general/base_import/import_faq.rst:100 msgid "-32000.00" msgstr "" -#: ../../general/base_import/import_faq.rst:52 +#: ../../general/base_import/import_faq.rst:101 msgid "(32000.00)" msgstr "" -#: ../../general/base_import/import_faq.rst:53 +#: ../../general/base_import/import_faq.rst:102 msgid "$ 32.000,00" msgstr "" -#: ../../general/base_import/import_faq.rst:54 +#: ../../general/base_import/import_faq.rst:103 msgid "(32000.00 €)" msgstr "" -#: ../../general/base_import/import_faq.rst:56 +#: ../../general/base_import/import_faq.rst:105 msgid "Example that will not work:" msgstr "" -#: ../../general/base_import/import_faq.rst:58 +#: ../../general/base_import/import_faq.rst:107 msgid "ABC 32.000,00" msgstr "" -#: ../../general/base_import/import_faq.rst:59 +#: ../../general/base_import/import_faq.rst:108 msgid "$ (32.000,00)" msgstr "" -#: ../../general/base_import/import_faq.rst:64 +#: ../../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:66 +#: ../../general/base_import/import_faq.rst:115 msgid "" "By default the Import preview is set on commas as field separators and " "quotation marks as text delimiters. If your csv file does not have these " @@ -238,20 +370,20 @@ msgid "" " CSV file bar after you select your file)." msgstr "" -#: ../../general/base_import/import_faq.rst:68 +#: ../../general/base_import/import_faq.rst:117 msgid "" "Note that if your CSV file has a tabulation as separator, Odoo will not " "detect the separations. You will need to change the file format options in " "your spreadsheet application. See the following question." msgstr "" -#: ../../general/base_import/import_faq.rst:73 +#: ../../general/base_import/import_faq.rst:122 msgid "" "How can I change the CSV file format options when saving in my spreadsheet " "application?" msgstr "" -#: ../../general/base_import/import_faq.rst:75 +#: ../../general/base_import/import_faq.rst:124 msgid "" "If you edit and save CSV files in speadsheet applications, your computer's " "regional settings will be applied for the separator and delimiter. We " @@ -260,17 +392,17 @@ msgid "" "filter settings' > Save)." msgstr "" -#: ../../general/base_import/import_faq.rst:77 +#: ../../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 "" -#: ../../general/base_import/import_faq.rst:82 +#: ../../general/base_import/import_faq.rst:131 msgid "What's the difference between Database ID and External ID?" msgstr "" -#: ../../general/base_import/import_faq.rst:84 +#: ../../general/base_import/import_faq.rst:133 msgid "" "Some fields define a relationship with another object. For example, the " "country of a contact is a link to a record of the 'Country' object. When you" @@ -280,58 +412,58 @@ msgid "" "import." msgstr "" -#: ../../general/base_import/import_faq.rst:86 +#: ../../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 "" -#: ../../general/base_import/import_faq.rst:88 +#: ../../general/base_import/import_faq.rst:137 msgid "Country: the name or code of the country" msgstr "Pays : le nom ou code du pays" -#: ../../general/base_import/import_faq.rst:89 +#: ../../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 "" -#: ../../general/base_import/import_faq.rst:90 +#: ../../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 "" -#: ../../general/base_import/import_faq.rst:92 +#: ../../general/base_import/import_faq.rst:141 msgid "For the country Belgium, you can use one of these 3 ways to import:" msgstr "" -#: ../../general/base_import/import_faq.rst:94 +#: ../../general/base_import/import_faq.rst:143 msgid "Country: Belgium" msgstr "Pays : Belgique" -#: ../../general/base_import/import_faq.rst:95 +#: ../../general/base_import/import_faq.rst:144 msgid "Country/Database ID: 21" msgstr "" -#: ../../general/base_import/import_faq.rst:96 +#: ../../general/base_import/import_faq.rst:145 msgid "Country/External ID: base.be" msgstr "Pays/Id. externe: base.be" -#: ../../general/base_import/import_faq.rst:98 +#: ../../general/base_import/import_faq.rst:147 msgid "" "According to your need, you should use one of these 3 ways to reference " "records in relations. Here is when you should use one or the other, " "according to your need:" msgstr "" -#: ../../general/base_import/import_faq.rst:100 +#: ../../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 "" -#: ../../general/base_import/import_faq.rst:101 +#: ../../general/base_import/import_faq.rst:150 msgid "" "Use Country/Database ID: You should rarely use this notation. It's mostly " "used by developers as it's main advantage is to never have conflicts (you " @@ -339,13 +471,13 @@ msgid "" "Database ID)" msgstr "" -#: ../../general/base_import/import_faq.rst:102 +#: ../../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 "" -#: ../../general/base_import/import_faq.rst:104 +#: ../../general/base_import/import_faq.rst:153 msgid "" "When you use External IDs, you can import CSV files with the \"External ID\"" " column to define the External ID of each record you import. Then, you will " @@ -354,23 +486,23 @@ msgid "" "Products and their Categories." msgstr "" -#: ../../general/base_import/import_faq.rst:106 +#: ../../general/base_import/import_faq.rst:155 msgid "" "`CSV file for categories " "<../../_static/example_files/External_id_3rd_party_application_product_categories.csv>`_." msgstr "" -#: ../../general/base_import/import_faq.rst:108 +#: ../../general/base_import/import_faq.rst:157 msgid "" "`CSV file for Products " "<../../_static/example_files/External_id_3rd_party_application_products.csv>`_." msgstr "" -#: ../../general/base_import/import_faq.rst:112 +#: ../../general/base_import/import_faq.rst:161 msgid "What can I do if I have multiple matches for a field?" msgstr "Que puis-je faire si j'ai plusieurs correspondances pour un champ ?" -#: ../../general/base_import/import_faq.rst:114 +#: ../../general/base_import/import_faq.rst:163 msgid "" "If for example you have two product categories with the child name " "\"Sellable\" (ie. \"Misc. Products/Sellable\" & \"Other " @@ -381,20 +513,20 @@ msgid "" "the duplicates' values or your product category hierarchy." msgstr "" -#: ../../general/base_import/import_faq.rst:116 +#: ../../general/base_import/import_faq.rst:165 msgid "" "However if you do not wish to change your configuration of product " "categories, we recommend you use make use of the external ID for this field " "'Category'." msgstr "" -#: ../../general/base_import/import_faq.rst:121 +#: ../../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 "" -#: ../../general/base_import/import_faq.rst:123 +#: ../../general/base_import/import_faq.rst:172 msgid "" "The tags should be separated by a comma without any spacing. For example, if" " you want your customer to be linked to both tags 'Manufacturer' and " @@ -402,19 +534,19 @@ msgid "" " of your CSV file." msgstr "" -#: ../../general/base_import/import_faq.rst:125 +#: ../../general/base_import/import_faq.rst:174 msgid "" "`CSV file for Manufacturer, Retailer " "<../../_static/example_files/m2m_customers_tags.csv>`_." msgstr "" -#: ../../general/base_import/import_faq.rst:130 +#: ../../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 "" -#: ../../general/base_import/import_faq.rst:132 +#: ../../general/base_import/import_faq.rst:181 msgid "" "If you want to import sales order having several order lines; for each order" " line, you need to reserve a specific row in the CSV file. The first order " @@ -425,41 +557,41 @@ msgid "" "you can import, based on demo data." msgstr "" -#: ../../general/base_import/import_faq.rst:135 +#: ../../general/base_import/import_faq.rst:184 msgid "" "`File for some Quotations " "<../../_static/example_files/purchase.order_functional_error_line_cant_adpat.csv>`_." msgstr "" -#: ../../general/base_import/import_faq.rst:137 +#: ../../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 "" -#: ../../general/base_import/import_faq.rst:139 +#: ../../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 "" -#: ../../general/base_import/import_faq.rst:141 +#: ../../general/base_import/import_faq.rst:190 msgid "" "The following CSV file shows how to import customers and their respective " "contacts:" msgstr "" -#: ../../general/base_import/import_faq.rst:143 +#: ../../general/base_import/import_faq.rst:192 msgid "" "`Customers and their respective contacts " "<../../_static/example_files/o2m_customers_contacts.csv>`_." msgstr "" -#: ../../general/base_import/import_faq.rst:148 +#: ../../general/base_import/import_faq.rst:197 msgid "Can I import several times the same record?" msgstr "Puis-je importer plusieurs fois le même enregistrement ?" -#: ../../general/base_import/import_faq.rst:150 +#: ../../general/base_import/import_faq.rst:199 msgid "" "If you import a file that contains one of the column \"External ID\" or " "\"Database ID\", records that have already been imported will be modified " @@ -469,17 +601,17 @@ msgid "" "depending if it's new or not." msgstr "" -#: ../../general/base_import/import_faq.rst:152 +#: ../../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 "" -#: ../../general/base_import/import_faq.rst:157 +#: ../../general/base_import/import_faq.rst:206 msgid "What happens if I do not provide a value for a specific field?" msgstr "" -#: ../../general/base_import/import_faq.rst:159 +#: ../../general/base_import/import_faq.rst:208 msgid "" "If you do not set all fields in your CSV file, Odoo will assign the default " "value for every non defined fields. But if you set fields with empty values " @@ -487,11 +619,11 @@ msgid "" "assigning the default value." msgstr "" -#: ../../general/base_import/import_faq.rst:164 +#: ../../general/base_import/import_faq.rst:213 msgid "How to export/import different tables from an SQL application to Odoo?" msgstr "" -#: ../../general/base_import/import_faq.rst:166 +#: ../../general/base_import/import_faq.rst:215 msgid "" "If you need to import data from different tables, you will have to recreate " "relations between records belonging to different tables. (e.g. if you import" @@ -499,7 +631,7 @@ msgid "" "person and the company they work for)." msgstr "" -#: ../../general/base_import/import_faq.rst:168 +#: ../../general/base_import/import_faq.rst:217 msgid "" "To manage relations between tables, you can use the \"External ID\" " "facilities of Odoo. The \"External ID\" of a record is the unique identifier" @@ -509,7 +641,7 @@ msgid "" "'company_1', 'person_1' instead of '1')" msgstr "" -#: ../../general/base_import/import_faq.rst:170 +#: ../../general/base_import/import_faq.rst:219 msgid "" "As an example, suppose you have a SQL database with two tables you want to " "import: companies and persons. Each person belong to one company, so you " @@ -519,27 +651,27 @@ msgid "" "PostgreSQL database)" msgstr "" -#: ../../general/base_import/import_faq.rst:172 +#: ../../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 "" -#: ../../general/base_import/import_faq.rst:178 +#: ../../general/base_import/import_faq.rst:227 msgid "This SQL command will create the following CSV file::" msgstr "" -#: ../../general/base_import/import_faq.rst:185 +#: ../../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 "" -#: ../../general/base_import/import_faq.rst:191 +#: ../../general/base_import/import_faq.rst:240 msgid "It will produce the following CSV file::" msgstr "" -#: ../../general/base_import/import_faq.rst:199 +#: ../../general/base_import/import_faq.rst:248 msgid "" "As you can see in this file, Fabien and Laurence are working for the Bigees " "company (company_1) and Eric is working for the Organi company. The relation" @@ -549,7 +681,7 @@ msgid "" " who shared the same ID 1 in the orignial database)." msgstr "" -#: ../../general/base_import/import_faq.rst:201 +#: ../../general/base_import/import_faq.rst:250 msgid "" "The two files produced are ready to be imported in Odoo without any " "modifications. After having imported these two CSV files, you will have 4 " diff --git a/locale/fr/LC_MESSAGES/inventory.po b/locale/fr/LC_MESSAGES/inventory.po index 568fdeccb..d2867be42 100644 --- a/locale/fr/LC_MESSAGES/inventory.po +++ b/locale/fr/LC_MESSAGES/inventory.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-04-20 15:45+0200\n" +"POT-Creation-Date: 2017-05-09 14:24+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Xavier Belmere , 2017\n" "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n" @@ -789,6 +789,10 @@ msgstr "" "réapprovisionnement`. Là, cliquez sur **Créer** pour définir les valeurs de " "stock minimum et maximum pour un article donné." +#: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0 +msgid "Active" +msgstr "" + #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0 msgid "" "If the active field is set to False, it will allow you to hide the " @@ -797,11 +801,19 @@ msgstr "" "Si le champ \"Actif\" n'est pas coché, cela vous permettra de cacher les " "points de commande sans les supprimer." +#: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0 +msgid "Product Unit of Measure" +msgstr "" + #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0 msgid "Default Unit of Measure used for all stock operation." msgstr "" "Unité de mesure par défaut utilisée pour toutes les opérations de stock" +#: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0 +msgid "Procurement Group" +msgstr "" + #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0 msgid "" "Moves created through this orderpoint will be put in this procurement group." @@ -813,6 +825,10 @@ msgstr "" " les règles d'approvisionnement seront regroupés en une seule grande " "préparation." +#: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0 +msgid "Minimum Quantity" +msgstr "" + #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0 msgid "" "When the virtual stock goes below the Min Quantity specified for this field," @@ -823,6 +839,10 @@ msgstr "" " champ, Odoo génère un approvisionnement pour ramener la quantité prévue à " "la quantité maxi." +#: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0 +msgid "Maximum Quantity" +msgstr "" + #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0 msgid "" "When the virtual stock goes below the Min Quantity, Odoo generates a " @@ -833,6 +853,10 @@ msgstr "" "approvisionnement pour ramener la quantité prévue à la quantité indiquée " "ici." +#: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0 +msgid "Quantity Multiple" +msgstr "" + #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0 msgid "" "The procurement quantity will be rounded up to this multiple. If it is 0, " @@ -841,6 +865,10 @@ msgstr "" "La quantité à approvisionner sera arrondie à ce multiple. S'il est à 0, la " "quantité exacte sera utilisée." +#: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0 +msgid "Lead Time" +msgstr "" + #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0 msgid "" "Number of days after the orderpoint is triggered to receive the products or " diff --git a/locale/fr/LC_MESSAGES/point_of_sale.po b/locale/fr/LC_MESSAGES/point_of_sale.po index efd243fe4..5b529aa26 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 Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-04-20 15:45+0200\n" +"POT-Creation-Date: 2017-05-09 14:24+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: matthieu gaillet , 2017\n" "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n" @@ -1975,19 +1975,35 @@ msgid "" "location,..." msgstr "" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Point of Sale Name" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "An internal identification of the point of sale" msgstr "Une identification interne du point de vente" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Sales Journal" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "Accounting journal used to post sales entries." msgstr "" "Journal de comptabilité utilisé pour enregistrer des écritures de vente." +#: ../../point_of_sale/overview/start.rst:0 +msgid "Invoice Journal" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "Accounting journal used to create invoices." msgstr "Journal des comptes utilisé pour la création de factures." +#: ../../point_of_sale/overview/start.rst:0 +msgid "Group Journal Items" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "" "Check this if you want to group the Journal Items by Product while closing a" @@ -1996,6 +2012,10 @@ msgstr "" "Coché si vous voulez regrouper les éléments du journal par article lors de " "la fermeture d'une session." +#: ../../point_of_sale/overview/start.rst:0 +msgid "Barcodes" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "" "Defines what kind of barcodes are available and how they are assigned to " @@ -2004,6 +2024,10 @@ msgstr "" "Definis quel type de code-barres sont disponibles et comment ils sont " "attribués aux produits, clients, et caissiers" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Order IDs Sequence" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "" "This sequence is automatically created by Odoo but you can change it to " @@ -2012,19 +2036,35 @@ msgstr "" "Cette séquence est créée automatiquement par Odoo, mais vous pouvez la " "changer pour personnaliser les références de vos commandes." +#: ../../point_of_sale/overview/start.rst:0 +msgid "Sales Channel" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "This Point of sale's sales will be related to this Sales Channel." msgstr "" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Virtual KeyBoard" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "Enables an integrated Virtual Keyboard" msgstr "Active le clavier virtuel intégré" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Invoicing" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "Enables invoice generation from the Point of Sale" msgstr "" "Active la possibilité de générer des factures depuis le point de vente" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Prefill Cash Payment" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "" "The payment input will behave similarily to bank payment input, and will be " @@ -2033,6 +2073,10 @@ msgstr "" "Ce paiement agira comme un paiement banquaire, et sera pré-rempli avec le " "montant exact " +#: ../../point_of_sale/overview/start.rst:0 +msgid "Start Category" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "" "The point of sale will display this product category by default. If no " @@ -2042,6 +2086,10 @@ msgstr "" " catégorie n'est pas spécifiée, tous les produits disponibles seront " "montrés. " +#: ../../point_of_sale/overview/start.rst:0 +msgid "Tip Product" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "" "The product used to encode the customer tip. Leave empty if you do not " @@ -2050,6 +2098,10 @@ msgstr "" "Le produit utilisé pour encore le pourboire du client. Laissez vide si vous " "n'acceptez pas les pourboires." +#: ../../point_of_sale/overview/start.rst:0 +msgid "Include Taxes in Prices" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "" "The displayed prices will always include all taxes, even if the taxes have " @@ -2058,14 +2110,26 @@ msgstr "" "Les prix affichés contiendrons toujours toutes les taxes, même si les taxes " "ont été mises en place différemment" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Large Scrollbars" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "For imprecise industrial touchscreens" msgstr "Pour les écrans tactiles industriels non-précis" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Display Category Pictures" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "The product categories will be displayed with pictures." msgstr "Les catégories de produits seront affichées avec des photos. " +#: ../../point_of_sale/overview/start.rst:0 +msgid "IP Address" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "" "The hostname or ip address of the hardware proxy, Will be autodetected if " @@ -2074,28 +2138,52 @@ msgstr "" "Nom d'hôte ou adresse IP du proxy matériel. Laissez vide pour utiliser " "l'autodétection." +#: ../../point_of_sale/overview/start.rst:0 +msgid "Barcode Scanner" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "Enable barcode scanning with a remotely connected barcode scanner" msgstr "" "Permet de scanner un code-barre avec un scanner de code-barre connecté sans-" "fil." +#: ../../point_of_sale/overview/start.rst:0 +msgid "Electronic Scale" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "Enables Electronic Scale integration" msgstr "Active l'interface avec une balance électronique" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Cashdrawer" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "Automatically open the cashdrawer" msgstr "Ouvre automatiquement le tiroir-caisse" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Receipt Printer" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "Bypass browser printing and prints via the hardware proxy" msgstr "Impression via le posbox" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Automatic Receipt Printing" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "The receipt will automatically be printed at the end of each order" msgstr "Le reçu sera automatiquement imprimé à la fin de chaque commande. " +#: ../../point_of_sale/overview/start.rst:0 +msgid "Skip Receipt Screen" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "" "The receipt screen will be skipped if the receipt can be printed " @@ -2103,31 +2191,59 @@ msgid "" msgstr "" "L'écran de reçu sera passé si le reçu peut être imprimé automatiquement. " +#: ../../point_of_sale/overview/start.rst:0 +msgid "Header" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "A short text that will be inserted as a header in the printed receipt" msgstr "Un texte court qui sera inséré comme en-tête dans le ticket de reçu" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Footer" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "A short text that will be inserted as a footer in the printed receipt" msgstr "" "Un texte court qui sera inséré comme pied de page dans le ticket de reçu" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Cash Control" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "Check the amount of the cashbox at opening and closing." msgstr "Contrôle de caisse à l'ouverture et à la fermeture." +#: ../../point_of_sale/overview/start.rst:0 +msgid "Bill Splitting" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "Enables Bill Splitting in the Point of Sale" msgstr "Autoriser le partage d'addition en Point de Vente" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Bill Printing" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "Allows to print the Bill before payment" msgstr "Autoriser l'impression de la facture avant le paiement" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Orderline Notes" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "Allow custom notes on Orderlines" msgstr "Autoriser les notes personnalisées sur les lignes de commande" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Restaurant Floors" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "The restaurant floors served by this point of sale" msgstr "Les étages du restaurant servis par ce point de vente" @@ -2881,12 +2997,20 @@ msgid "" "all products or only on specific ones. Click on **Add an item**." msgstr "" +#: ../../point_of_sale/shop/seasonal_discount.rst:0 +msgid "Active" +msgstr "" + #: ../../point_of_sale/shop/seasonal_discount.rst:0 msgid "" "If unchecked, it will allow you to hide the pricelist without removing it." msgstr "" "Décocher cette case permet de masquer la liste de prix sans la supprimer." +#: ../../point_of_sale/shop/seasonal_discount.rst:0 +msgid "Selectable" +msgstr "" + #: ../../point_of_sale/shop/seasonal_discount.rst:0 msgid "Allow the end user to choose this price list" msgstr "Permettre à l'utilisateur final de choisir cette liste de prix" diff --git a/locale/fr/LC_MESSAGES/purchase.po b/locale/fr/LC_MESSAGES/purchase.po index 5d7f2ddd8..7016bf1d6 100644 --- a/locale/fr/LC_MESSAGES/purchase.po +++ b/locale/fr/LC_MESSAGES/purchase.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-04-20 15:45+0200\n" +"POT-Creation-Date: 2017-05-09 14:24+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Nancy Bolognesi , 2017\n" +"Last-Translator: Fabrice Henrion , 2017\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" @@ -2114,10 +2114,18 @@ 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 " @@ -2129,6 +2137,10 @@ msgstr "" "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 " @@ -2137,16 +2149,28 @@ 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 or an internal procurement request)" msgstr "" +#: ../../purchase/purchases/rfq/create.rst:0 +msgid "Deliver To" +msgstr "Livrer à" + #: ../../purchase/purchases/rfq/create.rst:0 msgid "This will determine picking type of incoming shipment" msgstr "Ceci déterminera le type de prélèvement de la réception" +#: ../../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 " @@ -2155,10 +2179,18 @@ 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 " diff --git a/locale/fr/LC_MESSAGES/sales.po b/locale/fr/LC_MESSAGES/sales.po index 52122ce6a..2d26a7643 100644 --- a/locale/fr/LC_MESSAGES/sales.po +++ b/locale/fr/LC_MESSAGES/sales.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Odoo Business 9.0\n" +"Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-23 15:39+0100\n" +"POT-Creation-Date: 2017-05-09 14:24+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Lucas Deliege , 2017\n" "Language-Team: French (https://www.transifex.com/odoo/teams/41243/fr/)\n" @@ -944,16 +944,11 @@ msgstr "" #: ../../sales/invoicing/services/support.rst:66 msgid "" -"There are different ways to track the service related to a sale order or " +"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 "" -"Il existe différentes façons de suivre le service lié à un bon de commande " -"ou à un article vendu. Avec la configuration ci-dessus, vous ne pouvez " -"vendre qu'un contrat d'assistance par commande. Si votre client commande " -"plusieurs contrats d'assistance sur feuilles de temps, vous devrez diviser " -"le devis en plusieurs commandes." #: ../../sales/invoicing/services/support.rst:72 msgid "" @@ -973,21 +968,16 @@ msgid "Managing support contract" msgstr "Gestion d'un contrat d'assistance" #: ../../sales/invoicing/services/support.rst:81 -msgid "Quotations and Sale Orders" -msgstr "Devis et Bons de Commande" +msgid "Quotations and Sales Orders" +msgstr "Devis et bons de commande" #: ../../sales/invoicing/services/support.rst:83 msgid "" -"Once the product is created, you can create a quotation or a sale order with" -" the related product. Once the quotation is confirmed and transformed into a" -" sale order, your users will be able to record services related to this " -"support contract using the timesheet application." +"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 "" -"Une fois que l'article est créé, vous pouvez créer un devis ou un bon de " -"commande avec l'article correspondant. Une fois que le devis est confirmé et" -" transformé en bon de commande, les utilisateurs seront en mesure " -"d'enregistrer les services liés à ce contrat d'assistance en utilisant " -"l'application de feuille de temps." #: ../../sales/invoicing/services/support.rst:93 msgid "Timesheets" @@ -1007,8 +997,8 @@ msgstr "" "services dès qu'il a été vendu." #: ../../sales/invoicing/services/support.rst:104 -msgid "Control delivered support on the sale order" -msgstr "Contrôler l'assistance fournie sur le bon de commande" +msgid "Control delivered support on the sales order" +msgstr "" #: ../../sales/invoicing/services/support.rst:106 msgid "" @@ -1031,32 +1021,14 @@ msgstr "Vente incitative et renouvellement" #: ../../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, the sale order " -"**Invoicing Status** is automatically set to **Upselling**. This means you " -"have an opportunity to sell an extra contract to the customer since he used " -"all his quota of service." +"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`." msgstr "" -"Si le nombre d'heures que vous avez effectuées sur le contrat d'assistance " -"est supérieur ou égal au nombre d'heures que le client a acheté, le ** " -"Status de facturation** du bon de commande est automatiquement réglé sur " -"**Vente incitative**. Cela signifie que vous avez la possibilité de vendre " -"un contrat supplémentaire pour le client depuis qu'il a utilisé tout son " -"quota d'assistance." -#: ../../sales/invoicing/services/support.rst:124 -msgid "" -"Periodically (ideally once every two weeks), you should check the sales " -"order that are in an upselling status. To do this, go to the " -":menuselection:`Sales --> Sales Order` menu and use the **Upselling** filter" -" to get all orders that are in upselling." -msgstr "" -"Périodiquement (idéalement une fois toutes les deux semaines), vous devriez " -"vérifier les bons de commande qui sont dans l'état upselling. Pour ce faire," -" allez au menu :menuselection:`Ventes --> Bons de commande` et utilisez le " -"filtre **Upselling** pour obtenir toutes les commandes qui sont en " -"upselling." - -#: ../../sales/invoicing/services/support.rst:130 +#: ../../sales/invoicing/services/support.rst:127 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 " @@ -1066,26 +1038,20 @@ msgstr "" "opportunité pour chaque bon de commande en upselling afin que vous puissiez " "suivre facilement votre effort de vente incitative." -#: ../../sales/invoicing/services/support.rst:134 +#: ../../sales/invoicing/services/support.rst:131 msgid "" "If you sell an extra support contract, you can either add a new line on the " -"existing sale order (thus, you continue to timesheet on the same order) or " +"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 sale order as **Upselling**, you can set the sale " -"order as done and it will disappear from your upselling list." +"contract). To unmark the sales order as **Upselling**, you can set the sales" +" order as done and it will disappear from your upselling list." msgstr "" -"Si vous vendez un contrat d'assistance supplémentaire, vous pouvez ajouter " -"une nouvelle ligne au bon de commande existant (ainsi, vous continuez à " -"pointer sur le même bon) ou créer une nouvelle commande (alors, les gens " -"vont pointer leurs heures sur le nouveau contrat) . Pour sortir le bon de " -"commande de l'état **Upselling**, vous pouvez définir le bon de commande " -"comme terminé et il disparaîtra de votre liste de upselling." -#: ../../sales/invoicing/services/support.rst:141 +#: ../../sales/invoicing/services/support.rst:138 msgid "Special Configuration" msgstr "Configuration Spéciale" -#: ../../sales/invoicing/services/support.rst:143 +#: ../../sales/invoicing/services/support.rst:140 msgid "" "When creating the product form, you may set a different approach to track " "the service:" @@ -1093,33 +1059,23 @@ 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:146 +#: ../../sales/invoicing/services/support.rst:143 msgid "" "**Create task and track hours**: in this mode, a task is created for every " -"sale order line. Then when you do the timesheet, you don't record hours on a" -" sale order/contract, but you record hours on a task (that represents the " +"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 sale order." +"service contracts within the same sales order." msgstr "" -"**Créer une tâche et suivre les heures** : dans ce mode, une tâche est créée" -" pour chaque ligne de commande. Puis, quand vous faites la feuille de temps," -" vous n'enregistrez pas les heures sur un contrat / bon de commande, mais " -"vous enregistrez les heures sur une tâche (qui représente le contrat). " -"L'avantage de cette solution est qu'elle permet de vendre plusieurs contrats" -" d'assistance dans le même bon de commande." -#: ../../sales/invoicing/services/support.rst:153 +#: ../../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 sale order line directly, in the delivered quantity field." +"manually on the sales order line directly, in the delivered quantity field." msgstr "" -"**Manuellement** : vous pouvez utiliser ce mode si vous n'enregistrez pas de" -" feuilles de temps dans Odoo. Le nombre d'heures travaillées sur un contrat " -"spécifique peut être enregistré manuellement directement sur la ligne de " -"commande, dans le champ quantité livrée." -#: ../../sales/invoicing/services/support.rst:159 +#: ../../sales/invoicing/services/support.rst:156 msgid ":doc:`../../../inventory/settings/products/uom`" msgstr ":doc:`../../../inventory/settings/products/uom`" @@ -1387,16 +1343,11 @@ msgstr ":menuselection:`Commande eCommerce --> Facture`" #: ../../sales/overview/main_concepts/invoicing.rst:69 msgid "" -"An eCommerce order will also trigger the creation of the order when it is " +"An eCommerce order will also trigger the creation of the invoice when it is " "fully paid. If you allow paying orders by check or wire transfer, Odoo only " "creates an order and the invoice will be triggered once the payment is " "received." msgstr "" -"Une commande d'eCommerce déclenchera également la création de la commande " -"lorqu'elle sera entièrement payée. Si vous autorisez le paiement des " -"commandes par chèque ou par virement bancaire, Odoo ne créera que la " -"commande, et la création de la facture ne sera déclenchée qu'une fois le " -"paiement reçu." #: ../../sales/overview/main_concepts/invoicing.rst:75 msgid "Creating an invoice manually" @@ -1711,140 +1662,76 @@ msgid "Manage your products" msgstr "" #: ../../sales/products_prices/products/import.rst:3 -msgid "How to import my products" +msgid "How to import products with categories and variants" msgstr "" -#: ../../sales/products_prices/products/import.rst:6 -msgid "How to start" -msgstr "" - -#: ../../sales/products_prices/products/import.rst:8 -msgid "Download the following import templates:" -msgstr "" - -#: ../../sales/products_prices/products/import.rst:10 +#: ../../sales/products_prices/products/import.rst:5 msgid "" -"Partners: customers, vendors (no relation field, can be imported as is)" +"Import templates are provided in the import tool of the most common data to " +"import (contacts, products, bank statements, etc.). You can open them with " +"any spreadsheets software (Microsoft Office, OpenOffice, Google Drive, " +"etc.)." msgstr "" #: ../../sales/products_prices/products/import.rst:11 -msgid "Products (no relation field, can be imported as is)" -msgstr "" - -#: ../../sales/products_prices/products/import.rst:12 -msgid "Product Website Categories" +msgid "How to customize the file" msgstr "" #: ../../sales/products_prices/products/import.rst:13 -msgid "Product Attributes & Values" +msgid "" +"Remove columns you don't need. We advise to not remove the *ID* one (see why" +" here below)." msgstr "" -#: ../../sales/products_prices/products/import.rst:14 -msgid "Products with Categories & Attributes (3 & 4 must be imported first)" +#: ../../sales/products_prices/products/import.rst:15 +msgid "" +"Set a unique ID to every single record by dragging down the ID sequencing." msgstr "" #: ../../sales/products_prices/products/import.rst:16 msgid "" -"Download link: " -"https://drive.google.com/drive/folders/0B1uIL9E_zXrrTEp5eGI2dXJSUjg?usp=sharing" +"Don't change labels of columns you want to import. Otherwise Odoo won't " +"recognize them anymore and you will have to map them on your own in the " +"import screen." msgstr "" #: ../../sales/products_prices/products/import.rst:18 msgid "" -"You can open them with any spreadsheets software (Microsoft Office, " -"OpenOffice, Google Drive, etc.)." +"To add new columns,Feel free to add new columns but the fields need to exist" +" in Odoo. If Odoo fails in matching the column name with a field, you can " +"make it manually when importing by browsing a list of available fields." msgstr "" -#: ../../sales/products_prices/products/import.rst:21 -msgid "How to customize the file" -msgstr "" - -#: ../../sales/products_prices/products/import.rst:23 -msgid "" -"Remove columns you don't need. Don't remove the first one (called *ID*, see " -"why here below)." -msgstr "" - -#: ../../sales/products_prices/products/import.rst:25 -msgid "" -"Don't change labels of columns you want to import. Otherwse Odoo won't match" -" the columns automatically." -msgstr "" - -#: ../../sales/products_prices/products/import.rst:27 -msgid "" -"Feel free to add new columns but the fields need to exist in Odoo. If Odoo " -"fails in matching the column name with a field, you can make it manually " -"when importing by browsing a list of available fields." -msgstr "" - -#: ../../sales/products_prices/products/import.rst:30 -msgid "Once modified, keep your file in .csv format." -msgstr "" - -#: ../../sales/products_prices/products/import.rst:33 -msgid "How to import the file" -msgstr "" - -#: ../../sales/products_prices/products/import.rst:35 -msgid "Go to the Products menu in Sales, Purchase, Website Admin, etc." -msgstr "" - -#: ../../sales/products_prices/products/import.rst:36 -msgid "Switch to list view (top-right corner)." -msgstr "" - -#: ../../sales/products_prices/products/import.rst:37 -msgid "Click the *Import* button (top-left corner)." -msgstr "" - -#: ../../sales/products_prices/products/import.rst:38 -msgid "" -"Make sure all the columns match an existing field. If not select it manually" -" from the drop-down list." -msgstr "" - -#: ../../sales/products_prices/products/import.rst:40 -msgid "Press * Validate* to test the import." -msgstr "" - -#: ../../sales/products_prices/products/import.rst:41 -msgid "" -"If you get \"Everything seems valid.\" as result message, press *Import* to " -"process the real import. Otherwise correct the issues spotted during the " -"test." -msgstr "" - -#: ../../sales/products_prices/products/import.rst:45 +#: ../../sales/products_prices/products/import.rst:24 msgid "Why an “ID” column" msgstr "" -#: ../../sales/products_prices/products/import.rst:47 +#: ../../sales/products_prices/products/import.rst:26 msgid "" "The ID is an unique identifier for the line item. Feel free to use the one " "of your previous software to ease the transition to Odoo." msgstr "" -#: ../../sales/products_prices/products/import.rst:50 +#: ../../sales/products_prices/products/import.rst:29 msgid "" "Setting an ID is not mandatory when importing but it helps in many cases:" msgstr "" -#: ../../sales/products_prices/products/import.rst:52 +#: ../../sales/products_prices/products/import.rst:31 msgid "" "Update imports: you can import the same file several times without creating " "duplicates;" msgstr "" -#: ../../sales/products_prices/products/import.rst:53 +#: ../../sales/products_prices/products/import.rst:32 msgid "Import relation fields (see here below)." msgstr "" -#: ../../sales/products_prices/products/import.rst:56 +#: ../../sales/products_prices/products/import.rst:35 msgid "How to import relation fields" msgstr "" -#: ../../sales/products_prices/products/import.rst:58 +#: ../../sales/products_prices/products/import.rst:37 msgid "" "An Odoo object is always related to many other objects (e.g. a product is " "linked to product categories, attributes, vendors, etc.). To import those " @@ -1852,7 +1739,7 @@ msgid "" "their own list menu." msgstr "" -#: ../../sales/products_prices/products/import.rst:62 +#: ../../sales/products_prices/products/import.rst:41 msgid "" "You can do it using either the name of the related record or its ID. The ID " "is expected when two records have the same name. In such a case add \" / " diff --git a/locale/nl/LC_MESSAGES/accounting.po b/locale/nl/LC_MESSAGES/accounting.po index 666d46e2f..e869957ea 100644 --- a/locale/nl/LC_MESSAGES/accounting.po +++ b/locale/nl/LC_MESSAGES/accounting.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-04-20 15:45+0200\n" +"POT-Creation-Date: 2017-05-09 14:24+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Stephan Van Dyck , 2017\n" "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n" @@ -98,7 +98,6 @@ msgstr "" #: ../../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/paypal.rst:23 #: ../../accounting/receivables/getting_paid/automated_followups.rst:31 msgid "Configuration" msgstr "Instellingen" @@ -874,7 +873,6 @@ msgstr "" #: ../../accounting/bank/misc/batch.rst:124 #: ../../accounting/payables/pay/sepa.rst:113 -#: ../../accounting/receivables/customer_payments/paypal.rst:134 msgid "Troubleshooting" msgstr "Problemen oplossen" @@ -1587,6 +1585,11 @@ msgid "" "configured as well as the currency of the journal" 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 "" @@ -1605,14 +1608,26 @@ msgstr "" msgid "Select 'General' for miscellaneous operations journals." msgstr "" +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Company" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "Company related to this journal" msgstr "Bedrijf gerelateerd aan dit dagboek" +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Short Code" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "The journal entries of this journal will be named using this prefix." msgstr "De boekingen van dit dagboek worden aangeduid met deze prefix." +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Dedicated Refund Sequence" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "" "Check this box if you don't want to share the same sequence for invoices and" @@ -1621,6 +1636,10 @@ msgstr "" "Vink deze optie aan als u niet dezelfde reeks wil delen voor facturen en " "credit facturen vanuit dit dagboek" +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Entry Sequence" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "" "This field contains the information related to the numbering of the journal " @@ -1629,6 +1648,10 @@ msgstr "" "Dit veld bevat de informatie gerelateerd aan de nummering van de boekingen " "in dit dagboek." +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Refund Entry Sequence" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "" "This field contains the information related to the numbering of the refund " @@ -1637,18 +1660,34 @@ msgstr "" "Dit veld bevat de informatie gerelateerd aan de nummering van de " "creditfacturen reeks van dit dagboek." +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Default Debit Account" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "It acts as a default account for debit amount" msgstr "Dit is de standaard rekening voor het debet bedrag" +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Default Credit Account" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "It acts as a default account for credit amount" msgstr "Dit is de standaard rekening voor het credit bedrag" +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Currency" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "The currency used to enter statement" msgstr "De gebruikte valuta" +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Debit Methods" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "" "Means of payment for collecting money. Odoo modules offer various payments " @@ -1660,6 +1699,10 @@ msgstr "" "betaling om betalingen af te handelen die niet standaard in de toepassing " "zijn opgenomen. " +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Payment Methods" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "" "Means of payment for sending money. Odoo modules offer various payments " @@ -1671,6 +1714,10 @@ msgstr "" "betaling om betalingen af te handelen die niet standaard in de toepassing " "zijn opgenomen. " +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Group Invoice Lines" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "" "If this box is checked, the system will try to group the accounting lines " @@ -1679,6 +1726,10 @@ msgstr "" "Als dit is aangevinkt, dan zal het systeem proberen de boekingsregels te " "groeperen bij het genereren vanaf facturen." +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Profit Account" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "" "Used to register a profit when the ending balance of a cash register differs" @@ -1687,6 +1738,10 @@ msgstr "" "Gebruikt om winst te registreren wanneer de eindsaldo van een kasregister " "verschilt van wat het systeem berekend" +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Loss Account" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "" "Used to register a loss when the ending balance of a cash register differs " @@ -1695,11 +1750,19 @@ msgstr "" "Gebruikt om verlies te registreren wanneer de eindsaldo van een kasregister " "verschilt van wat het systeem berekend" +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Show journal on dashboard" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "Whether this journal should be displayed on the dashboard or not" msgstr "" "Bepaalt of dit dagboek al dan niet getoond moet worden in het dashboard" +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Check Printing Payment Method Selected" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "" "Technical feature used to know whether check printing was enabled as payment" @@ -1708,20 +1771,37 @@ msgstr "" "Technische optie gebruikt om te weten of cheque afdrukken is opgezet als " "betaalmethode." +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Check Sequence" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "Checks numbering sequence." msgstr "Cheques nummering reeks." +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +#: ../../accounting/payables/pay/check.rst:0 +msgid "Manual Numbering" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 #: ../../accounting/payables/pay/check.rst:0 msgid "Check this option if your pre-printed checks are not numbered." msgstr "" "Vink deze optie aan als uw her-afgedrukte cheques niet genummerd zijn." +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Next Check Number" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "Sequence number of the next printed check." msgstr "Reeksnummer van de volgende afgedrukte cheque." +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Active in Point of Sale" +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" @@ -1730,6 +1810,10 @@ msgstr "" "Vink deze optie aan indien dit dagboek een betaalmethode is voor gebruik " "binnen de kassa." +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Amount Authorized Difference" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "" "This field depicts the maximum difference allowed between the ending balance" @@ -1928,6 +2012,10 @@ msgstr "" msgid "Explanation of the fields:" msgstr "Verklaring van de velden:" +#: ../../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 "" @@ -1944,24 +2032,44 @@ msgid "" "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 "Categorie van activa" +#: ../../accounting/others/adviser/assets.rst:0 +msgid "Date" +msgstr "" + #: ../../accounting/others/adviser/assets.rst:0 msgid "Date of asset" msgstr "Datum van activa" +#: ../../accounting/others/adviser/assets.rst:0 +msgid "Gross Value" +msgstr "" + #: ../../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 "" + #: ../../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 "" + #: ../../accounting/others/adviser/assets.rst:0 msgid "Choose the method to use to compute the amount of depreciation lines." msgstr "" @@ -1976,6 +2084,10 @@ 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 depreciation " @@ -1994,6 +2106,10 @@ msgid "" "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 " @@ -2004,10 +2120,18 @@ msgstr "" "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 "" + #: ../../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 "" + #: ../../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" @@ -3516,14 +3640,26 @@ msgstr "" "rapportagedoeleinden en bepaalt de handelswijze bij het afsluiten van het " "boekjaar en het openen van de balans." +#: ../../accounting/others/configuration/account_type.rst:0 +msgid "Tags" +msgstr "" + #: ../../accounting/others/configuration/account_type.rst:0 msgid "Optional tags you may want to assign for custom reporting" msgstr "Optionele labels die u wilt toewijzen voor aangepaste rapportages" +#: ../../accounting/others/configuration/account_type.rst:0 +msgid "Account Currency" +msgstr "" + #: ../../accounting/others/configuration/account_type.rst:0 msgid "Forces all moves for this account to have this account currency." msgstr "Forceert alle boekingen voor deze rekening naar deze tweede valuta." +#: ../../accounting/others/configuration/account_type.rst:0 +msgid "Internal Type" +msgstr "" + #: ../../accounting/others/configuration/account_type.rst:0 msgid "" "The 'Internal Type' is used for features available on different types of " @@ -3534,6 +3670,10 @@ msgstr "" "verschillende rekeningen: liquiditeit is voor kas- en bankrekeningen, " "crediteuren/debiteuren is voor leverancier-/klantfacturen." +#: ../../accounting/others/configuration/account_type.rst:0 +msgid "Allow Reconciliation" +msgstr "" + #: ../../accounting/others/configuration/account_type.rst:0 msgid "" "Check this box if this account allows invoices & payments matching of " @@ -7719,10 +7859,18 @@ msgstr "" msgid "Explanation of the fields of the payment screen:" msgstr "" +#: ../../accounting/payables/pay/check.rst:0 +msgid "Has Invoices" +msgstr "" + #: ../../accounting/payables/pay/check.rst:0 msgid "Technical field used for usability purposes" msgstr "Technisch veld gebruikt voor gebruiksvriendelijke doeleinden" +#: ../../accounting/payables/pay/check.rst:0 +msgid "Hide Payment Method" +msgstr "" + #: ../../accounting/payables/pay/check.rst:0 msgid "" "Technical field used to hide the payment method if the selected journal has " @@ -7731,6 +7879,10 @@ msgstr "" "Technisch veld gebruikt om de betalingsmethode te verbergen als het " "geselecteerde dagboek maar één betaalmethode heeft die 'handmatig' is" +#: ../../accounting/payables/pay/check.rst:0 +msgid "Code" +msgstr "" + #: ../../accounting/payables/pay/check.rst:0 msgid "" "Technical field used to adapt the interface to the payment type selected." @@ -7738,6 +7890,10 @@ msgstr "" "Technisch veld dat gebruikt wordt om de interface te wijzigen naar de " "geselecteerde betalingsmethode." +#: ../../accounting/payables/pay/check.rst:0 +msgid "Check Number" +msgstr "" + #: ../../accounting/payables/pay/check.rst:0 msgid "" "The selected journal is configured to print check numbers. If your pre-" @@ -10017,8 +10173,8 @@ msgstr ":doc:`recording`" #: ../../accounting/receivables/customer_payments/credit_cards.rst:167 #: ../../accounting/receivables/customer_payments/recording.rst:128 -msgid ":doc:`paypal`" -msgstr ":doc:`paypal`" +msgid ":doc:`../../bank/feeds/paypal`" +msgstr "" #: ../../accounting/receivables/customer_payments/credit_cards.rst:169 #: ../../accounting/receivables/customer_payments/recording.rst:130 @@ -10254,210 +10410,6 @@ msgid "" "Reporting (check the KPI average debtors days)." msgstr "" -#: ../../accounting/receivables/customer_payments/paypal.rst:3 -msgid "How to accept paypal payments on invoices?" -msgstr "Hoe Paypal betalingen aanvaarden op uw facturen?" - -#: ../../accounting/receivables/customer_payments/paypal.rst:5 -msgid "" -"The \"Paypal Payment Acquirer\" module allows you to accept payments via " -"paypal, for your sales orders, invoices, or online orders. As paypal accepts" -" payments through credit cards (VISA, Mastercard, …), you will be able to " -"process most payment methods." -msgstr "" - -#: ../../accounting/receivables/customer_payments/paypal.rst:10 -msgid "Paypal support two modes:" -msgstr "Paypal ondersteund twee methodes:" - -#: ../../accounting/receivables/customer_payments/paypal.rst:12 -msgid "" -"Paypal Merchant Account: the user is redirected to paypal to do the payment " -"(either with a credit card or a paypal account)" -msgstr "" - -#: ../../accounting/receivables/customer_payments/paypal.rst:15 -msgid "" -"PayPal PayFlow Pro (S2S, Server 2 Server): the user is not redirected to " -"paypal and the payment can be done in the background. This method is mostly " -"used for subscription businesses where you need to charge your customers " -"periodically." -msgstr "" - -#: ../../accounting/receivables/customer_payments/paypal.rst:20 -msgid "As of today, Odoo only support the normal Paypal Merchant Account." -msgstr "" -"Vanaf vandaag ondersteunt Odoo enkel het normale PayPal handelaars account." - -#: ../../accounting/receivables/customer_payments/paypal.rst:26 -msgid "Install the \"PayPal Payment Acquirer\" module" -msgstr "Installeer de *PayPal betalingsverwerker* module" - -#: ../../accounting/receivables/customer_payments/paypal.rst:28 -msgid "Start by installing the **PayPal Payment Acquirer** module." -msgstr "" - -#: ../../accounting/receivables/customer_payments/paypal.rst:30 -msgid "" -"Once the module is installed, you should see a new payment acquirer in the " -"Setting application, menu \"Payment Acquirers\"." -msgstr "" - -#: ../../accounting/receivables/customer_payments/paypal.rst:36 -msgid "" -"By default, Paypal is configured to work in a test environment, out-of-the-" -"box. It means you can already test the full order to payment flow with the " -"paypal sandbox, without having to configure the next steps." -msgstr "" - -#: ../../accounting/receivables/customer_payments/paypal.rst:42 -msgid "Creating and configuring a PayPal merchant account" -msgstr "Een PayPal handelaarsaccount aanmaken en configureren" - -#: ../../accounting/receivables/customer_payments/paypal.rst:45 -msgid "Create a basic Paypal account" -msgstr "Een basis Paypal account aanmaken" - -#: ../../accounting/receivables/customer_payments/paypal.rst:47 -msgid "Existing or newly created Personal Paypal account can be used." -msgstr "Een bestaand of nieuw persoonlijk PayPal account kan gebruikt worden." - -#: ../../accounting/receivables/customer_payments/paypal.rst:49 -msgid "Or upgrade your account to Business account (merchant) if needed" -msgstr "" - -#: ../../accounting/receivables/customer_payments/paypal.rst:55 -msgid "Paypal Account Summary page" -msgstr "Paypal rekening samenvatting pagina" - -#: ../../accounting/receivables/customer_payments/paypal.rst:58 -msgid "Paypal Configuration" -msgstr "Paypal configuratie" - -#: ../../accounting/receivables/customer_payments/paypal.rst:60 -msgid "" -"Access \"Seller preferences\" menu from `PayPal website " -"`__" -msgstr "" - -#: ../../accounting/receivables/customer_payments/paypal.rst:66 -msgid "" -"Access \"Website preferences\" and configure Auto Return (Payment Data " -"Transfer must be left to Off)" -msgstr "" - -#: ../../accounting/receivables/customer_payments/paypal.rst:69 -msgid "**Database name**: yourcompany" -msgstr "**Database naam**: yourcompany" - -#: ../../accounting/receivables/customer_payments/paypal.rst:70 -#: ../../accounting/receivables/customer_payments/paypal.rst:88 -msgid "**Website URL**: https://yourcompany.odoo.com/" -msgstr "**Website URL**: https://yourcompany.odoo.com/" - -#: ../../accounting/receivables/customer_payments/paypal.rst:71 -msgid "**Return URL**: https://yourcompany.odoo.com/shop/confirmation" -msgstr "**Return URL**: https://yourcompany.odoo.com/shop/confirmation" - -#: ../../accounting/receivables/customer_payments/paypal.rst:76 -msgid "These settings will redirect your buyer to your web confirmation page." -msgstr "" - -#: ../../accounting/receivables/customer_payments/paypal.rst:80 -msgid "Access and edit Instant payment notifications settings - IPN" -msgstr "" - -#: ../../accounting/receivables/customer_payments/paypal.rst:85 -msgid "Example" -msgstr "Voorbeeld" - -#: ../../accounting/receivables/customer_payments/paypal.rst:87 -msgid "**Database name**: \"yourcompany\"" -msgstr "**Database naam**: \"yourcompany\"" - -#: ../../accounting/receivables/customer_payments/paypal.rst:89 -msgid "**Notification URL**: https://yourcompany.odoo.com/payment/paypal/ipn/" -msgstr "**Notificatie URL**: https://yourcompany.odoo.com/payment/paypal/ipn/" - -#: ../../accounting/receivables/customer_payments/paypal.rst:91 -msgid "" -"Verify that your Notify URL uses the correct protocol (HTTP / HTTPS). If you" -" use the odoo.com domain, we advise you to use HTTPS." -msgstr "" - -#: ../../accounting/receivables/customer_payments/paypal.rst:94 -msgid "" -"Set the encoding to UTF-8 from the menu :menuselection:`Settings --> " -"Language Encoding --> More Options --> More selling tools`" -msgstr "" - -#: ../../accounting/receivables/customer_payments/paypal.rst:103 -msgid "" -"Record your Merchant Paypal ID (personal or business account both will have " -"it) it will be entered in Odoo backend :menuselection:`Paypal Settings --> " -"Account Options`." -msgstr "" - -#: ../../accounting/receivables/customer_payments/paypal.rst:111 -msgid "" -"If you want your customers to be able to pay through Paypal while not having" -" a Paypal account- following setting \"Paypal Account Optional\" needs to be" -" set to **ON**. All users will be able to choose Credit/debit card payment " -"option - Paypal account not required." -msgstr "" - -#: ../../accounting/receivables/customer_payments/paypal.rst:120 -msgid "Setup your Paypal Payment Acquirer account credentials in Odoo" -msgstr "" - -#: ../../accounting/receivables/customer_payments/paypal.rst:122 -msgid "" -":menuselection:`Settings --> Payments --> Payment Acquirers --> Paypal`" -msgstr "" - -#: ../../accounting/receivables/customer_payments/paypal.rst:124 -msgid "**Paypal Email ID**: your paypal account email address" -msgstr "" - -#: ../../accounting/receivables/customer_payments/paypal.rst:126 -msgid "**Paypal Merchant ID**: ID retrieved at previous step" -msgstr "" - -#: ../../accounting/receivables/customer_payments/paypal.rst:136 -msgid "" -"If your eCommerce customer gets this Error Message after completing Paypal " -"payment instead of being redirected to your database:" -msgstr "" - -#: ../../accounting/receivables/customer_payments/paypal.rst:142 -msgid "" -"Verify the settings you have `configured in Paypal `_:" -msgstr "" - -#: ../../accounting/receivables/customer_payments/paypal.rst:144 -msgid "" -"Auto Return should be on (the value can be quite generic, like " -"/shop/confirmation; the correct URL will be set for each " -"transaction)" -msgstr "" - -#: ../../accounting/receivables/customer_payments/paypal.rst:148 -msgid "Payment Data Transfer should be off" -msgstr "" - -#: ../../accounting/receivables/customer_payments/paypal.rst:150 -msgid "" -"On-premise databases must be accessible through classic HTTP/HTTPS ports " -"(80/443) for Paypal to work correctly, usually through a reverse proxy. " -"Contact your integrating partner if you are unsure this is the case. " -"Databases hosted on odoo.com are already configured correctly." -msgstr "" - -#: ../../accounting/receivables/customer_payments/paypal.rst:157 -#: ../../accounting/receivables/customer_payments/recording.rst:127 -msgid ":doc:`credit_cards`" -msgstr ":doc:`credit_cards`" - #: ../../accounting/receivables/customer_payments/recording.rst:3 msgid "What are the different ways to record a payment?" msgstr "" @@ -10614,6 +10566,10 @@ msgid "" " with two journal entries for the same transaction." msgstr "" +#: ../../accounting/receivables/customer_payments/recording.rst:127 +msgid ":doc:`credit_cards`" +msgstr ":doc:`credit_cards`" + #: ../../accounting/receivables/getting_paid.rst:3 msgid "How to get paid?" msgstr "Hoe betaald worden?" diff --git a/locale/nl/LC_MESSAGES/discuss.po b/locale/nl/LC_MESSAGES/discuss.po index 15a8e2255..25ab785a4 100644 --- a/locale/nl/LC_MESSAGES/discuss.po +++ b/locale/nl/LC_MESSAGES/discuss.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Odoo Business 9.0\n" +"Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-23 15:39+0100\n" +"POT-Creation-Date: 2017-05-09 14:24+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Yenthe Van Ginneken , 2017\n" "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n" @@ -23,7 +23,7 @@ msgid "Discuss" msgstr "Discussieer" #: ../../discuss/email_servers.rst:3 -msgid "How to use my own email servers to send and receive messages in Odoo" +msgid "How to use my own email servers to send and receive email in Odoo" msgstr "" #: ../../discuss/email_servers.rst:6 @@ -31,138 +31,230 @@ msgid "When is it needed" msgstr "" #: ../../discuss/email_servers.rst:7 -msgid "You need it if you use Odoo Community or Enterprise." -msgstr "" - -#: ../../discuss/email_servers.rst:10 -msgid "What if I use Odoo Online" -msgstr "" - -#: ../../discuss/email_servers.rst:11 msgid "" -"You are done! Odoo Online comes up with an embedded and ready-to-use email " -"server (*@yourcompany.odoo.com*). We recommend to keep this default setting " -"as is as it is really convenient." +"Using your own email servers is required to send and receive messages in " +"Odoo Community or Enterprise. Odoo Online embeds an out-of-box email " +"solution that works straight away. However you can still use your own email " +"servers with the online edition. Some insights are provided here below." +msgstr "" + +#: ../../discuss/email_servers.rst:14 +msgid "How to set it up" msgstr "" #: ../../discuss/email_servers.rst:15 msgid "" -"Indeed, while it is branded by Odoo, the visible source of any message sent " -"from Odoo will be your personal email address (your Odoo login). Your " -"contacts will therefore trust your messages." -msgstr "" - -#: ../../discuss/email_servers.rst:20 -msgid "How does it work when a contact replies to an email sent from Odoo" +"As a system admin, go to :menuselection:`Settings --> General Settings` and " +"check *External Email Servers* (watch out: this checkbox only shows up after" +" Odoo 10). Then, go through the following steps." msgstr "" #: ../../discuss/email_servers.rst:21 msgid "" -"Default reply-to is a generic address used to automatically route any " -"incoming email to the discussion thread of the origin business object " -"(opportunity, order, task, etc.) and to the inbox of all its followers. By " -"default this address is \"catchall@\" but it can be changed. Thanks to it, " -"you get a perfect message thread in Odoo and you don't pollute your external" -" email box with Odoo-related topics." +"Office 365 doesn't allow external hosts like Odoo. Consequently you can't " +"use Office 365 email servers to send or receive messages in Odoo." msgstr "" -#: ../../discuss/email_servers.rst:29 -msgid "How to use my own email servers" -msgstr "" - -#: ../../discuss/email_servers.rst:30 -msgid "" -"You need to be a system admin to set this up. Go to :menuselection:`Settings" -" --> General Settings` and check *External Email Servers* (watch out: this " -"checkbox only shows up after Odoo 10). Then, go through the following steps." -msgstr "" - -#: ../../discuss/email_servers.rst:36 +#: ../../discuss/email_servers.rst:26 msgid "Set an outgoing email server for outbound messages" msgstr "" -#: ../../discuss/email_servers.rst:37 +#: ../../discuss/email_servers.rst:27 msgid "" "You need the SMTP data of your email provider (Gmail, Outlook, Yahoo, AOL, " "etc.) as well as your admin credentials. Once all the information has been " "filled out, click on *Test Connection*." msgstr "" -#: ../../discuss/email_servers.rst:45 +#: ../../discuss/email_servers.rst:35 msgid "Set an incoming email server for inbound messages" msgstr "" -#: ../../discuss/email_servers.rst:46 +#: ../../discuss/email_servers.rst:36 msgid "" "Fill out the form according to your email provider’s settings. Leave the " "*Actions to Perform on Incoming Mails* blank. Once all the information has " "been filled out, click on *TEST & CONFIRM*." msgstr "" -#: ../../discuss/email_servers.rst:53 +#: ../../discuss/email_servers.rst:43 msgid "" "By default inbound messages are fetched every 5 minutes. You can change this" " value in developer mode. Go to :menuselection:`Settings --> Technical --> " "Automation --> Scheduled Actions` and look for *Mail: Fetchmail Service*." msgstr "" -#: ../../discuss/email_servers.rst:59 +#: ../../discuss/email_servers.rst:49 msgid "Set the domain name" msgstr "" -#: ../../discuss/email_servers.rst:60 +#: ../../discuss/email_servers.rst:50 msgid "" "Enter the domain name of your email servers (e.g. mycompany.com) in General " "Settings." msgstr "" -#: ../../discuss/email_servers.rst:67 +#: ../../discuss/email_servers.rst:57 msgid "Create a catchall address" msgstr "" -#: ../../discuss/email_servers.rst:68 +#: ../../discuss/email_servers.rst:58 +msgid "" +"When a contact replies to an email sent from Odoo, the *reply-to* address is" +" a generic address used to route the reply to the right discussion thread in" +" Odoo (opportunity, order, task, etc.) and to the inbox of all its " +"followers. By default this address is \"catchall@\" but it can be changed." +msgstr "" + +#: ../../discuss/email_servers.rst:63 msgid "" "Create a catchall address in your email server settings. We advise you to " "use \"catchall@\" so that everything works out straight away. If you want to" " use another alias, you have extra steps in Odoo:" msgstr "" -#: ../../discuss/email_servers.rst:72 +#: ../../discuss/email_servers.rst:67 msgid "Activate the developer mode from your Settings Dashboard." msgstr "" -#: ../../discuss/email_servers.rst:77 +#: ../../discuss/email_servers.rst:72 msgid "" "Refresh your screen. Then go to :menuselection:`Settings --> Technical --> " "Parameters --> System Parameters` and enter your custom catchall alias in " "*mail.catchall.alias*." msgstr "" -#: ../../discuss/email_servers.rst:84 +#: ../../discuss/email_servers.rst:79 msgid "You can edit the email alias used for bounced messages the same way." msgstr "" -#: ../../discuss/email_servers.rst:87 -msgid "How to perfectly combine Odoo Discuss and my traditional email tool" +#: ../../discuss/email_servers.rst:82 +msgid "How to use my own email servers with Odoo Online" msgstr "" -#: ../../discuss/email_servers.rst:88 +#: ../../discuss/email_servers.rst:83 +msgid "" +"Odoo Online comes up with an embedded and ready-to-use email server " +"(*@yourcompany.odoo.com*). We recommend to keep this default setting as it " +"is really convenient. Indeed, while it is Odoo-labelled, the visible source " +"of any message sent from Odoo will be your personal email address (your Odoo" +" login). Your contacts will therefore trust your messages." +msgstr "" + +#: ../../discuss/email_servers.rst:90 +msgid "" +"You can still use your own email servers if you want your contacts to see " +"your historic email address when they reply to your messages or if you want " +"to manage the reputation of your email servers yourself." +msgstr "" + +#: ../../discuss/email_servers.rst:94 +msgid "There are 2 methods:" +msgstr "" + +#: ../../discuss/email_servers.rst:96 +msgid "" +"[Recommended] **Use a catchall redirection** (your server -> Odoo server) to" +" receive emails in Odoo in real time thanks to the Odoo email server. Create" +" a catchall address in your email server settings. Then apply following " +"redirection: catchall@yourdomain.ext -> catchall@yourcompany.odoo.com. " +"That's it you're ready to go!" +msgstr "" + +#: ../../discuss/email_servers.rst:102 +msgid "" +"**Use a catchall mailbox** to exclusively use your own email server. That " +"way you can also manage your email server reputation (blacklisting, etc). " +"However, incoming messages are fetched from the email server thanks to a " +"cron running every hour. This is the shortest time lap for crons in Online " +"instances. If you opt for this solution, simply follow the procedure of " +"above section." +msgstr "" + +#: ../../discuss/email_servers.rst:111 +msgid "How to be SPF-compliant when using external email servers in Odoo" +msgstr "" + +#: ../../discuss/email_servers.rst:112 +msgid "" +"Sender Policy Framework (SPF) is an email-validation system that checks that" +" incoming mail from a domain comes from a host authorized by that domain's " +"administrator. Such a security system is used in most email servers. If you " +"don't comply with it, your emails sent from Odoo will be likely flagged as " +"spam." +msgstr "" + +#: ../../discuss/email_servers.rst:118 +msgid "" +"To be SPF-compliant, you need to authorize Odoo as a sending host in your " +"domain name settings:" +msgstr "" + +#: ../../discuss/email_servers.rst:121 +msgid "Sign in to your domain’s account at your domain host." +msgstr "" + +#: ../../discuss/email_servers.rst:122 +msgid "Locate the page for updating your domain’s DNS records." +msgstr "" + +#: ../../discuss/email_servers.rst:123 +msgid "" +"If no TXT record is set, create one with following definition: v=spf1 " +"include:_spf.odoo.com ~all" +msgstr "" + +#: ../../discuss/email_servers.rst:125 +msgid "In case a TXT record is already set, add \"include:_spf.odoo.com\"." +msgstr "" + +#: ../../discuss/email_servers.rst:127 +msgid "e.g. for a Gmail server it should be:" +msgstr "" + +#: ../../discuss/email_servers.rst:129 +msgid "v=spf1 include:_spf.odoo.com include:_spf.google.com ~all" +msgstr "" + +#: ../../discuss/email_servers.rst:131 +msgid "" +"Find `here `__ the exact procedure to " +"create or modify TXT records in your own domain registrar." +msgstr "" + +#: ../../discuss/email_servers.rst:134 +msgid "" +"Your new SPF record can take up to 48 hours to go into effect, but this " +"usually happens more quickly." +msgstr "" + +#: ../../discuss/email_servers.rst:137 +msgid "" +"Adding more than one SPF record for a domain can cause problems with mail " +"delivery and spam classification. Instead, we recommend using only one SPF " +"record by modifying it to authorize Odoo." +msgstr "" + +#: ../../discuss/email_servers.rst:142 +msgid "How to choose between Odoo and my traditional email box" +msgstr "" + +#: ../../discuss/email_servers.rst:143 msgid "" "Odoo Discuss is a perfect tool to send and read messages related to business" -" objects. But it doesn't aim to replace a full-featured email software " -"(Gmail, Outlook, Yahoo, AOL, etc.). We recommend to take the most out of " +" documents. However it doesn't aim to replace a full-featured email solution" +" (Gmail, Outlook, Yahoo, AOL, etc.). We recommend to take the most out of " "both systems without mingling them: What is related to Odoo business objects" -" or applications goes into Odoo; What is not stays into your external email " -"boxes." +" or applications goes into Odoo; What is not can be managed into your " +"external email box." msgstr "" -#: ../../discuss/email_servers.rst:95 +#: ../../discuss/email_servers.rst:150 msgid "" "To do so, create specific email aliases to use in Odoo (to generate leads or" " opportunities, helpdesk tickets, etc.). If you take an email alias already " "used for messaging outside of Odoo, incoming messages will land into both " -"systems. This will negatively impact your productivity when it comes to " -"process them." +"systems. This will negatively impact your productivity." msgstr "" #: ../../discuss/mail_twitter.rst:3 diff --git a/locale/nl/LC_MESSAGES/ecommerce.po b/locale/nl/LC_MESSAGES/ecommerce.po index b9a98ef0c..e12122e57 100644 --- a/locale/nl/LC_MESSAGES/ecommerce.po +++ b/locale/nl/LC_MESSAGES/ecommerce.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Odoo Business 9.0\n" +"Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-23 15:39+0100\n" +"POT-Creation-Date: 2017-05-09 14:24+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Erwin van der Ploeg , 2017\n" "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n" @@ -655,23 +655,21 @@ msgid "Launch my website" msgstr "" #: ../../ecommerce/shopper_experience.rst:3 -msgid "Improve shopper experience" +msgid "Get paid" msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:3 -msgid "How to set up payment methods" +msgid "How to get paid with payment acquirers" msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:5 msgid "" -"To collect payments, you can either request your customers to process it " -"manually (e.g. wire transfer) or redirect them to payment acquirers. The " -"payment process described hereunder is common to both eCommerce and online " -"quotations." +"Odoo embeds several payment methods to get paid on eCommerce, Sales and " +"Invoicing apps." msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:10 -msgid "Payment methods" +msgid "What are the payment methods available" msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:13 @@ -681,457 +679,561 @@ msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:15 msgid "" "Wire Transfer is the default payment method available. The aim is providing " -"your customers with your bank details so that they can pay via their bank. " -"This is very easy to start with but slow and inefficient process-wise. Opt " -"for online acquirers as soon as you can!" +"your customers with your bank details so they can pay on their own via their" +" bank. This is very easy to start with but slow and inefficient process-" +"wise. Opt for online acquirers as soon as you can!" msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:21 -msgid "" -"For B2B users: you can create new manually-processed payment methods (check," -" purchase order, etc.) by renaming 'Wire Transfer' or duplicating it." +msgid "Payment acquirers" msgstr "" -#: ../../ecommerce/shopper_experience/payment.rst:25 -msgid "Online payment acquirers" +#: ../../ecommerce/shopper_experience/payment.rst:23 +msgid "" +"Redirect your customers to payment platforms to collect money effortless and" +" track the payment status (call-back). Odoo supports more and more platforms" +" over time:" msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:27 -msgid "" -"Redirect your customers to payment acquirer platforms to collect money " -"effortless. Odoo supports more and more platforms over time: Paypal, " -"Ingenico, Authorize.net, etc. Once the payment accepted, orders are " -"confirmed in Odoo so that the delivery & invoicing processes are triggered " -"automatically." +msgid "`Paypal `__" +msgstr "" + +#: ../../ecommerce/shopper_experience/payment.rst:28 +msgid "Ingenico" +msgstr "" + +#: ../../ecommerce/shopper_experience/payment.rst:29 +msgid "Authorize.net" +msgstr "" + +#: ../../ecommerce/shopper_experience/payment.rst:30 +msgid "Adyen" +msgstr "" + +#: ../../ecommerce/shopper_experience/payment.rst:31 +msgid "Buckaroo" +msgstr "" + +#: ../../ecommerce/shopper_experience/payment.rst:32 +msgid "PayUmoney" msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:33 -msgid "Custom (advanced)" +msgid "Sips" msgstr "" -#: ../../ecommerce/shopper_experience/payment.rst:35 -msgid "" -"Can be used to request payments to any payment acquirer not listed in Odoo." +#: ../../ecommerce/shopper_experience/payment.rst:34 +msgid "Stripe" msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:38 -msgid "Edit a payment method" +msgid "How to go live" msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:40 msgid "" -"To make payment methods intuitive for your customers feel free to customize " -"them by editing:" -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:42 -msgid "the name," -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:44 -msgid "the picture," -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:46 -msgid "" -"the notification messages (thank you & next step, error, cancellation)." +"Once the payment method ready, make it visible in the payment interface and " +"activate the **Production** mode." msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:48 +msgid "How to let customers save and reuse credit cards" +msgstr "" + +#: ../../ecommerce/shopper_experience/payment.rst:49 msgid "" -"Go to :menuselection:`Website Admin --> Configuration --> Payment Acquirers`" -" to do so." +"To ease the payment of returning customers, you can let them save and reuse " +"a credit card if they want to. If so, a payment token will be saved in Odoo." +" This option is available with Ingenico and Authorize.net." msgstr "" -#: ../../ecommerce/shopper_experience/payment.rst:51 -msgid "Generic setup" -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:53 -msgid "Review the elements here above." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:55 -msgid "Enter your credentials (online acquirers only)." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:57 -msgid "Choose your order confirmation preference (see below)." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:59 -msgid "Publish the payment method." +#: ../../ecommerce/shopper_experience/payment.rst:54 +#: ../../ecommerce/shopper_experience/payment.rst:68 +msgid "You can turn this on from the acquirer configuration form." msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:61 -msgid "Test the payment flow in *Test* mode (default mode)." +msgid "How to debit credit cards to pay subscriptions" msgstr "" -#: ../../ecommerce/shopper_experience/payment.rst:63 -msgid "Switch to *Production* mode." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:65 +#: ../../ecommerce/shopper_experience/payment.rst:62 msgid "" -"Se your default payment acquirer in :menuselection:`Accounting --> " -"Configuration --> Settings`. It will be auto-selected for your customers " -"when they enter the payment screen." +"`Odoo Subscription `__ allows to " +"bill services automatically on a recurring basis. Along with it, you can " +"have an automatic debit of the customer's credit card." msgstr "" -#: ../../ecommerce/shopper_experience/payment.rst:69 +#: ../../ecommerce/shopper_experience/payment.rst:66 +msgid "This option is available with Ingenico and Authorize.net." +msgstr "" + +#: ../../ecommerce/shopper_experience/payment.rst:73 msgid "" -"Rely on the documentation related to your payment acquirer to go through " -"step 2, 5 and 6. Some acquirers provides you with specific credentials for " -"test and production modes (Paypal). Others let you switch mode in their " -"setup interface (Authorize.net)." +"That way a payment token will be recorded when the customer goes for the " +"subscription and an automatic debit will occur whenever an invoice is issued" +" from the subscription." msgstr "" -#: ../../ecommerce/shopper_experience/payment.rst:74 +#: ../../ecommerce/shopper_experience/payment.rst:79 +msgid "How to use other acquirers (advanced)" +msgstr "" + +#: ../../ecommerce/shopper_experience/payment.rst:81 msgid "" -"With Ingenico and Authorize.net, you can let your customers save and reuse a" -" payment card to accelerate the process on next checkouts. See *Store Card " -"Data* in Configuration tab." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:78 -msgid "Payment flow" -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:80 -msgid "" -"When choosing the payment method, the customer is taken to the payment " -"acquirer interface to process the payment." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:83 -msgid "" -"Once done he is taken back to Odoo's confirmation page. The transaction " -"status shows up:" +"Odoo can submit single payment requests and redirect to any payment " +"acquirer. But there is no call-back, i.e. Odoo doesn't track the transaction" +" status. So you will confirm orders manually once you get paid." msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:85 -msgid "" -"*Pending*: the order will be confirmed as soon as you authorize the " -"transaction in the acquirer interface." +msgid "How to:" msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:87 -msgid "*Confirmed*: the payment has been authorized automatically." +msgid "Switch to developer mode." msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:89 -msgid "" -"A confirmation email is sent to the customer with a copy of the order in " -"pdf. It shows the payment status." +msgid "Take the **Custom** payment method." msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:91 -msgid "Launch the delivery and invoicing from:" -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:93 msgid "" -"eCommerce: :menuselection:`Website Admin --> Orders --> (Unpaid) Orders`," -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:95 -msgid "" -"online quotations: :menuselection:`Sales --> Sales --> Quotations/Sales " -"Orders`." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:97 -msgid "" -"For internal tracking purposes, a link to the transaction status is provided" -" in the sales order." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:100 -msgid "" -"If the customer cancels the payment while on the payment acquirer form, it " -"is taken back to the store page (or online quotation) in order to reprocess " -"the order. The payment is marked as *Cancelled* in Odoo." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:105 -msgid "" -"You can edit the confirmation email template from :menuselection:`Website " -"Admin --> Configuration --> Settings`." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:109 -msgid "Order confirmation preferences" -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:111 -msgid "There are 4 different behaviors available for any payment acquirer." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:114 -msgid "No automatic confirmation" -msgstr "Geen automatische bevestiging" - -#: ../../ecommerce/shopper_experience/payment.rst:116 -msgid "" -"This is the default mode for *Wire Transfer*. It means Odoo does not confirm" -" orders but keep them in an intermediary stage (*Quotation Sent* = *Unpaid " -"Order*). Once you get the payment, you are expected to confirm the order " -"manually to pursue the process (delivery, invoicing)." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:121 -msgid "" -"Authorize the amount and confirm the SO on acquirer confirmation (capture " -"manually)" -msgstr "" -"Autoriseer het bedrag en bevestig de verkooporder bij betalingsverwerker " -"bevestiging (handmatige vastlegging)" - -#: ../../ecommerce/shopper_experience/payment.rst:123 -msgid "" -"Odoo confirms the order as soon as the payment success notification comes " -"in. To get the money however, you need to capture it from your payment " -"transaction. In lots of countries you are indeed requested to deliver your " -"goods before capturing the amount." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:128 -msgid "" -"Authorize & capture the amount and confirm the SO on acquirer confirmation" -msgstr "" -"Autoriseren en vastleggen van het bedrag en bevestig de verkooporder bij " -"betalingsverwerker bevestiging" - -#: ../../ecommerce/shopper_experience/payment.rst:130 -msgid "" -"This is the default mode for payment acquirers. The amount is captured " -"automatically." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:133 -msgid "" -"For B2B: if you use a manual payment method like *Wire Transfer* and don't " -"expect any upfront payment to launch the delivery, switch to this mode as " -"well." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:137 -msgid "" -"Authorize & capture the amount, confirm the SO and auto-validate the invoice" -" on acquirer confirmation" -msgstr "" -"Autoriseren en vastleggen van het bedrag, bevestig de verkooporder en " -"valideer automatisch de factuur bij betalingsverwerker bevestiging" - -#: ../../ecommerce/shopper_experience/payment.rst:139 -msgid "" -"If you invoice upfront and not at the delivery, switch to this last mode to " -"automate everything. You are requested to select a Payment Journal to record" -" such payments (see " -":doc:`../../accounting/receivables/customer_payments/credit_cards`)." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:144 -msgid "Custom payment acquirers (advanced)" -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:146 -msgid "" -"Odoo can submit payment requests and redirect to any payment acquirer. In " -"such a case, you need to confirm the sale manually in Odoo once you get paid" -" because Odoo cannot read any payment status sent by the acquirer." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:150 -msgid "To configure this:" -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:152 -msgid "switch to developer mode," -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:154 -msgid "edit the *Custom* payment method," -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:156 -msgid "" -"set up the payment form (S2S Form Template) as instructed by your payment " +"Set up the payment form (S2S Form Template) as instructed by your payment " "acquirer. You can start from *default_acquirer_button* that you can " "duplicate." msgstr "" -#: ../../ecommerce/shopper_experience/payment.rst:160 -msgid "Recurring payments & Installment plans" +#: ../../ecommerce/shopper_experience/payment.rst:96 +msgid "Other configurations" msgstr "" -#: ../../ecommerce/shopper_experience/payment.rst:162 +#: ../../ecommerce/shopper_experience/payment.rst:98 msgid "" -"The Ingenico integration allows you to process and manage recurring payments" -" from Odoo Subscriptions app out-of-the-box (more information coming soon)." +"Odoo can also be used for more advanced payment processes like installment " +"plans (e.g. `Paypal Installment Plans " +"`__)." msgstr "" -#: ../../ecommerce/shopper_experience/payment.rst:165 +#: ../../ecommerce/shopper_experience/payment.rst:102 msgid "" -"With some customization, Odoo can also trigger installment plans if this is " -"permitted by your payment acquirer’s API:" +"Such a customization service is made on-demand by our technical experts " +"based on your own requirements. A business advisor can reach you out for " +"such matter. `Contact us. `__" msgstr "" -#: ../../ecommerce/shopper_experience/payment.rst:168 -msgid "" -"e.g. Paypal Installment Plans (see https://developer.paypal.com/docs/classic" -"/paypal-payments-standard/integration-guide/installment_buttons)." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:170 -msgid "" -"Such a service is made on-demand by our technical experts based on your own " -"requirements. Ask our business advisors at info@odoo.com." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:175 +#: ../../ecommerce/shopper_experience/payment.rst:109 msgid ":doc:`paypal`" msgstr ":doc:`paypal`" +#: ../../ecommerce/shopper_experience/payment.rst:110 +msgid ":doc:`wire_transfer`" +msgstr "" + +#: ../../ecommerce/shopper_experience/payment.rst:111 +#: ../../ecommerce/shopper_experience/paypal.rst:155 +msgid ":doc:`payment_acquirer`" +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:3 +msgid "How to manage orders paid with payment acquirers" +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:5 +msgid "" +"Odoo confirms orders automatically as soon as the payment is authorized by a" +" payment acquirer. This triggers the delivery. If you invoice based on " +"ordered quantities, you are also requested to invoice the order." +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:12 +msgid "What are the payment status" +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:13 +msgid "" +"At anytime, the salesman can check the transaction status from the order." +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:18 +msgid "*Draft*: transaction under processing." +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:20 +msgid "" +"*Pending*: the payment acquirer keeps the transaction on hold and you need " +"to authorize it from the acquirer interface." +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:23 +msgid "" +"*Authorized*: the payment has been authorized but not yet captured. In Odoo," +" the order is already confirmed. Once the delivery done, you can capture the" +" amount from the acquirer interface (or from Odoo if you use Authorize.net)." +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:28 +msgid "" +"*Done*: the payment is authorized and captured. The order has been " +"confirmed." +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:30 +msgid "" +"*Error*: an error has occured during the transaction. The customer needs to " +"retry the payment. The order is still in draft." +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:34 +msgid "" +"*Cancelled*: when the customer cancels the payment in the payment acquirer " +"form. They are taken back to Odoo in order to modify the order." +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:37 +msgid "" +"Specific messages are provided to your customers for every payment status, " +"when they are redirected to Odoo after the transaction. To edit such " +"messages, go to the *Messages* tab of the payment method." +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:44 +msgid "Auto-validate invoices at order" +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:46 +msgid "" +"When the order is confirmed you can also have an invoice automatically " +"issued and paid. This fully-automated made for businesses that invoice " +"orders straight on." +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:53 +msgid "" +"If you choose this mode you are requested to select a payment journal in " +"order to record payments in your books. This payment is automatically " +"reconcilied with the invoice, marking it as paid. Select your **bank " +"account** if you get paid immediately on your bank account. If you don't you" +" can create a specific journal for the payment acquirer (type = Bank). That " +"way, you can track online payments in an intermediary account of your books " +"until you get paid into your bank account (see `How to register credit card " +"payments " +"<../../accounting/receivables/customer_payments/credit_cards.html>`__)." +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:64 +msgid "Capture the payment after the delivery" +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:65 +msgid "" +"With this mode, the order is confirmed but the amount is kept on hold. Once " +"the delivery processed, you can capture the payment from Odoo. This mode is " +"only available with Authorize.net." +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:72 +msgid "" +"To capture the payment, open the transaction from the order. Then click " +"*Capture Transaction*." +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:78 +msgid "" +"With other payment acquirers, you can manage the capture in their own " +"interfaces, not from Odoo." +msgstr "" + #: ../../ecommerce/shopper_experience/paypal.rst:3 -msgid "How to collect payments with Paypal" +msgid "How to get paid with Paypal" msgstr "" #: ../../ecommerce/shopper_experience/paypal.rst:5 msgid "" -"Paypal is the easiest payment method to configure. It is also the only one " -"without any subscription free." -msgstr "" - -#: ../../ecommerce/shopper_experience/paypal.rst:9 -msgid "Setup your Paypal account" +"Paypal is the easiest online payment method to configure. It is also the " +"only one without any subscription free. We definitely advise it to any " +"starter." msgstr "" #: ../../ecommerce/shopper_experience/paypal.rst:11 -msgid "" -"1. Create a business account at Paypal.com (see: https://www.paypal.com/in" -"/cgi-bin/webscr?cmd=xpt/Marketing/general/how-to-set-up-a-paypal-account-" -"outside) or upgrade your account to Business account (merchant) if you have " -"a basic account." +msgid "Set up your Paypal account" msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:15 +#: ../../ecommerce/shopper_experience/paypal.rst:13 msgid "" -"2. Log in to your account at Paypal.com and go to :menuselection:`My Account" -" --> Profile --> My Selling Tools`. There click *PayPal button language " -"encoding* under *More Selling Tools* section. Then, click *More Options* and" -" replace the two default encoding formats by *UTF-8*." +"Create a `Paypal Business Account `__ or upgrade " +"your account to *Business account* if you have a basic account." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:20 -msgid "Open Paypal setup form in Odoo and enter your *Email ID*." +#: ../../ecommerce/shopper_experience/paypal.rst:16 +msgid "" +"Log in to `Paypal `__ and open the settings of your " +"**Profile**." msgstr "" #: ../../ecommerce/shopper_experience/paypal.rst:22 -msgid "" -"4. The Paypal Merchant ID is not mandatory (extra verification level). It is" -" provided in Paypal under :menuselection:`My Account --> Overview`." +msgid "Now enter the menu **My selling tools**." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:25 -msgid "" -"5. Configure the IPN feedback (Paypal contacting your Odoo instance without " -"needing the redirection). The setting can be found in " -":menuselection:`Profile --> My Selling Tools --> Instant payment " -"notification`. Activate it and set it to " -"/payment/paypal/ipn." +#: ../../ecommerce/shopper_experience/paypal.rst:27 +msgid "Let's start with the **Website Preferences**." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:30 +#: ../../ecommerce/shopper_experience/paypal.rst:29 msgid "" -"6. To test the workflow, you can create sandbox accounts by logging in at " -"https://developer.paypal.com/webapps/developer/applications/myapps with the " -"same Paypal credentials. Two default sandbox accounts are automatically " -"generated when you register to Paypal: one is a buyer, the other is a " -"shopper." +"Turn on **Auto Return** and enter the **Return URL**: " +"/shop/confirmation. Verify that this address uses the " +"correct protocol (HTTP/HTTPS)." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:35 +#: ../../ecommerce/shopper_experience/paypal.rst:36 msgid "" -"7. Log in with your buyer sandbox account to https://www.sandbox.paypal.com " -"(same password than real account) and apply the same format change." +"Turn on **Payment Data Transfer**. When saving, an **Identity Token** is " +"generated. You will be later requested to enter it in Odoo." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:39 +#: ../../ecommerce/shopper_experience/paypal.rst:43 msgid "" -"To automatically redirect your customers when the payment is completed, go " -"to your Website Preferences and turn *Auto Return* on. Set *Return URL* to " -"/shop/confirmation. Verify that your *Notify URL* uses " -"the correct protocol (HTTP/HTTPS)." +"Then, get back to your profile to activate the **Instant Payment " +"Notification (IPN)** in *My selling tools*." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:44 -msgid "" -"If you want your customers to pay without creating a Paypal account, *Paypal" -" Account Optional* needs to be turned on." +#: ../../ecommerce/shopper_experience/paypal.rst:46 +msgid "Enter the **Notification URL**: /payment/paypal/ipn" msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:48 +#: ../../ecommerce/shopper_experience/paypal.rst:51 +msgid "" +"Now you must change the encoding format of the payment request sent by Odoo " +"to Paypal. To do so, get back to *My selling tools* and click **PayPal " +"button language encoding** in *More Selling Tools* section." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:58 +msgid "" +"Then, click *More Options* and set the two default encoding formats as " +"**UTF-8**." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:66 +msgid "" +"If you want your customers to pay without creating a Paypal account, " +"**Paypal Account Optional** needs to be turned on." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:74 +msgid "Set up Paypal's payment method in Odoo" +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:75 +msgid "" +"Open Paypal setup form in :menuselection:`Website or Sales or Accounting -->" +" Settings --> Payment Acquirers+`. Enter both your **Email ID** and your " +"**Merchant ID** and check **Use IPN**." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:82 +msgid "" +"They are both provided in your Paypal profile, under :menuselection:`My " +"business info`." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:85 +msgid "" +"Enter your **Identity Token** in Odoo (from *Auto Return* option). To do so," +" open the *Settings* and activate the **Developer Mode**." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:91 +msgid "" +"Then, go to :menuselection:`Settings --> Technical --> Parameters --> System" +" Parameters` and create a parameter with following values:" +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:94 +msgid "Key: payment_paypal.pdt_token" +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:95 +msgid "Value: your Paypal *Identity Token*" +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:102 +msgid "Go live" +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:103 +msgid "" +"Your configuration is now ready! You can make Paypal visible on your " +"merchant interface and activate the **Production mode**." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:112 msgid "Transaction fees" msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:50 +#: ../../ecommerce/shopper_experience/paypal.rst:114 msgid "" "You can charge an extra to the customer to cover the transaction fees Paypal" " charges you. Once redirected to Paypal, your customer sees an extra applied" " to the order amount." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:53 +#: ../../ecommerce/shopper_experience/paypal.rst:117 msgid "" -"To activate this, go to the *Configuration* tab and check *Add Extra Fees*. " -"Default fees are the ones charged by Paypal." +"To activate this, go to the *Configuration* tab of Paypal config form in " +"Odoo and check *Add Extra Fees*. Default fees for US can be seen here below." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:123 +msgid "" +"To apply the right fees for your country, please refer to `Paypal Fees " +"`__." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:128 +msgid "Test the payment flow" +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:130 +msgid "" +"You can test the entire payment flow thanks to Paypal Sandbox accounts." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:132 +msgid "" +"Log in to `Paypal Developer Site `__ with your" +" Paypal credentials. This will create two sandbox accounts:" +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:136 +msgid "" +"A business account (to use as merchant, e.g. " +"pp.merch01-facilitator@example.com)." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:137 +msgid "" +"A default personal account (to use as shopper, e.g. " +"pp.merch01-buyer@example.com)." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:139 +msgid "" +"Log in to `Paypal Sandbox `__ with the " +"merchant account and follow the same configuration instructions." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:142 +msgid "" +"Enter your sandbox credentials in Odoo and make sure Paypal is still set on " +"*Test* mode. Also, make sure the confirmation mode of Paypal is not " +"*Authorize & capture the amount, confirm the SO and auto-validate the " +"invoice on acquirer confirmation*. Otherwise a confirmed invoice will be " +"automatically generated when the transaction is completed." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:150 +msgid "Run a test transaction from Odoo using the sandbox personal account." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:154 +msgid ":doc:`payment`" msgstr "" #: ../../ecommerce/shopper_experience/portal.rst:3 -msgid "How customers can access their portal" +msgid "How customers can access their customer account" msgstr "" #: ../../ecommerce/shopper_experience/portal.rst:5 msgid "" -"It has never been so easy for your customers to access their documents " -"through a portal. Forget endless signup forms, Odoo makes it as easy as ABC." -" With eCommerce and Online Quotation apps, your customers are requested to " -"create a portal account (name, email, password only) from the very first " -"order confirmation or online quotation email they get from you." +"It has never been so easy for your customers to access their customer " +"account. Forget endless signup forms, Odoo makes it as easy as ABC. They are" +" suggested to sign up (name, email, password) when the order is placed, and " +"not before. Indeed, nothing is more annoying than going through a signup " +"process before buying something." msgstr "" -#: ../../ecommerce/shopper_experience/portal.rst:12 +#: ../../ecommerce/shopper_experience/portal.rst:14 msgid "Sign up" msgstr "Aanmelden" -#: ../../ecommerce/shopper_experience/portal.rst:14 +#: ../../ecommerce/shopper_experience/portal.rst:16 msgid "" -"When clicking the link in the email or when clicking *Sign up* in the " -"checkout process, your customer is directed to the *Sign up* page." -msgstr "" - -#: ../../ecommerce/shopper_experience/portal.rst:21 -msgid "Customer account" +"The invitation to sign up shows up when the customer wants to visualize the " +"order from order confirmation email." msgstr "" #: ../../ecommerce/shopper_experience/portal.rst:23 +msgid "Customer account" +msgstr "" + +#: ../../ecommerce/shopper_experience/portal.rst:25 msgid "" -"Once logged in the customer will access his account by clicking *My Account*" +"Once logged in the customer will access the account by clicking *My Account*" " in the login dropdown menu." msgstr "" -#: ../../ecommerce/shopper_experience/portal.rst:29 +#: ../../ecommerce/shopper_experience/portal.rst:31 msgid "" -"From the portal menu all the customer history can be reviewed. The main " -"address (billing) can also be modified." +"THere they find all their history. The main address (billing) can also be " +"modified." msgstr "" -#: ../../ecommerce/shopper_experience/portal.rst:36 +#: ../../ecommerce/shopper_experience/portal.rst:37 msgid "" -"If a portal user is a contact of a company (*Company* field set in customer " -"detail form), this last will see all the documents of the company and all " -"its other contacts through the portal." +"If the customer is set as a contact of a company in your address book, they " +"will see all the documents whose the customer belongs to this company." +msgstr "" + +#: ../../ecommerce/shopper_experience/wire_transfer.rst:3 +msgid "How to get paid with wire transfers" +msgstr "" + +#: ../../ecommerce/shopper_experience/wire_transfer.rst:5 +msgid "" +"**Wire Transfer** is the default payment method available. The aim is " +"providing your customers with your bank details so they can pay on their " +"own. This is very easy to start with but slow and inefficient process-wise. " +"Opt for payment acquirers as soon as you can!" +msgstr "" + +#: ../../ecommerce/shopper_experience/wire_transfer.rst:13 +msgid "How to provide customers with payment instructions" +msgstr "" + +#: ../../ecommerce/shopper_experience/wire_transfer.rst:14 +msgid "" +"Put your payment instructions in the **Thanks Message** of your payment " +"method." +msgstr "" + +#: ../../ecommerce/shopper_experience/wire_transfer.rst:19 +msgid "They will appear to the customers when they place an order." +msgstr "" + +#: ../../ecommerce/shopper_experience/wire_transfer.rst:26 +msgid "How to manage an order once you get paid" +msgstr "" + +#: ../../ecommerce/shopper_experience/wire_transfer.rst:28 +msgid "" +"Whenever a customer pays by wire transfer, the order stays in an " +"intermediary stage **Quotation Sent** (i.e. unpaid order). When you get " +"paid, you confirm the order manually to launch the delivery." +msgstr "" + +#: ../../ecommerce/shopper_experience/wire_transfer.rst:35 +msgid "How to create other manual payment methods" +msgstr "" + +#: ../../ecommerce/shopper_experience/wire_transfer.rst:37 +msgid "" +"If you manage a B2B business, you can create other manually-processed " +"payment methods like paying by check. To do so, just rename *Wire Transfer* " +"or duplicate it." msgstr "" #: ../../ecommerce/taxes.rst:3 diff --git a/locale/nl/LC_MESSAGES/general.po b/locale/nl/LC_MESSAGES/general.po index d9b587c1e..b653e32f4 100644 --- a/locale/nl/LC_MESSAGES/general.po +++ b/locale/nl/LC_MESSAGES/general.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Odoo Business 9.0\n" +"Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-23 15:39+0100\n" +"POT-Creation-Date: 2017-05-09 14:24+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Eric Geens , 2017\n" "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n" @@ -23,8 +23,8 @@ msgid "General" msgstr "Algemeen" #: ../../general/auth.rst:3 -msgid "Authentification" -msgstr "" +msgid "Authentication" +msgstr "Authenticatie" #: ../../general/auth/google.rst:3 msgid "How to allow users to sign in with their Google account" @@ -84,64 +84,196 @@ msgid "" msgstr "" #: ../../general/base_import.rst:3 -msgid "BASE IMPORT" +msgid "Data Import" +msgstr "" + +#: ../../general/base_import/adapt_template.rst:3 +msgid "How to adapt an import template" +msgstr "" + +#: ../../general/base_import/adapt_template.rst:5 +msgid "" +"Import templates are provided in the import tool of the most common data to " +"import (contacts, products, bank statements, etc.). You can open them with " +"any spreadsheets software (Microsoft Office, OpenOffice, Google Drive, " +"etc.)." +msgstr "" + +#: ../../general/base_import/adapt_template.rst:11 +msgid "How to customize the file" +msgstr "" + +#: ../../general/base_import/adapt_template.rst:13 +msgid "" +"Remove columns you don't need. We advise to not remove the *ID* one (see why" +" here below)." +msgstr "" + +#: ../../general/base_import/adapt_template.rst:15 +#: ../../general/base_import/import_faq.rst:26 +msgid "" +"Set a unique ID to every single record by dragging down the ID sequencing." +msgstr "" + +#: ../../general/base_import/adapt_template.rst:20 +msgid "" +"When you add a new column, Odoo might not be able to map it automatically if" +" its label doesn't fit any field of the system. If so, find the " +"corresponding field using the search." +msgstr "" + +#: ../../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" +msgstr "" + +#: ../../general/base_import/adapt_template.rst:33 +msgid "" +"The **ID** (External ID) is an unique identifier for the line item. Feel " +"free to use the one of your previous software to ease the transition to " +"Odoo." +msgstr "" + +#: ../../general/base_import/adapt_template.rst:36 +msgid "" +"Setting an ID is not mandatory when importing but it helps in many cases:" +msgstr "" + +#: ../../general/base_import/adapt_template.rst:38 +msgid "" +"Update imports: you can import the same file several times without creating " +"duplicates;" +msgstr "" + +#: ../../general/base_import/adapt_template.rst:39 +msgid "Import relation fields (see here below)." +msgstr "" + +#: ../../general/base_import/adapt_template.rst:42 +msgid "How to import relation fields" +msgstr "" + +#: ../../general/base_import/adapt_template.rst:44 +msgid "" +"An Odoo object is always related to many other objects (e.g. a product is " +"linked to product categories, attributes, vendors, etc.). To import those " +"relations you need to import the records of the related object first from " +"their own list menu." +msgstr "" + +#: ../../general/base_import/adapt_template.rst:48 +msgid "" +"You can do it using either the name of the related record or its ID. The ID " +"is expected when two records have the same name. In such a case add \" / " +"ID\" at the end of the column title (e.g. for product attributes: Product " +"Attributes / Attribute / ID)." msgstr "" #: ../../general/base_import/import_faq.rst:3 -msgid "Import CSV file to Odoo" +msgid "How to import data into Odoo" msgstr "" -#: ../../general/base_import/import_faq.rst:8 -msgid "Frequently Asked Questions" -msgstr "Vaak gestelde vragen (FAQ)" +#: ../../general/base_import/import_faq.rst:6 +msgid "How to start" +msgstr "" -#: ../../general/base_import/import_faq.rst:12 -msgid "Need to import data from an other application?" -msgstr "Wilt u gegevens uit een ander programma importeren?" - -#: ../../general/base_import/import_faq.rst:14 +#: ../../general/base_import/import_faq.rst:7 msgid "" -"In order to re-create relationships between different records, you should " -"use the unique identifier from the original application and map it to the " -"**ID** (External ID) column in Odoo. When you import an other record that " -"links to the first one, use **XXX/ID** (XXX/External ID) to the original " -"unique identifier." +"You can import data on any Odoo's business object using either Excel (.xlsx)" +" or CSV (.csv) formats: contacts, products, bank statements, journal entries" +" and even orders!" +msgstr "" + +#: ../../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 "" -"The **ID** (External ID) will also be used to update the original import if " -"you need to re-import modified data later, it's thus good practice to " -"specify it whenever possible." +"There you are provided with templates you can easily populate with your own " +"data. Such templates can be imported in one click; The data mapping is " +"already done." msgstr "" -#: ../../general/base_import/import_faq.rst:21 -msgid "I cannot find the field I want to map my column to?" +#: ../../general/base_import/import_faq.rst:22 +msgid "How to adapt the template" msgstr "" -#: ../../general/base_import/import_faq.rst:23 -msgid "" -"Odoo try to find with some heuristic, based on the first ten lines of the " -"files, the type of field for each columns inside your file. For example if " -"you have a column only containing numbers, only the fields that are of type " -"integer will be displayed for you to choose from. While this behaviour might" -" be good and easy for most cases scenarios, it is also possible that it goes" -" wrong sometimes or that you want to map your column to a field that is not " -"proposed by default." +#: ../../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 "" -"If that happens, you just have to check the **Show all fields for completion" -" (advanced)** option, you will then be able to choose from the complete list" -" of fields for each columns." +msgid "We advise to not remove the **ID** one (see why in the next section)." msgstr "" -#: ../../general/base_import/import_faq.rst:30 +#: ../../general/base_import/import_faq.rst:31 +msgid "" +"When you add a new column, Odoo might not be able to map it automatically if" +" its label doesn't fit any field in Odoo. Don't worry! You can map new " +"columns manually when you test the import. Search the list for the " +"corresponding field." +msgstr "" + +#: ../../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 "" + +#: ../../general/base_import/import_faq.rst:46 +msgid "" +"In order to re-create relationships between different records, you should " +"use the unique identifier from the original application and map it to the " +"**ID** (External ID) column in Odoo. When you import another record that " +"links to the first one, use **XXX/ID** (XXX/External ID) to the original " +"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 "" + +#: ../../general/base_import/import_faq.rst:54 +msgid "" +"The **ID** will also be used to update the original import if you need to " +"re-import modified data later, it's thus good practice to specify it " +"whenever possible." +msgstr "" + +#: ../../general/base_import/import_faq.rst:60 +msgid "I cannot find the field I want to map my column to" +msgstr "" + +#: ../../general/base_import/import_faq.rst:62 +msgid "" +"Odoo tries to find with some heuristic, based on the first ten lines of the " +"files, the type of field for each column inside your file. For example if " +"you have a column only containing numbers, only the fields that are of type " +"*Integer* will be displayed for you to choose from. While this behavior " +"might be good and easy for most cases, it is also possible that it goes " +"wrong or that you want to map your column to a field that is not proposed by" +" default." +msgstr "" + +#: ../../general/base_import/import_faq.rst:71 +msgid "" +"If that happens, you just have to check the ** Show fields of relation " +"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 "" -#: ../../general/base_import/import_faq.rst:32 +#: ../../general/base_import/import_faq.rst:81 msgid "" "Odoo can automatically detect if a column is a date and it will try to guess" " the date format from a set of most used date format. While this process can" @@ -151,7 +283,7 @@ msgid "" " day and which one is the month in a date like '01-03-2016'." msgstr "" -#: ../../general/base_import/import_faq.rst:34 +#: ../../general/base_import/import_faq.rst:83 msgid "" "To view which date format Odoo has found from your file you can check the " "**Date Format** that is shown when clicking on **Options** under the file " @@ -159,7 +291,7 @@ msgid "" " the *ISO 8601* to define the format." msgstr "" -#: ../../general/base_import/import_faq.rst:37 +#: ../../general/base_import/import_faq.rst:86 msgid "" "If you are importing an excel (.xls, .xlsx) file, you can use date cells to " "store dates as the display of dates in excel is different from the way it is" @@ -167,11 +299,11 @@ msgid "" "whatever your locale date format is." msgstr "" -#: ../../general/base_import/import_faq.rst:42 +#: ../../general/base_import/import_faq.rst:91 msgid "Can I import numbers with currency sign (e.g.: $32.00)?" msgstr "" -#: ../../general/base_import/import_faq.rst:44 +#: ../../general/base_import/import_faq.rst:93 msgid "" "Yes, we fully support numbers with parenthesis to represent negative sign as" " well as numbers with currency sign attached to them. Odoo also " @@ -181,56 +313,56 @@ msgid "" "crash." msgstr "" -#: ../../general/base_import/import_faq.rst:46 +#: ../../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:48 +#: ../../general/base_import/import_faq.rst:97 msgid "32.000,00" msgstr "" -#: ../../general/base_import/import_faq.rst:49 +#: ../../general/base_import/import_faq.rst:98 msgid "32000,00" msgstr "" -#: ../../general/base_import/import_faq.rst:50 +#: ../../general/base_import/import_faq.rst:99 msgid "32,000.00" msgstr "" -#: ../../general/base_import/import_faq.rst:51 +#: ../../general/base_import/import_faq.rst:100 msgid "-32000.00" msgstr "" -#: ../../general/base_import/import_faq.rst:52 +#: ../../general/base_import/import_faq.rst:101 msgid "(32000.00)" msgstr "" -#: ../../general/base_import/import_faq.rst:53 +#: ../../general/base_import/import_faq.rst:102 msgid "$ 32.000,00" msgstr "" -#: ../../general/base_import/import_faq.rst:54 +#: ../../general/base_import/import_faq.rst:103 msgid "(32000.00 €)" msgstr "" -#: ../../general/base_import/import_faq.rst:56 +#: ../../general/base_import/import_faq.rst:105 msgid "Example that will not work:" msgstr "" -#: ../../general/base_import/import_faq.rst:58 +#: ../../general/base_import/import_faq.rst:107 msgid "ABC 32.000,00" msgstr "" -#: ../../general/base_import/import_faq.rst:59 +#: ../../general/base_import/import_faq.rst:108 msgid "$ (32.000,00)" msgstr "" -#: ../../general/base_import/import_faq.rst:64 +#: ../../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:66 +#: ../../general/base_import/import_faq.rst:115 msgid "" "By default the Import preview is set on commas as field separators and " "quotation marks as text delimiters. If your csv file does not have these " @@ -238,20 +370,20 @@ msgid "" " CSV file bar after you select your file)." msgstr "" -#: ../../general/base_import/import_faq.rst:68 +#: ../../general/base_import/import_faq.rst:117 msgid "" "Note that if your CSV file has a tabulation as separator, Odoo will not " "detect the separations. You will need to change the file format options in " "your spreadsheet application. See the following question." msgstr "" -#: ../../general/base_import/import_faq.rst:73 +#: ../../general/base_import/import_faq.rst:122 msgid "" "How can I change the CSV file format options when saving in my spreadsheet " "application?" msgstr "" -#: ../../general/base_import/import_faq.rst:75 +#: ../../general/base_import/import_faq.rst:124 msgid "" "If you edit and save CSV files in speadsheet applications, your computer's " "regional settings will be applied for the separator and delimiter. We " @@ -260,17 +392,17 @@ msgid "" "filter settings' > Save)." msgstr "" -#: ../../general/base_import/import_faq.rst:77 +#: ../../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 "" -#: ../../general/base_import/import_faq.rst:82 +#: ../../general/base_import/import_faq.rst:131 msgid "What's the difference between Database ID and External ID?" msgstr "" -#: ../../general/base_import/import_faq.rst:84 +#: ../../general/base_import/import_faq.rst:133 msgid "" "Some fields define a relationship with another object. For example, the " "country of a contact is a link to a record of the 'Country' object. When you" @@ -280,58 +412,58 @@ msgid "" "import." msgstr "" -#: ../../general/base_import/import_faq.rst:86 +#: ../../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 "" -#: ../../general/base_import/import_faq.rst:88 +#: ../../general/base_import/import_faq.rst:137 msgid "Country: the name or code of the country" msgstr "Land: de naam of code van het land" -#: ../../general/base_import/import_faq.rst:89 +#: ../../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 "" -#: ../../general/base_import/import_faq.rst:90 +#: ../../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 "" -#: ../../general/base_import/import_faq.rst:92 +#: ../../general/base_import/import_faq.rst:141 msgid "For the country Belgium, you can use one of these 3 ways to import:" msgstr "" -#: ../../general/base_import/import_faq.rst:94 +#: ../../general/base_import/import_faq.rst:143 msgid "Country: Belgium" msgstr "Land: België" -#: ../../general/base_import/import_faq.rst:95 +#: ../../general/base_import/import_faq.rst:144 msgid "Country/Database ID: 21" msgstr "" -#: ../../general/base_import/import_faq.rst:96 +#: ../../general/base_import/import_faq.rst:145 msgid "Country/External ID: base.be" msgstr "Land/Externe ID: base.be" -#: ../../general/base_import/import_faq.rst:98 +#: ../../general/base_import/import_faq.rst:147 msgid "" "According to your need, you should use one of these 3 ways to reference " "records in relations. Here is when you should use one or the other, " "according to your need:" msgstr "" -#: ../../general/base_import/import_faq.rst:100 +#: ../../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 "" -#: ../../general/base_import/import_faq.rst:101 +#: ../../general/base_import/import_faq.rst:150 msgid "" "Use Country/Database ID: You should rarely use this notation. It's mostly " "used by developers as it's main advantage is to never have conflicts (you " @@ -339,13 +471,13 @@ msgid "" "Database ID)" msgstr "" -#: ../../general/base_import/import_faq.rst:102 +#: ../../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 "" -#: ../../general/base_import/import_faq.rst:104 +#: ../../general/base_import/import_faq.rst:153 msgid "" "When you use External IDs, you can import CSV files with the \"External ID\"" " column to define the External ID of each record you import. Then, you will " @@ -354,23 +486,23 @@ msgid "" "Products and their Categories." msgstr "" -#: ../../general/base_import/import_faq.rst:106 +#: ../../general/base_import/import_faq.rst:155 msgid "" "`CSV file for categories " "<../../_static/example_files/External_id_3rd_party_application_product_categories.csv>`_." msgstr "" -#: ../../general/base_import/import_faq.rst:108 +#: ../../general/base_import/import_faq.rst:157 msgid "" "`CSV file for Products " "<../../_static/example_files/External_id_3rd_party_application_products.csv>`_." msgstr "" -#: ../../general/base_import/import_faq.rst:112 +#: ../../general/base_import/import_faq.rst:161 msgid "What can I do if I have multiple matches for a field?" msgstr "Wat moet ik doen als ik verschillende matches heb voor een veld?" -#: ../../general/base_import/import_faq.rst:114 +#: ../../general/base_import/import_faq.rst:163 msgid "" "If for example you have two product categories with the child name " "\"Sellable\" (ie. \"Misc. Products/Sellable\" & \"Other " @@ -381,20 +513,20 @@ msgid "" "the duplicates' values or your product category hierarchy." msgstr "" -#: ../../general/base_import/import_faq.rst:116 +#: ../../general/base_import/import_faq.rst:165 msgid "" "However if you do not wish to change your configuration of product " "categories, we recommend you use make use of the external ID for this field " "'Category'." msgstr "" -#: ../../general/base_import/import_faq.rst:121 +#: ../../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 "" -#: ../../general/base_import/import_faq.rst:123 +#: ../../general/base_import/import_faq.rst:172 msgid "" "The tags should be separated by a comma without any spacing. For example, if" " you want your customer to be linked to both tags 'Manufacturer' and " @@ -402,19 +534,19 @@ msgid "" " of your CSV file." msgstr "" -#: ../../general/base_import/import_faq.rst:125 +#: ../../general/base_import/import_faq.rst:174 msgid "" "`CSV file for Manufacturer, Retailer " "<../../_static/example_files/m2m_customers_tags.csv>`_." msgstr "" -#: ../../general/base_import/import_faq.rst:130 +#: ../../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 "" -#: ../../general/base_import/import_faq.rst:132 +#: ../../general/base_import/import_faq.rst:181 msgid "" "If you want to import sales order having several order lines; for each order" " line, you need to reserve a specific row in the CSV file. The first order " @@ -425,41 +557,41 @@ msgid "" "you can import, based on demo data." msgstr "" -#: ../../general/base_import/import_faq.rst:135 +#: ../../general/base_import/import_faq.rst:184 msgid "" "`File for some Quotations " "<../../_static/example_files/purchase.order_functional_error_line_cant_adpat.csv>`_." msgstr "" -#: ../../general/base_import/import_faq.rst:137 +#: ../../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 "" -#: ../../general/base_import/import_faq.rst:139 +#: ../../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 "" -#: ../../general/base_import/import_faq.rst:141 +#: ../../general/base_import/import_faq.rst:190 msgid "" "The following CSV file shows how to import customers and their respective " "contacts:" msgstr "" -#: ../../general/base_import/import_faq.rst:143 +#: ../../general/base_import/import_faq.rst:192 msgid "" "`Customers and their respective contacts " "<../../_static/example_files/o2m_customers_contacts.csv>`_." msgstr "" -#: ../../general/base_import/import_faq.rst:148 +#: ../../general/base_import/import_faq.rst:197 msgid "Can I import several times the same record?" msgstr "Kan ik meerdere malen hetzelfde record importeren?" -#: ../../general/base_import/import_faq.rst:150 +#: ../../general/base_import/import_faq.rst:199 msgid "" "If you import a file that contains one of the column \"External ID\" or " "\"Database ID\", records that have already been imported will be modified " @@ -469,17 +601,17 @@ msgid "" "depending if it's new or not." msgstr "" -#: ../../general/base_import/import_faq.rst:152 +#: ../../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 "" -#: ../../general/base_import/import_faq.rst:157 +#: ../../general/base_import/import_faq.rst:206 msgid "What happens if I do not provide a value for a specific field?" msgstr "" -#: ../../general/base_import/import_faq.rst:159 +#: ../../general/base_import/import_faq.rst:208 msgid "" "If you do not set all fields in your CSV file, Odoo will assign the default " "value for every non defined fields. But if you set fields with empty values " @@ -487,11 +619,11 @@ msgid "" "assigning the default value." msgstr "" -#: ../../general/base_import/import_faq.rst:164 +#: ../../general/base_import/import_faq.rst:213 msgid "How to export/import different tables from an SQL application to Odoo?" msgstr "" -#: ../../general/base_import/import_faq.rst:166 +#: ../../general/base_import/import_faq.rst:215 msgid "" "If you need to import data from different tables, you will have to recreate " "relations between records belonging to different tables. (e.g. if you import" @@ -499,7 +631,7 @@ msgid "" "person and the company they work for)." msgstr "" -#: ../../general/base_import/import_faq.rst:168 +#: ../../general/base_import/import_faq.rst:217 msgid "" "To manage relations between tables, you can use the \"External ID\" " "facilities of Odoo. The \"External ID\" of a record is the unique identifier" @@ -509,7 +641,7 @@ msgid "" "'company_1', 'person_1' instead of '1')" msgstr "" -#: ../../general/base_import/import_faq.rst:170 +#: ../../general/base_import/import_faq.rst:219 msgid "" "As an example, suppose you have a SQL database with two tables you want to " "import: companies and persons. Each person belong to one company, so you " @@ -519,27 +651,27 @@ msgid "" "PostgreSQL database)" msgstr "" -#: ../../general/base_import/import_faq.rst:172 +#: ../../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 "" -#: ../../general/base_import/import_faq.rst:178 +#: ../../general/base_import/import_faq.rst:227 msgid "This SQL command will create the following CSV file::" msgstr "" -#: ../../general/base_import/import_faq.rst:185 +#: ../../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 "" -#: ../../general/base_import/import_faq.rst:191 +#: ../../general/base_import/import_faq.rst:240 msgid "It will produce the following CSV file::" msgstr "" -#: ../../general/base_import/import_faq.rst:199 +#: ../../general/base_import/import_faq.rst:248 msgid "" "As you can see in this file, Fabien and Laurence are working for the Bigees " "company (company_1) and Eric is working for the Organi company. The relation" @@ -549,7 +681,7 @@ msgid "" " who shared the same ID 1 in the orignial database)." msgstr "" -#: ../../general/base_import/import_faq.rst:201 +#: ../../general/base_import/import_faq.rst:250 msgid "" "The two files produced are ready to be imported in Odoo without any " "modifications. After having imported these two CSV files, you will have 4 " diff --git a/locale/nl/LC_MESSAGES/inventory.po b/locale/nl/LC_MESSAGES/inventory.po index 452d29738..9216b10e1 100644 --- a/locale/nl/LC_MESSAGES/inventory.po +++ b/locale/nl/LC_MESSAGES/inventory.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-04-20 15:45+0200\n" +"POT-Creation-Date: 2017-05-09 14:24+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Xavier Symons , 2017\n" "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n" @@ -772,6 +772,10 @@ msgid "" "values for a given product." msgstr "" +#: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0 +msgid "Active" +msgstr "" + #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0 msgid "" "If the active field is set to False, it will allow you to hide the " @@ -780,10 +784,18 @@ msgstr "" "Als het actief veld uit staat, kunt u de minimale voorraadregel verbergen " "zonder deze te verwijderen." +#: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0 +msgid "Product Unit of Measure" +msgstr "" + #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0 msgid "Default Unit of Measure used for all stock operation." msgstr "Standaard maateenheid voor alle voorraadhandelingen." +#: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0 +msgid "Procurement Group" +msgstr "" + #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0 msgid "" "Moves created through this orderpoint will be put in this procurement group." @@ -795,6 +807,10 @@ msgstr "" "mutaties, gegenereerd door de verwervingsregel gegroepeerd in één grote " "levering." +#: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0 +msgid "Minimum Quantity" +msgstr "" + #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0 msgid "" "When the virtual stock goes below the Min Quantity specified for this field," @@ -805,6 +821,10 @@ msgstr "" "gespecificeerd in dit veld, zal Odoo een verwervingsopdracht genereren om de" " verwachte voorraad aan te vullen tot de maximale hoeveelheid." +#: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0 +msgid "Maximum Quantity" +msgstr "" + #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0 msgid "" "When the virtual stock goes below the Min Quantity, Odoo generates a " @@ -815,6 +835,10 @@ msgstr "" "gespecificeerd in dit veld, zal Odoo een verwervingsopdracht genereren om de" " verwachte voorraad aan te vullen tot de maximale hoeveelheid." +#: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0 +msgid "Quantity Multiple" +msgstr "" + #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0 msgid "" "The procurement quantity will be rounded up to this multiple. If it is 0, " @@ -823,6 +847,10 @@ msgstr "" "De verwerving hoeveelheid zal worden afgerond op deze veelvoud. Bij 0 wordt " "de exacte hoeveelheid gebruikt." +#: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0 +msgid "Lead Time" +msgstr "" + #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0 msgid "" "Number of days after the orderpoint is triggered to receive the products or " diff --git a/locale/nl/LC_MESSAGES/point_of_sale.po b/locale/nl/LC_MESSAGES/point_of_sale.po index f838e684a..1a738dae8 100644 --- a/locale/nl/LC_MESSAGES/point_of_sale.po +++ b/locale/nl/LC_MESSAGES/point_of_sale.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-04-20 15:45+0200\n" +"POT-Creation-Date: 2017-05-09 14:24+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Cas Vissers , 2017\n" "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n" @@ -2326,18 +2326,34 @@ msgid "" "location,..." msgstr "U kan elke kassa configureren naar uw hardware, locatie,..." +#: ../../point_of_sale/overview/start.rst:0 +msgid "Point of Sale Name" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "An internal identification of the point of sale" msgstr "Een interne identificatie van kassa" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Sales Journal" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "Accounting journal used to post sales entries." msgstr "Financieel dagboek gebruikt voor het maken van de verkoopboekingen." +#: ../../point_of_sale/overview/start.rst:0 +msgid "Invoice Journal" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "Accounting journal used to create invoices." msgstr "Dagboek gebruikt voor het maken van facturen." +#: ../../point_of_sale/overview/start.rst:0 +msgid "Group Journal Items" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "" "Check this if you want to group the Journal Items by Product while closing a" @@ -2346,6 +2362,10 @@ msgstr "" "Vink deze optie aan indien u alle boekingen wilt groeperen per product, bij " "het sluiten van een sessie." +#: ../../point_of_sale/overview/start.rst:0 +msgid "Barcodes" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "" "Defines what kind of barcodes are available and how they are assigned to " @@ -2354,6 +2374,10 @@ msgstr "" "Definieert welke barcodes beschikbaar zijn en hoe ze worden toegewezen aan " "producten, klanten en kassières" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Order IDs Sequence" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "" "This sequence is automatically created by Odoo but you can change it to " @@ -2362,18 +2386,34 @@ msgstr "" "Deze nummering zal automatisch gegenereerd worden door Odoo, maar u kunt ook" " uw eigen nummering samenstellen." +#: ../../point_of_sale/overview/start.rst:0 +msgid "Sales Channel" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "This Point of sale's sales will be related to this Sales Channel." msgstr "" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Virtual KeyBoard" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "Enables an integrated Virtual Keyboard" msgstr "Activeer het geïntegreerde virtuele toetsenbord" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Invoicing" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "Enables invoice generation from the Point of Sale" msgstr "Activeer het aanmaken van facturen door de kassa" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Prefill Cash Payment" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "" "The payment input will behave similarily to bank payment input, and will be " @@ -2382,6 +2422,10 @@ msgstr "" "De betalingsingave gedraagt zich gelijkwaardig aan de bankafschrift ingave " "en wordt automatisch ingevuld met het exacte verschuldigde bedrag" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Start Category" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "" "The point of sale will display this product category by default. If no " @@ -2390,6 +2434,10 @@ msgstr "" "De kassa toont de productcategorieën standaard. Als er geen categorie is " "gespecificeerd worden alle producten getoond" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Tip Product" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "" "The product used to encode the customer tip. Leave empty if you do not " @@ -2398,6 +2446,10 @@ msgstr "" "Het product te encoderen voor de klantenfooi. Laat dit leeg als u geen " "fooien accepteert." +#: ../../point_of_sale/overview/start.rst:0 +msgid "Include Taxes in Prices" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "" "The displayed prices will always include all taxes, even if the taxes have " @@ -2406,14 +2458,26 @@ msgstr "" "De weergegeven prijzen zijn altijd inclusief BTW, zelfs als de BTW anders " "zijn opgezet" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Large Scrollbars" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "For imprecise industrial touchscreens" msgstr "Voor onnauwkeurige industriële touchscreens" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Display Category Pictures" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "The product categories will be displayed with pictures." msgstr "De productcategorieën worden getoond met afbeeldingen." +#: ../../point_of_sale/overview/start.rst:0 +msgid "IP Address" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "" "The hostname or ip address of the hardware proxy, Will be autodetected if " @@ -2422,27 +2486,51 @@ msgstr "" "De hostnaam of het IP adres van de hardware proxy worden automatisch " "gedetecteerd als het veld leeg wordt gelaten." +#: ../../point_of_sale/overview/start.rst:0 +msgid "Barcode Scanner" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "Enable barcode scanning with a remotely connected barcode scanner" msgstr "" "Activeer barcode scannen m.b.v. een op afstand verbonden barcode scanner" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Electronic Scale" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "Enables Electronic Scale integration" msgstr "Activeer de integratie met een electrische weegschaal" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Cashdrawer" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "Automatically open the cashdrawer" msgstr "Open de kassalade automatisch" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Receipt Printer" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "Bypass browser printing and prints via the hardware proxy" msgstr "Niet via de browser afdrukken, maar via de hardware proxy" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Automatic Receipt Printing" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "The receipt will automatically be printed at the end of each order" msgstr "De kassabon wordt automatisch afgedrukt aan het einde van elke order" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Skip Receipt Screen" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "" "The receipt screen will be skipped if the receipt can be printed " @@ -2451,32 +2539,60 @@ msgstr "" "Het kassabon scherm wordt overgeslagen als de kassabon automatisch afgedrukt" " kan worden." +#: ../../point_of_sale/overview/start.rst:0 +msgid "Header" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "A short text that will be inserted as a header in the printed receipt" msgstr "" "Een korte tekst die als koptekst in de afgedrukte bon zal worden ingevoegd" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Footer" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "A short text that will be inserted as a footer in the printed receipt" msgstr "" "Een korte tekst die als voettekst in de afgedrukte bon zal worden ingevoegd" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Cash Control" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "Check the amount of the cashbox at opening and closing." msgstr "Controleer het bedrag van de kas bij het openen en sluiten." +#: ../../point_of_sale/overview/start.rst:0 +msgid "Bill Splitting" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "Enables Bill Splitting in the Point of Sale" msgstr "Sta splitsen van rekeningen toe in het verkooppunt" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Bill Printing" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "Allows to print the Bill before payment" msgstr "Zorgt ervoor dat u de factuur kan afdrukken voor betaling" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Orderline Notes" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "Allow custom notes on Orderlines" msgstr "Sta aangepaste notities toe op orderregels" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Restaurant Floors" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "The restaurant floors served by this point of sale" msgstr "De restaurant verdiepingen bediend met deze kassa" @@ -3378,6 +3494,10 @@ msgstr "" "kan op alle producten gedaan worden of enkel op specifieke producten. Klik " "op **Item toevoegen**." +#: ../../point_of_sale/shop/seasonal_discount.rst:0 +msgid "Active" +msgstr "" + #: ../../point_of_sale/shop/seasonal_discount.rst:0 msgid "" "If unchecked, it will allow you to hide the pricelist without removing it." @@ -3385,6 +3505,10 @@ msgstr "" "Indien niet aangevinkt, kunt u de prijslijst verbergen, zonder deze te " "wissen." +#: ../../point_of_sale/shop/seasonal_discount.rst:0 +msgid "Selectable" +msgstr "" + #: ../../point_of_sale/shop/seasonal_discount.rst:0 msgid "Allow the end user to choose this price list" msgstr "Sta de eindgebruiker toe om de prijslijst te kiezen" diff --git a/locale/nl/LC_MESSAGES/purchase.po b/locale/nl/LC_MESSAGES/purchase.po index 6e3078f33..f5e19efa4 100644 --- a/locale/nl/LC_MESSAGES/purchase.po +++ b/locale/nl/LC_MESSAGES/purchase.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-04-20 15:45+0200\n" +"POT-Creation-Date: 2017-05-09 14:24+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Eric Geens , 2017\n" "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n" @@ -1862,10 +1862,18 @@ msgid "" "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 " @@ -1876,6 +1884,10 @@ msgstr "" "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 " @@ -1884,16 +1896,28 @@ 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 or an internal procurement request)" msgstr "" +#: ../../purchase/purchases/rfq/create.rst:0 +msgid "Deliver To" +msgstr "Leveren aan" + #: ../../purchase/purchases/rfq/create.rst:0 msgid "This will determine picking type of incoming shipment" msgstr "Dit bepaald de ontvangstwijze van de inkomende levering." +#: ../../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 " @@ -1902,11 +1926,19 @@ 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 " diff --git a/locale/nl/LC_MESSAGES/sales.po b/locale/nl/LC_MESSAGES/sales.po index 3971597ba..e0cf4c4f0 100644 --- a/locale/nl/LC_MESSAGES/sales.po +++ b/locale/nl/LC_MESSAGES/sales.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Odoo Business 9.0\n" +"Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-23 15:39+0100\n" +"POT-Creation-Date: 2017-05-09 14:24+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Eric Geens , 2017\n" "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n" @@ -909,16 +909,11 @@ msgstr "" #: ../../sales/invoicing/services/support.rst:66 msgid "" -"There are different ways to track the service related to a sale order or " +"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 "" -"Er zijn verschillende manieren om de diensten gerelateerd aan een " -"verkooporder of verkocht product te volgen. Met de bovenstaande configuratie" -" kan u slechts één ondersteuningscontract per order verkopen. Indien uw " -"klant meerdere ondersteuningscontracten besteld op urenstaat moet u de " -"offerte uitsplitsen in meerdere orders." #: ../../sales/invoicing/services/support.rst:72 msgid "" @@ -937,20 +932,16 @@ msgid "Managing support contract" msgstr "Ondersteuningscontract beheren" #: ../../sales/invoicing/services/support.rst:81 -msgid "Quotations and Sale Orders" +msgid "Quotations and Sales Orders" msgstr "Offertes en verkooporders" #: ../../sales/invoicing/services/support.rst:83 msgid "" -"Once the product is created, you can create a quotation or a sale order with" -" the related product. Once the quotation is confirmed and transformed into a" -" sale order, your users will be able to record services related to this " -"support contract using the timesheet application." +"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 "" -"Eenmaal het product is aangemaakt kan u een offerte of verkooporder aanmaken" -" met het gerelateerde product. Eenmaal de offerte bevestigd is en omgevormd " -"is in een verkooporder kan uw gebruiker de diensten gerelateerd aan het " -"ondersteuningscontract bewaren dankzij de urenstaten applicatie." #: ../../sales/invoicing/services/support.rst:93 msgid "Timesheets" @@ -970,8 +961,8 @@ msgstr "" "vanaf ze verkocht zijn." #: ../../sales/invoicing/services/support.rst:104 -msgid "Control delivered support on the sale order" -msgstr "Controleer geleverde ondersteuning op het verkooporder" +msgid "Control delivered support on the sales order" +msgstr "" #: ../../sales/invoicing/services/support.rst:106 msgid "" @@ -994,31 +985,14 @@ msgstr "Upselling en vernieuwing" #: ../../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, the sale order " -"**Invoicing Status** is automatically set to **Upselling**. This means you " -"have an opportunity to sell an extra contract to the customer since he used " -"all his quota of service." +"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`." msgstr "" -"Als het aantal uren dat u heeft gepresteerd op het ondersteuningscontract " -"groter of gelijk is aan het aantal uren dat de klant heeft aangekocht wordt " -"de verkooporder zijn **Facturatie status** automatisch ingesteld op " -"**Upselling**. Dit betekend dat u een opportuniteit heeft om een extra " -"contract te verkopen aan de klant aangezien hij zijn quota voor de dienst " -"heeft opgebruikt." -#: ../../sales/invoicing/services/support.rst:124 -msgid "" -"Periodically (ideally once every two weeks), you should check the sales " -"order that are in an upselling status. To do this, go to the " -":menuselection:`Sales --> Sales Order` menu and use the **Upselling** filter" -" to get all orders that are in upselling." -msgstr "" -"Periodiek (ideaal elke twee weken), zou u de verkooporders moeten " -"controleren die zich in de upselling status bevinden. Om dit te doen gaat u " -"naar :menuselection:`Verkopen --> Verkooporder` en gebruikt u de " -"**Upselling** filter om alle orders in deze fase te vinden." - -#: ../../sales/invoicing/services/support.rst:130 +#: ../../sales/invoicing/services/support.rst:127 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 " @@ -1028,26 +1002,20 @@ msgstr "" "aan te maken voor elke verkooporder in de factuurstatus zodat u gemakkelijk " "uw upselling kan traceren." -#: ../../sales/invoicing/services/support.rst:134 +#: ../../sales/invoicing/services/support.rst:131 msgid "" "If you sell an extra support contract, you can either add a new line on the " -"existing sale order (thus, you continue to timesheet on the same order) or " +"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 sale order as **Upselling**, you can set the sale " -"order as done and it will disappear from your upselling list." +"contract). To unmark the sales order as **Upselling**, you can set the sales" +" order as done and it will disappear from your upselling list." msgstr "" -"Indien u een extra ondersteuningscontract verkoopt kan u een nieuwe lijn " -"toevoegen aan het bestaande verkooporder (u bewaard dus nog steeds uw " -"urenstaten op hetzelfde order) of u maakt een nieuw order(mensen moeten hun " -"urenstaten op het nieuwe contract boeken). Om de verkooporder te demarkeren " -"als **Upselling** kan u de verkooporder naar de status verwerkt zetten en " -"het zal vervolgens verdwijnen uit uw upselling lijst." -#: ../../sales/invoicing/services/support.rst:141 +#: ../../sales/invoicing/services/support.rst:138 msgid "Special Configuration" msgstr "Speciale configuratie" -#: ../../sales/invoicing/services/support.rst:143 +#: ../../sales/invoicing/services/support.rst:140 msgid "" "When creating the product form, you may set a different approach to track " "the service:" @@ -1055,33 +1023,23 @@ msgstr "" "Wanneer u het productformulier aanmaakt kan u een andere aanpak instellen om" " de dienst op te volgen:" -#: ../../sales/invoicing/services/support.rst:146 +#: ../../sales/invoicing/services/support.rst:143 msgid "" "**Create task and track hours**: in this mode, a task is created for every " -"sale order line. Then when you do the timesheet, you don't record hours on a" -" sale order/contract, but you record hours on a task (that represents the " +"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 sale order." +"service contracts within the same sales order." msgstr "" -"**Maak taken en traceer uren**: In deze modus wordt een taak aangemaakt voor" -" elke verkooporderlijn. Wanneer u vervolgens de urenstaat doet worden er " -"geen uren geregistreerd op de verkooporder / het contract, maar uren op een " -"taak (die het contract voorstelt). Het voordeel van deze oplossing is dat " -"het toestaat om meerdere dienst contracten te verkopen binnen hetzelfde " -"verkooporder." -#: ../../sales/invoicing/services/support.rst:153 +#: ../../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 sale order line directly, in the delivered quantity field." +"manually on the sales order line directly, in the delivered quantity field." msgstr "" -"**Manueel**: u kan deze modus gebruiken indien u geen urenstaten logt in " -"Odoo. Het aantal uren dat u werkt aan een specifiek contract kan direct " -"manueel genoteerd worden op de verkooporder, in het geleverde hoeveelheid " -"veld." -#: ../../sales/invoicing/services/support.rst:159 +#: ../../sales/invoicing/services/support.rst:156 msgid ":doc:`../../../inventory/settings/products/uom`" msgstr ":doc:`../../../inventory/settings/products/uom`" @@ -1349,15 +1307,11 @@ msgstr ":menuselection:`eCommerce Order --> Factuur`" #: ../../sales/overview/main_concepts/invoicing.rst:69 msgid "" -"An eCommerce order will also trigger the creation of the order when it is " +"An eCommerce order will also trigger the creation of the invoice when it is " "fully paid. If you allow paying orders by check or wire transfer, Odoo only " "creates an order and the invoice will be triggered once the payment is " "received." msgstr "" -"Een e-commerce order doet ook het aanmaken van het order afgaan wanneer deze" -" volledig betaald is. Indien u toestaat dat Orders betaald worden via cheque" -" of overschrijving zal Odoo enkel een order aanmaken en wordt de factuur " -"aangemaakt wanneer de betaling ontvangen is." #: ../../sales/overview/main_concepts/invoicing.rst:75 msgid "Creating an invoice manually" @@ -1668,140 +1622,76 @@ msgid "Manage your products" msgstr "" #: ../../sales/products_prices/products/import.rst:3 -msgid "How to import my products" +msgid "How to import products with categories and variants" msgstr "" -#: ../../sales/products_prices/products/import.rst:6 -msgid "How to start" -msgstr "" - -#: ../../sales/products_prices/products/import.rst:8 -msgid "Download the following import templates:" -msgstr "" - -#: ../../sales/products_prices/products/import.rst:10 +#: ../../sales/products_prices/products/import.rst:5 msgid "" -"Partners: customers, vendors (no relation field, can be imported as is)" +"Import templates are provided in the import tool of the most common data to " +"import (contacts, products, bank statements, etc.). You can open them with " +"any spreadsheets software (Microsoft Office, OpenOffice, Google Drive, " +"etc.)." msgstr "" #: ../../sales/products_prices/products/import.rst:11 -msgid "Products (no relation field, can be imported as is)" -msgstr "" - -#: ../../sales/products_prices/products/import.rst:12 -msgid "Product Website Categories" +msgid "How to customize the file" msgstr "" #: ../../sales/products_prices/products/import.rst:13 -msgid "Product Attributes & Values" +msgid "" +"Remove columns you don't need. We advise to not remove the *ID* one (see why" +" here below)." msgstr "" -#: ../../sales/products_prices/products/import.rst:14 -msgid "Products with Categories & Attributes (3 & 4 must be imported first)" +#: ../../sales/products_prices/products/import.rst:15 +msgid "" +"Set a unique ID to every single record by dragging down the ID sequencing." msgstr "" #: ../../sales/products_prices/products/import.rst:16 msgid "" -"Download link: " -"https://drive.google.com/drive/folders/0B1uIL9E_zXrrTEp5eGI2dXJSUjg?usp=sharing" +"Don't change labels of columns you want to import. Otherwise Odoo won't " +"recognize them anymore and you will have to map them on your own in the " +"import screen." msgstr "" #: ../../sales/products_prices/products/import.rst:18 msgid "" -"You can open them with any spreadsheets software (Microsoft Office, " -"OpenOffice, Google Drive, etc.)." +"To add new columns,Feel free to add new columns but the fields need to exist" +" in Odoo. If Odoo fails in matching the column name with a field, you can " +"make it manually when importing by browsing a list of available fields." msgstr "" -#: ../../sales/products_prices/products/import.rst:21 -msgid "How to customize the file" -msgstr "" - -#: ../../sales/products_prices/products/import.rst:23 -msgid "" -"Remove columns you don't need. Don't remove the first one (called *ID*, see " -"why here below)." -msgstr "" - -#: ../../sales/products_prices/products/import.rst:25 -msgid "" -"Don't change labels of columns you want to import. Otherwse Odoo won't match" -" the columns automatically." -msgstr "" - -#: ../../sales/products_prices/products/import.rst:27 -msgid "" -"Feel free to add new columns but the fields need to exist in Odoo. If Odoo " -"fails in matching the column name with a field, you can make it manually " -"when importing by browsing a list of available fields." -msgstr "" - -#: ../../sales/products_prices/products/import.rst:30 -msgid "Once modified, keep your file in .csv format." -msgstr "" - -#: ../../sales/products_prices/products/import.rst:33 -msgid "How to import the file" -msgstr "" - -#: ../../sales/products_prices/products/import.rst:35 -msgid "Go to the Products menu in Sales, Purchase, Website Admin, etc." -msgstr "" - -#: ../../sales/products_prices/products/import.rst:36 -msgid "Switch to list view (top-right corner)." -msgstr "" - -#: ../../sales/products_prices/products/import.rst:37 -msgid "Click the *Import* button (top-left corner)." -msgstr "" - -#: ../../sales/products_prices/products/import.rst:38 -msgid "" -"Make sure all the columns match an existing field. If not select it manually" -" from the drop-down list." -msgstr "" - -#: ../../sales/products_prices/products/import.rst:40 -msgid "Press * Validate* to test the import." -msgstr "" - -#: ../../sales/products_prices/products/import.rst:41 -msgid "" -"If you get \"Everything seems valid.\" as result message, press *Import* to " -"process the real import. Otherwise correct the issues spotted during the " -"test." -msgstr "" - -#: ../../sales/products_prices/products/import.rst:45 +#: ../../sales/products_prices/products/import.rst:24 msgid "Why an “ID” column" msgstr "" -#: ../../sales/products_prices/products/import.rst:47 +#: ../../sales/products_prices/products/import.rst:26 msgid "" "The ID is an unique identifier for the line item. Feel free to use the one " "of your previous software to ease the transition to Odoo." msgstr "" -#: ../../sales/products_prices/products/import.rst:50 +#: ../../sales/products_prices/products/import.rst:29 msgid "" "Setting an ID is not mandatory when importing but it helps in many cases:" msgstr "" -#: ../../sales/products_prices/products/import.rst:52 +#: ../../sales/products_prices/products/import.rst:31 msgid "" "Update imports: you can import the same file several times without creating " "duplicates;" msgstr "" -#: ../../sales/products_prices/products/import.rst:53 +#: ../../sales/products_prices/products/import.rst:32 msgid "Import relation fields (see here below)." msgstr "" -#: ../../sales/products_prices/products/import.rst:56 +#: ../../sales/products_prices/products/import.rst:35 msgid "How to import relation fields" msgstr "" -#: ../../sales/products_prices/products/import.rst:58 +#: ../../sales/products_prices/products/import.rst:37 msgid "" "An Odoo object is always related to many other objects (e.g. a product is " "linked to product categories, attributes, vendors, etc.). To import those " @@ -1809,7 +1699,7 @@ msgid "" "their own list menu." msgstr "" -#: ../../sales/products_prices/products/import.rst:62 +#: ../../sales/products_prices/products/import.rst:41 msgid "" "You can do it using either the name of the related record or its ID. The ID " "is expected when two records have the same name. In such a case add \" / " diff --git a/locale/zh_CN/LC_MESSAGES/accounting.po b/locale/zh_CN/LC_MESSAGES/accounting.po index 5de286264..c138b9713 100644 --- a/locale/zh_CN/LC_MESSAGES/accounting.po +++ b/locale/zh_CN/LC_MESSAGES/accounting.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-04-20 15:45+0200\n" +"POT-Creation-Date: 2017-05-09 14:24+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: 苏州远鼎 , 2017\n" "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n" @@ -92,7 +92,6 @@ msgstr "" #: ../../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/paypal.rst:23 #: ../../accounting/receivables/getting_paid/automated_followups.rst:31 msgid "Configuration" msgstr "配置" @@ -862,7 +861,6 @@ msgstr "如果您选择一批存款, Odoo将自动填充所匹配的支票存款 #: ../../accounting/bank/misc/batch.rst:124 #: ../../accounting/payables/pay/sepa.rst:113 -#: ../../accounting/receivables/customer_payments/paypal.rst:134 msgid "Troubleshooting" msgstr "排查" @@ -1600,6 +1598,11 @@ msgid "" "configured as well as the currency of the journal" 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 "" @@ -1618,44 +1621,80 @@ msgstr "" msgid "Select 'General' for miscellaneous operations journals." msgstr "" +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Company" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "Company related to this journal" msgstr "此日记账相关的公司" +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Short Code" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "The journal entries of this journal will be named using this prefix." msgstr "这个日记账中的日记账分录会被用这个前缀命名" +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Dedicated Refund Sequence" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "" "Check this box if you don't want to share the same sequence for invoices and" " refunds made from this journal" msgstr "如果你不想在此日记账中共用发票和退款的序列号, 请选择这个方框." +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Entry Sequence" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "" "This field contains the information related to the numbering of the journal " "entries of this journal." msgstr "这个字段包含和这个日记中日记账分录数量相关的信息" +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Refund Entry Sequence" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "" "This field contains the information related to the numbering of the refund " "entries of this journal." msgstr "这个字段包含和这个日记账的退款分录的数量相关的信息" +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Default Debit Account" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "It acts as a default account for debit amount" msgstr "它将作为一个默认借方科目" +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Default Credit Account" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "It acts as a default account for credit amount" msgstr "它将充当贷方金额的默认科目" +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Currency" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "The currency used to enter statement" msgstr "货币用来输入状态" +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Debit Methods" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "" "Means of payment for collecting money. Odoo modules offer various payments " @@ -1663,6 +1702,10 @@ msgid "" "order to manage payments outside of the software." msgstr "收钱的付款形式。Odoo模块提供各种各样的付款处理工具，但是你也可以一直在系统外用手工的付款方法管理付款" +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Payment Methods" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "" "Means of payment for sending money. Odoo modules offer various payments " @@ -1670,53 +1713,94 @@ msgid "" "order to manage payments outside of the software." msgstr "付钱的付款形式。Odoo模块提供各种各样的付款处理工具，但是你也可以一直在系统外用手工的付款方法管理付款" +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Group Invoice Lines" +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 "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "" "Used to register a profit when the ending balance of a cash register differs" " from what the system computes" msgstr "当现金出纳机的关账余额与系统计算的有差异时，用于登记利润" +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Loss Account" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "" "Used to register a loss when the ending balance of a cash register differs " "from what the system computes" msgstr "现金登记的期末余额与系统计算的有差异时候用来登记损失" +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Show journal on dashboard" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "Whether this journal should be displayed on the dashboard or not" msgstr "不管这个日记账是否显示在仪表板" +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Check Printing Payment Method Selected" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "" "Technical feature used to know whether check printing was enabled as payment" " method." msgstr "从技术特征可以知道，是否可将支票作为付款方式。" +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Check Sequence" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "Checks numbering sequence." msgstr "支票编号序列。" +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +#: ../../accounting/payables/pay/check.rst:0 +msgid "Manual Numbering" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 #: ../../accounting/payables/pay/check.rst:0 msgid "Check this option if your pre-printed checks are not numbered." msgstr "勾选此选项如果你的预先印制支票是没有编号的。" +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Next Check Number" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "Sequence number of the next printed check." msgstr "下个打印支票的序列编号" +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Active in Point of Sale" +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 "如果这个日记账中定义了能够在‘POS’用的付款方式就勾选这个选项" +#: ../../accounting/bank/setup/manage_cash_register.rst:0 +msgid "Amount Authorized Difference" +msgstr "" + #: ../../accounting/bank/setup/manage_cash_register.rst:0 msgid "" "This field depicts the maximum difference allowed between the ending balance" @@ -1924,6 +2008,10 @@ 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 "当资产被创建，则状态为“草稿”。" @@ -1940,22 +2028,42 @@ msgid "" "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 "选择折旧的计算方式." @@ -1970,6 +2078,10 @@ 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 depreciation " @@ -1988,6 +2100,10 @@ msgid "" "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 " @@ -1995,10 +2111,18 @@ msgid "" "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 "折旧期间，以月计算" @@ -3578,14 +3702,26 @@ msgid "" " entries." msgstr "科目类型用于信息目的，用于生成合乎各国财税规范的报告，以及设置会计年度关闭的规则，并生成期初分录" +#: ../../accounting/others/configuration/account_type.rst:0 +msgid "Tags" +msgstr "" + #: ../../accounting/others/configuration/account_type.rst:0 msgid "Optional tags you may want to assign for custom reporting" msgstr "你可能想赋予给定义报告的选项标签" +#: ../../accounting/others/configuration/account_type.rst:0 +msgid "Account Currency" +msgstr "" + #: ../../accounting/others/configuration/account_type.rst:0 msgid "Forces all moves for this account to have this account currency." msgstr "强制这个科目所有的凭证拥有这个科目的币种" +#: ../../accounting/others/configuration/account_type.rst:0 +msgid "Internal Type" +msgstr "" + #: ../../accounting/others/configuration/account_type.rst:0 msgid "" "The 'Internal Type' is used for features available on different types of " @@ -3593,6 +3729,10 @@ msgid "" " for vendor/customer accounts." msgstr "'内部类型'用于不同类型的科目: 流动性用于现金或银行账户, 应收/应付用于供应商/客户账户。" +#: ../../accounting/others/configuration/account_type.rst:0 +msgid "Allow Reconciliation" +msgstr "" + #: ../../accounting/others/configuration/account_type.rst:0 msgid "" "Check this box if this account allows invoices & payments matching of " @@ -7804,21 +7944,37 @@ msgstr "" msgid "Explanation of the fields of the payment screen:" msgstr "付款界面字段的解释 :" +#: ../../accounting/payables/pay/check.rst:0 +msgid "Has Invoices" +msgstr "" + #: ../../accounting/payables/pay/check.rst:0 msgid "Technical field used for usability purposes" msgstr "技术字段可使用" +#: ../../accounting/payables/pay/check.rst:0 +msgid "Hide Payment Method" +msgstr "" + #: ../../accounting/payables/pay/check.rst:0 msgid "" "Technical field used to hide the payment method if the selected journal has " "only one available which is 'manual'" msgstr "当所选的账设置为“手动”, 支付方式的字段被隐藏." +#: ../../accounting/payables/pay/check.rst:0 +msgid "Code" +msgstr "" + #: ../../accounting/payables/pay/check.rst:0 msgid "" "Technical field used to adapt the interface to the payment type selected." msgstr "技术字段根据付款方式来调整。" +#: ../../accounting/payables/pay/check.rst:0 +msgid "Check Number" +msgstr "" + #: ../../accounting/payables/pay/check.rst:0 msgid "" "The selected journal is configured to print check numbers. If your pre-" @@ -10111,8 +10267,8 @@ msgstr ":doc:`recording` " #: ../../accounting/receivables/customer_payments/credit_cards.rst:167 #: ../../accounting/receivables/customer_payments/recording.rst:128 -msgid ":doc:`paypal`" -msgstr ":doc:`paypal` " +msgid ":doc:`../../bank/feeds/paypal`" +msgstr "" #: ../../accounting/receivables/customer_payments/credit_cards.rst:169 #: ../../accounting/receivables/customer_payments/recording.rst:130 @@ -10350,222 +10506,6 @@ msgid "" "Reporting (check the KPI average debtors days)." msgstr "你可以从报告下的执行概要得到你公司的DSO (检查KPI平均债务人天数)" -#: ../../accounting/receivables/customer_payments/paypal.rst:3 -msgid "How to accept paypal payments on invoices?" -msgstr "如何接受PayPal付款？" - -#: ../../accounting/receivables/customer_payments/paypal.rst:5 -msgid "" -"The \"Paypal Payment Acquirer\" module allows you to accept payments via " -"paypal, for your sales orders, invoices, or online orders. As paypal accepts" -" payments through credit cards (VISA, Mastercard, …), you will be able to " -"process most payment methods." -msgstr "" -" **PayPal 付款收单方** " -"模块允许你通过paypal为销售订单，发票，以及在线订单接受付款。因为paypal接受通过信用卡(VISA，万事达)付款，你就能处理大多数的付款方式。" - -#: ../../accounting/receivables/customer_payments/paypal.rst:10 -msgid "Paypal support two modes:" -msgstr "Paypal 支持两种模式 :" - -#: ../../accounting/receivables/customer_payments/paypal.rst:12 -msgid "" -"Paypal Merchant Account: the user is redirected to paypal to do the payment " -"(either with a credit card or a paypal account)" -msgstr "Paypal Merchant 帐户：用户定义paypal用于付款(通过信用卡或paypal帐户)" - -#: ../../accounting/receivables/customer_payments/paypal.rst:15 -msgid "" -"PayPal PayFlow Pro (S2S, Server 2 Server): the user is not redirected to " -"paypal and the payment can be done in the background. This method is mostly " -"used for subscription businesses where you need to charge your customers " -"periodically." -msgstr "" -"PayPal PayFlow Pro(S2S，Server 2服务器)：用户不重新定义用paypal " -"支付并且付款可在后台完成。这种方法主要用于订阅业务，需要定期向客户收取费用。" - -#: ../../accounting/receivables/customer_payments/paypal.rst:20 -msgid "As of today, Odoo only support the normal Paypal Merchant Account." -msgstr "截至今天，Odoo只支持常规的Paypal Merchant 帐户。" - -#: ../../accounting/receivables/customer_payments/paypal.rst:26 -msgid "Install the \"PayPal Payment Acquirer\" module" -msgstr "安装 \" PayPal 付款收单方\" 模块" - -#: ../../accounting/receivables/customer_payments/paypal.rst:28 -msgid "Start by installing the **PayPal Payment Acquirer** module." -msgstr "从安装 **PayPal 付款收单方** 模块开始。" - -#: ../../accounting/receivables/customer_payments/paypal.rst:30 -msgid "" -"Once the module is installed, you should see a new payment acquirer in the " -"Setting application, menu \"Payment Acquirers\"." -msgstr "一旦模块被安装了, 你应该看到设置应用里面的新付款托收，菜单\"付款收单方\" :" - -#: ../../accounting/receivables/customer_payments/paypal.rst:36 -msgid "" -"By default, Paypal is configured to work in a test environment, out-of-the-" -"box. It means you can already test the full order to payment flow with the " -"paypal sandbox, without having to configure the next steps." -msgstr "默认情况下，Paypal在测试环境中工作。这意味着你可以用Paypal付款流程的全阶段测试，而无需配置。" - -#: ../../accounting/receivables/customer_payments/paypal.rst:42 -msgid "Creating and configuring a PayPal merchant account" -msgstr "创建和配置一个PayPal merchant帐户" - -#: ../../accounting/receivables/customer_payments/paypal.rst:45 -msgid "Create a basic Paypal account" -msgstr "创建一个基本的 Paypal 账户" - -#: ../../accounting/receivables/customer_payments/paypal.rst:47 -msgid "Existing or newly created Personal Paypal account can be used." -msgstr "现有的或新创建的个人Paypal帐户可使用." - -#: ../../accounting/receivables/customer_payments/paypal.rst:49 -msgid "Or upgrade your account to Business account (merchant) if needed" -msgstr "或将账户升级到商业帐户(商人)，如果需要的话" - -#: ../../accounting/receivables/customer_payments/paypal.rst:55 -msgid "Paypal Account Summary page" -msgstr "Paypal 账户概览页面" - -#: ../../accounting/receivables/customer_payments/paypal.rst:58 -msgid "Paypal Configuration" -msgstr "Paypal 配置" - -#: ../../accounting/receivables/customer_payments/paypal.rst:60 -msgid "" -"Access \"Seller preferences\" menu from `PayPal website " -"`__" -msgstr "" -"进入 \"Seller preferences\" 菜单, 从 `PayPal " -"网站`__" - -#: ../../accounting/receivables/customer_payments/paypal.rst:66 -msgid "" -"Access \"Website preferences\" and configure Auto Return (Payment Data " -"Transfer must be left to Off)" -msgstr "访问“Website preferences”和配置自动返回(支付数据传输必须关闭)" - -#: ../../accounting/receivables/customer_payments/paypal.rst:69 -msgid "**Database name**: yourcompany" -msgstr " **数据库名称**: 你的公司" - -#: ../../accounting/receivables/customer_payments/paypal.rst:70 -#: ../../accounting/receivables/customer_payments/paypal.rst:88 -msgid "**Website URL**: https://yourcompany.odoo.com/" -msgstr " **网址**: https: //yourcompany.odoo.com/" - -#: ../../accounting/receivables/customer_payments/paypal.rst:71 -msgid "**Return URL**: https://yourcompany.odoo.com/shop/confirmation" -msgstr " **返回网址**: https: //yourcompany.odoo.com/shop/confirmation" - -#: ../../accounting/receivables/customer_payments/paypal.rst:76 -msgid "These settings will redirect your buyer to your web confirmation page." -msgstr "这些设置将重定向买家到网站确认页。" - -#: ../../accounting/receivables/customer_payments/paypal.rst:80 -msgid "Access and edit Instant payment notifications settings - IPN" -msgstr "访问和编辑即时付款通知设置- IPN" - -#: ../../accounting/receivables/customer_payments/paypal.rst:85 -msgid "Example" -msgstr "例子" - -#: ../../accounting/receivables/customer_payments/paypal.rst:87 -msgid "**Database name**: \"yourcompany\"" -msgstr " **数据库名称**: “你的公司\" " - -#: ../../accounting/receivables/customer_payments/paypal.rst:89 -msgid "**Notification URL**: https://yourcompany.odoo.com/payment/paypal/ipn/" -msgstr " **通知网址**: https: //yourcompany.odoo.com/payment/paypal/ipn/" - -#: ../../accounting/receivables/customer_payments/paypal.rst:91 -msgid "" -"Verify that your Notify URL uses the correct protocol (HTTP / HTTPS). If you" -" use the odoo.com domain, we advise you to use HTTPS." -msgstr "验证您的Notify URL 时候使用了正确的协议(HTTP / HTTPS)。如果你使用odoo.com域，我们建议您使用HTTPS。" - -#: ../../accounting/receivables/customer_payments/paypal.rst:94 -msgid "" -"Set the encoding to UTF-8 from the menu :menuselection:`Settings --> " -"Language Encoding --> More Options --> More selling tools`" -msgstr "" -"从菜单 :menuselection:`设置 --> 语言编码 --> 更多选项 --> 更多 selling tools` 设置编码为 UTF-8" - -#: ../../accounting/receivables/customer_payments/paypal.rst:103 -msgid "" -"Record your Merchant Paypal ID (personal or business account both will have " -"it) it will be entered in Odoo backend :menuselection:`Paypal Settings --> " -"Account Options`." -msgstr "" -"记录你的Merchant Paypal ID (个人或企业账户, 或者两者)它将进入Odoo后端 :menuselection:`Paypal " -"Settings --> Account Options`." - -#: ../../accounting/receivables/customer_payments/paypal.rst:111 -msgid "" -"If you want your customers to be able to pay through Paypal while not having" -" a Paypal account- following setting \"Paypal Account Optional\" needs to be" -" set to **ON**. All users will be able to choose Credit/debit card payment " -"option - Paypal account not required." -msgstr "" -"如果想让没有Paypal账户的客户用Paypal支付, 将 \"Paypal Account Optional\"设置为**ON**.\n" -"所有的用户可选择信用卡/借记卡支付, 不需要Paypal账户。" - -#: ../../accounting/receivables/customer_payments/paypal.rst:120 -msgid "Setup your Paypal Payment Acquirer account credentials in Odoo" -msgstr "在Odoo 设置Paypal付款收单方账号证明。" - -#: ../../accounting/receivables/customer_payments/paypal.rst:122 -msgid "" -":menuselection:`Settings --> Payments --> Payment Acquirers --> Paypal`" -msgstr ":menuselection:`设置--> 付款--> 付款收单方--> Paypal` " - -#: ../../accounting/receivables/customer_payments/paypal.rst:124 -msgid "**Paypal Email ID**: your paypal account email address" -msgstr " **Paypal Email ID**: 你的 paypal 账户 email 地址" - -#: ../../accounting/receivables/customer_payments/paypal.rst:126 -msgid "**Paypal Merchant ID**: ID retrieved at previous step" -msgstr " **Paypal商家ID**: 在上一步检索到的ID" - -#: ../../accounting/receivables/customer_payments/paypal.rst:136 -msgid "" -"If your eCommerce customer gets this Error Message after completing Paypal " -"payment instead of being redirected to your database:" -msgstr "如果你的电子商务客户在完成Paypal支付后收到错误信息, 而不是被重定向到您的数据库：" - -#: ../../accounting/receivables/customer_payments/paypal.rst:142 -msgid "" -"Verify the settings you have `configured in Paypal `_:" -msgstr "验证您的设置 `configured in Paypal `_:" - -#: ../../accounting/receivables/customer_payments/paypal.rst:144 -msgid "" -"Auto Return should be on (the value can be quite generic, like " -"/shop/confirmation; the correct URL will be set for each " -"transaction)" -msgstr "自动回应应为(该值可以是通用的，像/shop/confirmation; 正确的URL设置将应用于每个交易)" - -#: ../../accounting/receivables/customer_payments/paypal.rst:148 -msgid "Payment Data Transfer should be off" -msgstr "支付数据传输应关闭" - -#: ../../accounting/receivables/customer_payments/paypal.rst:150 -msgid "" -"On-premise databases must be accessible through classic HTTP/HTTPS ports " -"(80/443) for Paypal to work correctly, usually through a reverse proxy. " -"Contact your integrating partner if you are unsure this is the case. " -"Databases hosted on odoo.com are already configured correctly." -msgstr "" -"Paypal如需正常工作, 数据库必须通过HTTP / HTTPS端口访问(80 / " -"443)，通常是通过一个反向代理。如果不确定，联系你的合作伙伴。数据库托管在Odoo.com已正确配置。" - -#: ../../accounting/receivables/customer_payments/paypal.rst:157 -#: ../../accounting/receivables/customer_payments/recording.rst:127 -msgid ":doc:`credit_cards`" -msgstr ":doc:`credit_cards` " - #: ../../accounting/receivables/customer_payments/recording.rst:3 msgid "What are the different ways to record a payment?" msgstr "有哪些不同的方式来记录付款？" @@ -10724,6 +10664,10 @@ msgid "" " with two journal entries for the same transaction." msgstr "内部银行转款，在仪表板上选择转出的银行，并在付款界面，选择转入的帐户。不需要在另一个银行帐户中重复操作，否则将重复交易。" +#: ../../accounting/receivables/customer_payments/recording.rst:127 +msgid ":doc:`credit_cards`" +msgstr ":doc:`credit_cards` " + #: ../../accounting/receivables/getting_paid.rst:3 msgid "How to get paid?" msgstr "如何收款？" diff --git a/locale/zh_CN/LC_MESSAGES/discuss.po b/locale/zh_CN/LC_MESSAGES/discuss.po index f9e922ece..54ad6a9d1 100644 --- a/locale/zh_CN/LC_MESSAGES/discuss.po +++ b/locale/zh_CN/LC_MESSAGES/discuss.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Odoo Business 9.0\n" +"Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-23 15:39+0100\n" +"POT-Creation-Date: 2017-05-09 14:24+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Kate Lee , 2017\n" "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n" @@ -23,7 +23,7 @@ msgid "Discuss" msgstr "讨论" #: ../../discuss/email_servers.rst:3 -msgid "How to use my own email servers to send and receive messages in Odoo" +msgid "How to use my own email servers to send and receive email in Odoo" msgstr "" #: ../../discuss/email_servers.rst:6 @@ -31,138 +31,230 @@ msgid "When is it needed" msgstr "" #: ../../discuss/email_servers.rst:7 -msgid "You need it if you use Odoo Community or Enterprise." -msgstr "" - -#: ../../discuss/email_servers.rst:10 -msgid "What if I use Odoo Online" -msgstr "" - -#: ../../discuss/email_servers.rst:11 msgid "" -"You are done! Odoo Online comes up with an embedded and ready-to-use email " -"server (*@yourcompany.odoo.com*). We recommend to keep this default setting " -"as is as it is really convenient." +"Using your own email servers is required to send and receive messages in " +"Odoo Community or Enterprise. Odoo Online embeds an out-of-box email " +"solution that works straight away. However you can still use your own email " +"servers with the online edition. Some insights are provided here below." +msgstr "" + +#: ../../discuss/email_servers.rst:14 +msgid "How to set it up" msgstr "" #: ../../discuss/email_servers.rst:15 msgid "" -"Indeed, while it is branded by Odoo, the visible source of any message sent " -"from Odoo will be your personal email address (your Odoo login). Your " -"contacts will therefore trust your messages." -msgstr "" - -#: ../../discuss/email_servers.rst:20 -msgid "How does it work when a contact replies to an email sent from Odoo" +"As a system admin, go to :menuselection:`Settings --> General Settings` and " +"check *External Email Servers* (watch out: this checkbox only shows up after" +" Odoo 10). Then, go through the following steps." msgstr "" #: ../../discuss/email_servers.rst:21 msgid "" -"Default reply-to is a generic address used to automatically route any " -"incoming email to the discussion thread of the origin business object " -"(opportunity, order, task, etc.) and to the inbox of all its followers. By " -"default this address is \"catchall@\" but it can be changed. Thanks to it, " -"you get a perfect message thread in Odoo and you don't pollute your external" -" email box with Odoo-related topics." +"Office 365 doesn't allow external hosts like Odoo. Consequently you can't " +"use Office 365 email servers to send or receive messages in Odoo." msgstr "" -#: ../../discuss/email_servers.rst:29 -msgid "How to use my own email servers" -msgstr "" - -#: ../../discuss/email_servers.rst:30 -msgid "" -"You need to be a system admin to set this up. Go to :menuselection:`Settings" -" --> General Settings` and check *External Email Servers* (watch out: this " -"checkbox only shows up after Odoo 10). Then, go through the following steps." -msgstr "" - -#: ../../discuss/email_servers.rst:36 +#: ../../discuss/email_servers.rst:26 msgid "Set an outgoing email server for outbound messages" msgstr "" -#: ../../discuss/email_servers.rst:37 +#: ../../discuss/email_servers.rst:27 msgid "" "You need the SMTP data of your email provider (Gmail, Outlook, Yahoo, AOL, " "etc.) as well as your admin credentials. Once all the information has been " "filled out, click on *Test Connection*." msgstr "" -#: ../../discuss/email_servers.rst:45 +#: ../../discuss/email_servers.rst:35 msgid "Set an incoming email server for inbound messages" msgstr "" -#: ../../discuss/email_servers.rst:46 +#: ../../discuss/email_servers.rst:36 msgid "" "Fill out the form according to your email provider’s settings. Leave the " "*Actions to Perform on Incoming Mails* blank. Once all the information has " "been filled out, click on *TEST & CONFIRM*." msgstr "" -#: ../../discuss/email_servers.rst:53 +#: ../../discuss/email_servers.rst:43 msgid "" "By default inbound messages are fetched every 5 minutes. You can change this" " value in developer mode. Go to :menuselection:`Settings --> Technical --> " "Automation --> Scheduled Actions` and look for *Mail: Fetchmail Service*." msgstr "" -#: ../../discuss/email_servers.rst:59 +#: ../../discuss/email_servers.rst:49 msgid "Set the domain name" msgstr "" -#: ../../discuss/email_servers.rst:60 +#: ../../discuss/email_servers.rst:50 msgid "" "Enter the domain name of your email servers (e.g. mycompany.com) in General " "Settings." msgstr "" -#: ../../discuss/email_servers.rst:67 +#: ../../discuss/email_servers.rst:57 msgid "Create a catchall address" msgstr "" -#: ../../discuss/email_servers.rst:68 +#: ../../discuss/email_servers.rst:58 +msgid "" +"When a contact replies to an email sent from Odoo, the *reply-to* address is" +" a generic address used to route the reply to the right discussion thread in" +" Odoo (opportunity, order, task, etc.) and to the inbox of all its " +"followers. By default this address is \"catchall@\" but it can be changed." +msgstr "" + +#: ../../discuss/email_servers.rst:63 msgid "" "Create a catchall address in your email server settings. We advise you to " "use \"catchall@\" so that everything works out straight away. If you want to" " use another alias, you have extra steps in Odoo:" msgstr "" -#: ../../discuss/email_servers.rst:72 +#: ../../discuss/email_servers.rst:67 msgid "Activate the developer mode from your Settings Dashboard." msgstr "" -#: ../../discuss/email_servers.rst:77 +#: ../../discuss/email_servers.rst:72 msgid "" "Refresh your screen. Then go to :menuselection:`Settings --> Technical --> " "Parameters --> System Parameters` and enter your custom catchall alias in " "*mail.catchall.alias*." msgstr "" -#: ../../discuss/email_servers.rst:84 +#: ../../discuss/email_servers.rst:79 msgid "You can edit the email alias used for bounced messages the same way." msgstr "" -#: ../../discuss/email_servers.rst:87 -msgid "How to perfectly combine Odoo Discuss and my traditional email tool" +#: ../../discuss/email_servers.rst:82 +msgid "How to use my own email servers with Odoo Online" msgstr "" -#: ../../discuss/email_servers.rst:88 +#: ../../discuss/email_servers.rst:83 +msgid "" +"Odoo Online comes up with an embedded and ready-to-use email server " +"(*@yourcompany.odoo.com*). We recommend to keep this default setting as it " +"is really convenient. Indeed, while it is Odoo-labelled, the visible source " +"of any message sent from Odoo will be your personal email address (your Odoo" +" login). Your contacts will therefore trust your messages." +msgstr "" + +#: ../../discuss/email_servers.rst:90 +msgid "" +"You can still use your own email servers if you want your contacts to see " +"your historic email address when they reply to your messages or if you want " +"to manage the reputation of your email servers yourself." +msgstr "" + +#: ../../discuss/email_servers.rst:94 +msgid "There are 2 methods:" +msgstr "" + +#: ../../discuss/email_servers.rst:96 +msgid "" +"[Recommended] **Use a catchall redirection** (your server -> Odoo server) to" +" receive emails in Odoo in real time thanks to the Odoo email server. Create" +" a catchall address in your email server settings. Then apply following " +"redirection: catchall@yourdomain.ext -> catchall@yourcompany.odoo.com. " +"That's it you're ready to go!" +msgstr "" + +#: ../../discuss/email_servers.rst:102 +msgid "" +"**Use a catchall mailbox** to exclusively use your own email server. That " +"way you can also manage your email server reputation (blacklisting, etc). " +"However, incoming messages are fetched from the email server thanks to a " +"cron running every hour. This is the shortest time lap for crons in Online " +"instances. If you opt for this solution, simply follow the procedure of " +"above section." +msgstr "" + +#: ../../discuss/email_servers.rst:111 +msgid "How to be SPF-compliant when using external email servers in Odoo" +msgstr "" + +#: ../../discuss/email_servers.rst:112 +msgid "" +"Sender Policy Framework (SPF) is an email-validation system that checks that" +" incoming mail from a domain comes from a host authorized by that domain's " +"administrator. Such a security system is used in most email servers. If you " +"don't comply with it, your emails sent from Odoo will be likely flagged as " +"spam." +msgstr "" + +#: ../../discuss/email_servers.rst:118 +msgid "" +"To be SPF-compliant, you need to authorize Odoo as a sending host in your " +"domain name settings:" +msgstr "" + +#: ../../discuss/email_servers.rst:121 +msgid "Sign in to your domain’s account at your domain host." +msgstr "" + +#: ../../discuss/email_servers.rst:122 +msgid "Locate the page for updating your domain’s DNS records." +msgstr "" + +#: ../../discuss/email_servers.rst:123 +msgid "" +"If no TXT record is set, create one with following definition: v=spf1 " +"include:_spf.odoo.com ~all" +msgstr "" + +#: ../../discuss/email_servers.rst:125 +msgid "In case a TXT record is already set, add \"include:_spf.odoo.com\"." +msgstr "" + +#: ../../discuss/email_servers.rst:127 +msgid "e.g. for a Gmail server it should be:" +msgstr "" + +#: ../../discuss/email_servers.rst:129 +msgid "v=spf1 include:_spf.odoo.com include:_spf.google.com ~all" +msgstr "" + +#: ../../discuss/email_servers.rst:131 +msgid "" +"Find `here `__ the exact procedure to " +"create or modify TXT records in your own domain registrar." +msgstr "" + +#: ../../discuss/email_servers.rst:134 +msgid "" +"Your new SPF record can take up to 48 hours to go into effect, but this " +"usually happens more quickly." +msgstr "" + +#: ../../discuss/email_servers.rst:137 +msgid "" +"Adding more than one SPF record for a domain can cause problems with mail " +"delivery and spam classification. Instead, we recommend using only one SPF " +"record by modifying it to authorize Odoo." +msgstr "" + +#: ../../discuss/email_servers.rst:142 +msgid "How to choose between Odoo and my traditional email box" +msgstr "" + +#: ../../discuss/email_servers.rst:143 msgid "" "Odoo Discuss is a perfect tool to send and read messages related to business" -" objects. But it doesn't aim to replace a full-featured email software " -"(Gmail, Outlook, Yahoo, AOL, etc.). We recommend to take the most out of " +" documents. However it doesn't aim to replace a full-featured email solution" +" (Gmail, Outlook, Yahoo, AOL, etc.). We recommend to take the most out of " "both systems without mingling them: What is related to Odoo business objects" -" or applications goes into Odoo; What is not stays into your external email " -"boxes." +" or applications goes into Odoo; What is not can be managed into your " +"external email box." msgstr "" -#: ../../discuss/email_servers.rst:95 +#: ../../discuss/email_servers.rst:150 msgid "" "To do so, create specific email aliases to use in Odoo (to generate leads or" " opportunities, helpdesk tickets, etc.). If you take an email alias already " "used for messaging outside of Odoo, incoming messages will land into both " -"systems. This will negatively impact your productivity when it comes to " -"process them." +"systems. This will negatively impact your productivity." msgstr "" #: ../../discuss/mail_twitter.rst:3 diff --git a/locale/zh_CN/LC_MESSAGES/ecommerce.po b/locale/zh_CN/LC_MESSAGES/ecommerce.po index ff9991bf2..bd2883b4a 100644 --- a/locale/zh_CN/LC_MESSAGES/ecommerce.po +++ b/locale/zh_CN/LC_MESSAGES/ecommerce.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Odoo Business 9.0\n" +"Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-23 15:39+0100\n" +"POT-Creation-Date: 2017-05-09 14:24+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: fausthuang , 2017\n" "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n" @@ -655,23 +655,21 @@ msgid "Launch my website" msgstr "" #: ../../ecommerce/shopper_experience.rst:3 -msgid "Improve shopper experience" +msgid "Get paid" msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:3 -msgid "How to set up payment methods" +msgid "How to get paid with payment acquirers" msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:5 msgid "" -"To collect payments, you can either request your customers to process it " -"manually (e.g. wire transfer) or redirect them to payment acquirers. The " -"payment process described hereunder is common to both eCommerce and online " -"quotations." +"Odoo embeds several payment methods to get paid on eCommerce, Sales and " +"Invoicing apps." msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:10 -msgid "Payment methods" +msgid "What are the payment methods available" msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:13 @@ -681,451 +679,561 @@ msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:15 msgid "" "Wire Transfer is the default payment method available. The aim is providing " -"your customers with your bank details so that they can pay via their bank. " -"This is very easy to start with but slow and inefficient process-wise. Opt " -"for online acquirers as soon as you can!" +"your customers with your bank details so they can pay on their own via their" +" bank. This is very easy to start with but slow and inefficient process-" +"wise. Opt for online acquirers as soon as you can!" msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:21 -msgid "" -"For B2B users: you can create new manually-processed payment methods (check," -" purchase order, etc.) by renaming 'Wire Transfer' or duplicating it." +msgid "Payment acquirers" msgstr "" -#: ../../ecommerce/shopper_experience/payment.rst:25 -msgid "Online payment acquirers" +#: ../../ecommerce/shopper_experience/payment.rst:23 +msgid "" +"Redirect your customers to payment platforms to collect money effortless and" +" track the payment status (call-back). Odoo supports more and more platforms" +" over time:" msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:27 -msgid "" -"Redirect your customers to payment acquirer platforms to collect money " -"effortless. Odoo supports more and more platforms over time: Paypal, " -"Ingenico, Authorize.net, etc. Once the payment accepted, orders are " -"confirmed in Odoo so that the delivery & invoicing processes are triggered " -"automatically." +msgid "`Paypal `__" +msgstr "" + +#: ../../ecommerce/shopper_experience/payment.rst:28 +msgid "Ingenico" +msgstr "" + +#: ../../ecommerce/shopper_experience/payment.rst:29 +msgid "Authorize.net" +msgstr "" + +#: ../../ecommerce/shopper_experience/payment.rst:30 +msgid "Adyen" +msgstr "" + +#: ../../ecommerce/shopper_experience/payment.rst:31 +msgid "Buckaroo" +msgstr "" + +#: ../../ecommerce/shopper_experience/payment.rst:32 +msgid "PayUmoney" msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:33 -msgid "Custom (advanced)" +msgid "Sips" msgstr "" -#: ../../ecommerce/shopper_experience/payment.rst:35 -msgid "" -"Can be used to request payments to any payment acquirer not listed in Odoo." +#: ../../ecommerce/shopper_experience/payment.rst:34 +msgid "Stripe" msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:38 -msgid "Edit a payment method" +msgid "How to go live" msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:40 msgid "" -"To make payment methods intuitive for your customers feel free to customize " -"them by editing:" -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:42 -msgid "the name," -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:44 -msgid "the picture," -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:46 -msgid "" -"the notification messages (thank you & next step, error, cancellation)." +"Once the payment method ready, make it visible in the payment interface and " +"activate the **Production** mode." msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:48 +msgid "How to let customers save and reuse credit cards" +msgstr "" + +#: ../../ecommerce/shopper_experience/payment.rst:49 msgid "" -"Go to :menuselection:`Website Admin --> Configuration --> Payment Acquirers`" -" to do so." +"To ease the payment of returning customers, you can let them save and reuse " +"a credit card if they want to. If so, a payment token will be saved in Odoo." +" This option is available with Ingenico and Authorize.net." msgstr "" -#: ../../ecommerce/shopper_experience/payment.rst:51 -msgid "Generic setup" -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:53 -msgid "Review the elements here above." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:55 -msgid "Enter your credentials (online acquirers only)." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:57 -msgid "Choose your order confirmation preference (see below)." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:59 -msgid "Publish the payment method." +#: ../../ecommerce/shopper_experience/payment.rst:54 +#: ../../ecommerce/shopper_experience/payment.rst:68 +msgid "You can turn this on from the acquirer configuration form." msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:61 -msgid "Test the payment flow in *Test* mode (default mode)." +msgid "How to debit credit cards to pay subscriptions" msgstr "" -#: ../../ecommerce/shopper_experience/payment.rst:63 -msgid "Switch to *Production* mode." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:65 +#: ../../ecommerce/shopper_experience/payment.rst:62 msgid "" -"Se your default payment acquirer in :menuselection:`Accounting --> " -"Configuration --> Settings`. It will be auto-selected for your customers " -"when they enter the payment screen." +"`Odoo Subscription `__ allows to " +"bill services automatically on a recurring basis. Along with it, you can " +"have an automatic debit of the customer's credit card." msgstr "" -#: ../../ecommerce/shopper_experience/payment.rst:69 +#: ../../ecommerce/shopper_experience/payment.rst:66 +msgid "This option is available with Ingenico and Authorize.net." +msgstr "" + +#: ../../ecommerce/shopper_experience/payment.rst:73 msgid "" -"Rely on the documentation related to your payment acquirer to go through " -"step 2, 5 and 6. Some acquirers provides you with specific credentials for " -"test and production modes (Paypal). Others let you switch mode in their " -"setup interface (Authorize.net)." +"That way a payment token will be recorded when the customer goes for the " +"subscription and an automatic debit will occur whenever an invoice is issued" +" from the subscription." msgstr "" -#: ../../ecommerce/shopper_experience/payment.rst:74 +#: ../../ecommerce/shopper_experience/payment.rst:79 +msgid "How to use other acquirers (advanced)" +msgstr "" + +#: ../../ecommerce/shopper_experience/payment.rst:81 msgid "" -"With Ingenico and Authorize.net, you can let your customers save and reuse a" -" payment card to accelerate the process on next checkouts. See *Store Card " -"Data* in Configuration tab." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:78 -msgid "Payment flow" -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:80 -msgid "" -"When choosing the payment method, the customer is taken to the payment " -"acquirer interface to process the payment." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:83 -msgid "" -"Once done he is taken back to Odoo's confirmation page. The transaction " -"status shows up:" +"Odoo can submit single payment requests and redirect to any payment " +"acquirer. But there is no call-back, i.e. Odoo doesn't track the transaction" +" status. So you will confirm orders manually once you get paid." msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:85 -msgid "" -"*Pending*: the order will be confirmed as soon as you authorize the " -"transaction in the acquirer interface." +msgid "How to:" msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:87 -msgid "*Confirmed*: the payment has been authorized automatically." +msgid "Switch to developer mode." msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:89 -msgid "" -"A confirmation email is sent to the customer with a copy of the order in " -"pdf. It shows the payment status." +msgid "Take the **Custom** payment method." msgstr "" #: ../../ecommerce/shopper_experience/payment.rst:91 -msgid "Launch the delivery and invoicing from:" -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:93 msgid "" -"eCommerce: :menuselection:`Website Admin --> Orders --> (Unpaid) Orders`," -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:95 -msgid "" -"online quotations: :menuselection:`Sales --> Sales --> Quotations/Sales " -"Orders`." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:97 -msgid "" -"For internal tracking purposes, a link to the transaction status is provided" -" in the sales order." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:100 -msgid "" -"If the customer cancels the payment while on the payment acquirer form, it " -"is taken back to the store page (or online quotation) in order to reprocess " -"the order. The payment is marked as *Cancelled* in Odoo." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:105 -msgid "" -"You can edit the confirmation email template from :menuselection:`Website " -"Admin --> Configuration --> Settings`." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:109 -msgid "Order confirmation preferences" -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:111 -msgid "There are 4 different behaviors available for any payment acquirer." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:114 -msgid "No automatic confirmation" -msgstr "无自动确认" - -#: ../../ecommerce/shopper_experience/payment.rst:116 -msgid "" -"This is the default mode for *Wire Transfer*. It means Odoo does not confirm" -" orders but keep them in an intermediary stage (*Quotation Sent* = *Unpaid " -"Order*). Once you get the payment, you are expected to confirm the order " -"manually to pursue the process (delivery, invoicing)." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:121 -msgid "" -"Authorize the amount and confirm the SO on acquirer confirmation (capture " -"manually)" -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:123 -msgid "" -"Odoo confirms the order as soon as the payment success notification comes " -"in. To get the money however, you need to capture it from your payment " -"transaction. In lots of countries you are indeed requested to deliver your " -"goods before capturing the amount." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:128 -msgid "" -"Authorize & capture the amount and confirm the SO on acquirer confirmation" -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:130 -msgid "" -"This is the default mode for payment acquirers. The amount is captured " -"automatically." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:133 -msgid "" -"For B2B: if you use a manual payment method like *Wire Transfer* and don't " -"expect any upfront payment to launch the delivery, switch to this mode as " -"well." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:137 -msgid "" -"Authorize & capture the amount, confirm the SO and auto-validate the invoice" -" on acquirer confirmation" -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:139 -msgid "" -"If you invoice upfront and not at the delivery, switch to this last mode to " -"automate everything. You are requested to select a Payment Journal to record" -" such payments (see " -":doc:`../../accounting/receivables/customer_payments/credit_cards`)." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:144 -msgid "Custom payment acquirers (advanced)" -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:146 -msgid "" -"Odoo can submit payment requests and redirect to any payment acquirer. In " -"such a case, you need to confirm the sale manually in Odoo once you get paid" -" because Odoo cannot read any payment status sent by the acquirer." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:150 -msgid "To configure this:" -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:152 -msgid "switch to developer mode," -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:154 -msgid "edit the *Custom* payment method," -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:156 -msgid "" -"set up the payment form (S2S Form Template) as instructed by your payment " +"Set up the payment form (S2S Form Template) as instructed by your payment " "acquirer. You can start from *default_acquirer_button* that you can " "duplicate." msgstr "" -#: ../../ecommerce/shopper_experience/payment.rst:160 -msgid "Recurring payments & Installment plans" +#: ../../ecommerce/shopper_experience/payment.rst:96 +msgid "Other configurations" msgstr "" -#: ../../ecommerce/shopper_experience/payment.rst:162 +#: ../../ecommerce/shopper_experience/payment.rst:98 msgid "" -"The Ingenico integration allows you to process and manage recurring payments" -" from Odoo Subscriptions app out-of-the-box (more information coming soon)." +"Odoo can also be used for more advanced payment processes like installment " +"plans (e.g. `Paypal Installment Plans " +"`__)." msgstr "" -#: ../../ecommerce/shopper_experience/payment.rst:165 +#: ../../ecommerce/shopper_experience/payment.rst:102 msgid "" -"With some customization, Odoo can also trigger installment plans if this is " -"permitted by your payment acquirer’s API:" +"Such a customization service is made on-demand by our technical experts " +"based on your own requirements. A business advisor can reach you out for " +"such matter. `Contact us. `__" msgstr "" -#: ../../ecommerce/shopper_experience/payment.rst:168 -msgid "" -"e.g. Paypal Installment Plans (see https://developer.paypal.com/docs/classic" -"/paypal-payments-standard/integration-guide/installment_buttons)." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:170 -msgid "" -"Such a service is made on-demand by our technical experts based on your own " -"requirements. Ask our business advisors at info@odoo.com." -msgstr "" - -#: ../../ecommerce/shopper_experience/payment.rst:175 +#: ../../ecommerce/shopper_experience/payment.rst:109 msgid ":doc:`paypal`" msgstr ":doc:`paypal` " +#: ../../ecommerce/shopper_experience/payment.rst:110 +msgid ":doc:`wire_transfer`" +msgstr "" + +#: ../../ecommerce/shopper_experience/payment.rst:111 +#: ../../ecommerce/shopper_experience/paypal.rst:155 +msgid ":doc:`payment_acquirer`" +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:3 +msgid "How to manage orders paid with payment acquirers" +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:5 +msgid "" +"Odoo confirms orders automatically as soon as the payment is authorized by a" +" payment acquirer. This triggers the delivery. If you invoice based on " +"ordered quantities, you are also requested to invoice the order." +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:12 +msgid "What are the payment status" +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:13 +msgid "" +"At anytime, the salesman can check the transaction status from the order." +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:18 +msgid "*Draft*: transaction under processing." +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:20 +msgid "" +"*Pending*: the payment acquirer keeps the transaction on hold and you need " +"to authorize it from the acquirer interface." +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:23 +msgid "" +"*Authorized*: the payment has been authorized but not yet captured. In Odoo," +" the order is already confirmed. Once the delivery done, you can capture the" +" amount from the acquirer interface (or from Odoo if you use Authorize.net)." +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:28 +msgid "" +"*Done*: the payment is authorized and captured. The order has been " +"confirmed." +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:30 +msgid "" +"*Error*: an error has occured during the transaction. The customer needs to " +"retry the payment. The order is still in draft." +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:34 +msgid "" +"*Cancelled*: when the customer cancels the payment in the payment acquirer " +"form. They are taken back to Odoo in order to modify the order." +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:37 +msgid "" +"Specific messages are provided to your customers for every payment status, " +"when they are redirected to Odoo after the transaction. To edit such " +"messages, go to the *Messages* tab of the payment method." +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:44 +msgid "Auto-validate invoices at order" +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:46 +msgid "" +"When the order is confirmed you can also have an invoice automatically " +"issued and paid. This fully-automated made for businesses that invoice " +"orders straight on." +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:53 +msgid "" +"If you choose this mode you are requested to select a payment journal in " +"order to record payments in your books. This payment is automatically " +"reconcilied with the invoice, marking it as paid. Select your **bank " +"account** if you get paid immediately on your bank account. If you don't you" +" can create a specific journal for the payment acquirer (type = Bank). That " +"way, you can track online payments in an intermediary account of your books " +"until you get paid into your bank account (see `How to register credit card " +"payments " +"<../../accounting/receivables/customer_payments/credit_cards.html>`__)." +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:64 +msgid "Capture the payment after the delivery" +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:65 +msgid "" +"With this mode, the order is confirmed but the amount is kept on hold. Once " +"the delivery processed, you can capture the payment from Odoo. This mode is " +"only available with Authorize.net." +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:72 +msgid "" +"To capture the payment, open the transaction from the order. Then click " +"*Capture Transaction*." +msgstr "" + +#: ../../ecommerce/shopper_experience/payment_acquirer.rst:78 +msgid "" +"With other payment acquirers, you can manage the capture in their own " +"interfaces, not from Odoo." +msgstr "" + #: ../../ecommerce/shopper_experience/paypal.rst:3 -msgid "How to collect payments with Paypal" +msgid "How to get paid with Paypal" msgstr "" #: ../../ecommerce/shopper_experience/paypal.rst:5 msgid "" -"Paypal is the easiest payment method to configure. It is also the only one " -"without any subscription free." -msgstr "" - -#: ../../ecommerce/shopper_experience/paypal.rst:9 -msgid "Setup your Paypal account" +"Paypal is the easiest online payment method to configure. It is also the " +"only one without any subscription free. We definitely advise it to any " +"starter." msgstr "" #: ../../ecommerce/shopper_experience/paypal.rst:11 -msgid "" -"1. Create a business account at Paypal.com (see: https://www.paypal.com/in" -"/cgi-bin/webscr?cmd=xpt/Marketing/general/how-to-set-up-a-paypal-account-" -"outside) or upgrade your account to Business account (merchant) if you have " -"a basic account." +msgid "Set up your Paypal account" msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:15 +#: ../../ecommerce/shopper_experience/paypal.rst:13 msgid "" -"2. Log in to your account at Paypal.com and go to :menuselection:`My Account" -" --> Profile --> My Selling Tools`. There click *PayPal button language " -"encoding* under *More Selling Tools* section. Then, click *More Options* and" -" replace the two default encoding formats by *UTF-8*." +"Create a `Paypal Business Account `__ or upgrade " +"your account to *Business account* if you have a basic account." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:20 -msgid "Open Paypal setup form in Odoo and enter your *Email ID*." +#: ../../ecommerce/shopper_experience/paypal.rst:16 +msgid "" +"Log in to `Paypal `__ and open the settings of your " +"**Profile**." msgstr "" #: ../../ecommerce/shopper_experience/paypal.rst:22 -msgid "" -"4. The Paypal Merchant ID is not mandatory (extra verification level). It is" -" provided in Paypal under :menuselection:`My Account --> Overview`." +msgid "Now enter the menu **My selling tools**." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:25 -msgid "" -"5. Configure the IPN feedback (Paypal contacting your Odoo instance without " -"needing the redirection). The setting can be found in " -":menuselection:`Profile --> My Selling Tools --> Instant payment " -"notification`. Activate it and set it to " -"/payment/paypal/ipn." +#: ../../ecommerce/shopper_experience/paypal.rst:27 +msgid "Let's start with the **Website Preferences**." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:30 +#: ../../ecommerce/shopper_experience/paypal.rst:29 msgid "" -"6. To test the workflow, you can create sandbox accounts by logging in at " -"https://developer.paypal.com/webapps/developer/applications/myapps with the " -"same Paypal credentials. Two default sandbox accounts are automatically " -"generated when you register to Paypal: one is a buyer, the other is a " -"shopper." +"Turn on **Auto Return** and enter the **Return URL**: " +"/shop/confirmation. Verify that this address uses the " +"correct protocol (HTTP/HTTPS)." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:35 +#: ../../ecommerce/shopper_experience/paypal.rst:36 msgid "" -"7. Log in with your buyer sandbox account to https://www.sandbox.paypal.com " -"(same password than real account) and apply the same format change." +"Turn on **Payment Data Transfer**. When saving, an **Identity Token** is " +"generated. You will be later requested to enter it in Odoo." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:39 +#: ../../ecommerce/shopper_experience/paypal.rst:43 msgid "" -"To automatically redirect your customers when the payment is completed, go " -"to your Website Preferences and turn *Auto Return* on. Set *Return URL* to " -"/shop/confirmation. Verify that your *Notify URL* uses " -"the correct protocol (HTTP/HTTPS)." +"Then, get back to your profile to activate the **Instant Payment " +"Notification (IPN)** in *My selling tools*." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:44 -msgid "" -"If you want your customers to pay without creating a Paypal account, *Paypal" -" Account Optional* needs to be turned on." +#: ../../ecommerce/shopper_experience/paypal.rst:46 +msgid "Enter the **Notification URL**: /payment/paypal/ipn" msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:48 +#: ../../ecommerce/shopper_experience/paypal.rst:51 +msgid "" +"Now you must change the encoding format of the payment request sent by Odoo " +"to Paypal. To do so, get back to *My selling tools* and click **PayPal " +"button language encoding** in *More Selling Tools* section." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:58 +msgid "" +"Then, click *More Options* and set the two default encoding formats as " +"**UTF-8**." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:66 +msgid "" +"If you want your customers to pay without creating a Paypal account, " +"**Paypal Account Optional** needs to be turned on." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:74 +msgid "Set up Paypal's payment method in Odoo" +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:75 +msgid "" +"Open Paypal setup form in :menuselection:`Website or Sales or Accounting -->" +" Settings --> Payment Acquirers+`. Enter both your **Email ID** and your " +"**Merchant ID** and check **Use IPN**." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:82 +msgid "" +"They are both provided in your Paypal profile, under :menuselection:`My " +"business info`." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:85 +msgid "" +"Enter your **Identity Token** in Odoo (from *Auto Return* option). To do so," +" open the *Settings* and activate the **Developer Mode**." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:91 +msgid "" +"Then, go to :menuselection:`Settings --> Technical --> Parameters --> System" +" Parameters` and create a parameter with following values:" +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:94 +msgid "Key: payment_paypal.pdt_token" +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:95 +msgid "Value: your Paypal *Identity Token*" +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:102 +msgid "Go live" +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:103 +msgid "" +"Your configuration is now ready! You can make Paypal visible on your " +"merchant interface and activate the **Production mode**." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:112 msgid "Transaction fees" msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:50 +#: ../../ecommerce/shopper_experience/paypal.rst:114 msgid "" "You can charge an extra to the customer to cover the transaction fees Paypal" " charges you. Once redirected to Paypal, your customer sees an extra applied" " to the order amount." msgstr "" -#: ../../ecommerce/shopper_experience/paypal.rst:53 +#: ../../ecommerce/shopper_experience/paypal.rst:117 msgid "" -"To activate this, go to the *Configuration* tab and check *Add Extra Fees*. " -"Default fees are the ones charged by Paypal." +"To activate this, go to the *Configuration* tab of Paypal config form in " +"Odoo and check *Add Extra Fees*. Default fees for US can be seen here below." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:123 +msgid "" +"To apply the right fees for your country, please refer to `Paypal Fees " +"`__." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:128 +msgid "Test the payment flow" +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:130 +msgid "" +"You can test the entire payment flow thanks to Paypal Sandbox accounts." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:132 +msgid "" +"Log in to `Paypal Developer Site `__ with your" +" Paypal credentials. This will create two sandbox accounts:" +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:136 +msgid "" +"A business account (to use as merchant, e.g. " +"pp.merch01-facilitator@example.com)." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:137 +msgid "" +"A default personal account (to use as shopper, e.g. " +"pp.merch01-buyer@example.com)." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:139 +msgid "" +"Log in to `Paypal Sandbox `__ with the " +"merchant account and follow the same configuration instructions." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:142 +msgid "" +"Enter your sandbox credentials in Odoo and make sure Paypal is still set on " +"*Test* mode. Also, make sure the confirmation mode of Paypal is not " +"*Authorize & capture the amount, confirm the SO and auto-validate the " +"invoice on acquirer confirmation*. Otherwise a confirmed invoice will be " +"automatically generated when the transaction is completed." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:150 +msgid "Run a test transaction from Odoo using the sandbox personal account." +msgstr "" + +#: ../../ecommerce/shopper_experience/paypal.rst:154 +msgid ":doc:`payment`" msgstr "" #: ../../ecommerce/shopper_experience/portal.rst:3 -msgid "How customers can access their portal" +msgid "How customers can access their customer account" msgstr "" #: ../../ecommerce/shopper_experience/portal.rst:5 msgid "" -"It has never been so easy for your customers to access their documents " -"through a portal. Forget endless signup forms, Odoo makes it as easy as ABC." -" With eCommerce and Online Quotation apps, your customers are requested to " -"create a portal account (name, email, password only) from the very first " -"order confirmation or online quotation email they get from you." +"It has never been so easy for your customers to access their customer " +"account. Forget endless signup forms, Odoo makes it as easy as ABC. They are" +" suggested to sign up (name, email, password) when the order is placed, and " +"not before. Indeed, nothing is more annoying than going through a signup " +"process before buying something." msgstr "" -#: ../../ecommerce/shopper_experience/portal.rst:12 +#: ../../ecommerce/shopper_experience/portal.rst:14 msgid "Sign up" msgstr "注册" -#: ../../ecommerce/shopper_experience/portal.rst:14 +#: ../../ecommerce/shopper_experience/portal.rst:16 msgid "" -"When clicking the link in the email or when clicking *Sign up* in the " -"checkout process, your customer is directed to the *Sign up* page." -msgstr "" - -#: ../../ecommerce/shopper_experience/portal.rst:21 -msgid "Customer account" +"The invitation to sign up shows up when the customer wants to visualize the " +"order from order confirmation email." msgstr "" #: ../../ecommerce/shopper_experience/portal.rst:23 +msgid "Customer account" +msgstr "" + +#: ../../ecommerce/shopper_experience/portal.rst:25 msgid "" -"Once logged in the customer will access his account by clicking *My Account*" +"Once logged in the customer will access the account by clicking *My Account*" " in the login dropdown menu." msgstr "" -#: ../../ecommerce/shopper_experience/portal.rst:29 +#: ../../ecommerce/shopper_experience/portal.rst:31 msgid "" -"From the portal menu all the customer history can be reviewed. The main " -"address (billing) can also be modified." +"THere they find all their history. The main address (billing) can also be " +"modified." msgstr "" -#: ../../ecommerce/shopper_experience/portal.rst:36 +#: ../../ecommerce/shopper_experience/portal.rst:37 msgid "" -"If a portal user is a contact of a company (*Company* field set in customer " -"detail form), this last will see all the documents of the company and all " -"its other contacts through the portal." +"If the customer is set as a contact of a company in your address book, they " +"will see all the documents whose the customer belongs to this company." +msgstr "" + +#: ../../ecommerce/shopper_experience/wire_transfer.rst:3 +msgid "How to get paid with wire transfers" +msgstr "" + +#: ../../ecommerce/shopper_experience/wire_transfer.rst:5 +msgid "" +"**Wire Transfer** is the default payment method available. The aim is " +"providing your customers with your bank details so they can pay on their " +"own. This is very easy to start with but slow and inefficient process-wise. " +"Opt for payment acquirers as soon as you can!" +msgstr "" + +#: ../../ecommerce/shopper_experience/wire_transfer.rst:13 +msgid "How to provide customers with payment instructions" +msgstr "" + +#: ../../ecommerce/shopper_experience/wire_transfer.rst:14 +msgid "" +"Put your payment instructions in the **Thanks Message** of your payment " +"method." +msgstr "" + +#: ../../ecommerce/shopper_experience/wire_transfer.rst:19 +msgid "They will appear to the customers when they place an order." +msgstr "" + +#: ../../ecommerce/shopper_experience/wire_transfer.rst:26 +msgid "How to manage an order once you get paid" +msgstr "" + +#: ../../ecommerce/shopper_experience/wire_transfer.rst:28 +msgid "" +"Whenever a customer pays by wire transfer, the order stays in an " +"intermediary stage **Quotation Sent** (i.e. unpaid order). When you get " +"paid, you confirm the order manually to launch the delivery." +msgstr "" + +#: ../../ecommerce/shopper_experience/wire_transfer.rst:35 +msgid "How to create other manual payment methods" +msgstr "" + +#: ../../ecommerce/shopper_experience/wire_transfer.rst:37 +msgid "" +"If you manage a B2B business, you can create other manually-processed " +"payment methods like paying by check. To do so, just rename *Wire Transfer* " +"or duplicate it." msgstr "" #: ../../ecommerce/taxes.rst:3 diff --git a/locale/zh_CN/LC_MESSAGES/general.po b/locale/zh_CN/LC_MESSAGES/general.po index ab276c61d..6cca95dbc 100644 --- a/locale/zh_CN/LC_MESSAGES/general.po +++ b/locale/zh_CN/LC_MESSAGES/general.po @@ -6,11 +6,11 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Odoo Business 9.0\n" +"Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-23 15:39+0100\n" +"POT-Creation-Date: 2017-05-09 14:24+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: liAnGjiA , 2017\n" +"Last-Translator: Jeffery CHEN , 2017\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" @@ -23,8 +23,8 @@ msgid "General" msgstr "常规" #: ../../general/auth.rst:3 -msgid "Authentification" -msgstr "" +msgid "Authentication" +msgstr "身份验证" #: ../../general/auth/google.rst:3 msgid "How to allow users to sign in with their Google account" @@ -84,64 +84,196 @@ msgid "" msgstr "" #: ../../general/base_import.rst:3 -msgid "BASE IMPORT" -msgstr "基础资料数据导入" +msgid "Data Import" +msgstr "" + +#: ../../general/base_import/adapt_template.rst:3 +msgid "How to adapt an import template" +msgstr "" + +#: ../../general/base_import/adapt_template.rst:5 +msgid "" +"Import templates are provided in the import tool of the most common data to " +"import (contacts, products, bank statements, etc.). You can open them with " +"any spreadsheets software (Microsoft Office, OpenOffice, Google Drive, " +"etc.)." +msgstr "" + +#: ../../general/base_import/adapt_template.rst:11 +msgid "How to customize the file" +msgstr "" + +#: ../../general/base_import/adapt_template.rst:13 +msgid "" +"Remove columns you don't need. We advise to not remove the *ID* one (see why" +" here below)." +msgstr "" + +#: ../../general/base_import/adapt_template.rst:15 +#: ../../general/base_import/import_faq.rst:26 +msgid "" +"Set a unique ID to every single record by dragging down the ID sequencing." +msgstr "" + +#: ../../general/base_import/adapt_template.rst:20 +msgid "" +"When you add a new column, Odoo might not be able to map it automatically if" +" its label doesn't fit any field of the system. If so, find the " +"corresponding field using the search." +msgstr "" + +#: ../../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" +msgstr "" + +#: ../../general/base_import/adapt_template.rst:33 +msgid "" +"The **ID** (External ID) is an unique identifier for the line item. Feel " +"free to use the one of your previous software to ease the transition to " +"Odoo." +msgstr "" + +#: ../../general/base_import/adapt_template.rst:36 +msgid "" +"Setting an ID is not mandatory when importing but it helps in many cases:" +msgstr "" + +#: ../../general/base_import/adapt_template.rst:38 +msgid "" +"Update imports: you can import the same file several times without creating " +"duplicates;" +msgstr "" + +#: ../../general/base_import/adapt_template.rst:39 +msgid "Import relation fields (see here below)." +msgstr "" + +#: ../../general/base_import/adapt_template.rst:42 +msgid "How to import relation fields" +msgstr "" + +#: ../../general/base_import/adapt_template.rst:44 +msgid "" +"An Odoo object is always related to many other objects (e.g. a product is " +"linked to product categories, attributes, vendors, etc.). To import those " +"relations you need to import the records of the related object first from " +"their own list menu." +msgstr "" + +#: ../../general/base_import/adapt_template.rst:48 +msgid "" +"You can do it using either the name of the related record or its ID. The ID " +"is expected when two records have the same name. In such a case add \" / " +"ID\" at the end of the column title (e.g. for product attributes: Product " +"Attributes / Attribute / ID)." +msgstr "" #: ../../general/base_import/import_faq.rst:3 -msgid "Import CSV file to Odoo" -msgstr "导入CSV文件到Odoo" +msgid "How to import data into Odoo" +msgstr "" -#: ../../general/base_import/import_faq.rst:8 -msgid "Frequently Asked Questions" -msgstr "常见问题" +#: ../../general/base_import/import_faq.rst:6 +msgid "How to start" +msgstr "" -#: ../../general/base_import/import_faq.rst:12 -msgid "Need to import data from an other application?" -msgstr "需要从其他应用程序中导入数据？" - -#: ../../general/base_import/import_faq.rst:14 +#: ../../general/base_import/import_faq.rst:7 msgid "" -"In order to re-create relationships between different records, you should " -"use the unique identifier from the original application and map it to the " -"**ID** (External ID) column in Odoo. When you import an other record that " -"links to the first one, use **XXX/ID** (XXX/External ID) to the original " -"unique identifier." +"You can import data on any Odoo's business object using either Excel (.xlsx)" +" or CSV (.csv) formats: contacts, products, bank statements, journal entries" +" and even orders!" +msgstr "" + +#: ../../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 "" -"The **ID** (External ID) will also be used to update the original import if " -"you need to re-import modified data later, it's thus good practice to " -"specify it whenever possible." +"There you are provided with templates you can easily populate with your own " +"data. Such templates can be imported in one click; The data mapping is " +"already done." msgstr "" -#: ../../general/base_import/import_faq.rst:21 -msgid "I cannot find the field I want to map my column to?" +#: ../../general/base_import/import_faq.rst:22 +msgid "How to adapt the template" msgstr "" -#: ../../general/base_import/import_faq.rst:23 -msgid "" -"Odoo try to find with some heuristic, based on the first ten lines of the " -"files, the type of field for each columns inside your file. For example if " -"you have a column only containing numbers, only the fields that are of type " -"integer will be displayed for you to choose from. While this behaviour might" -" be good and easy for most cases scenarios, it is also possible that it goes" -" wrong sometimes or that you want to map your column to a field that is not " -"proposed by default." +#: ../../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 "" -"If that happens, you just have to check the **Show all fields for completion" -" (advanced)** option, you will then be able to choose from the complete list" -" of fields for each columns." +msgid "We advise to not remove the **ID** one (see why in the next section)." msgstr "" -#: ../../general/base_import/import_faq.rst:30 +#: ../../general/base_import/import_faq.rst:31 +msgid "" +"When you add a new column, Odoo might not be able to map it automatically if" +" its label doesn't fit any field in Odoo. Don't worry! You can map new " +"columns manually when you test the import. Search the list for the " +"corresponding field." +msgstr "" + +#: ../../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 "" + +#: ../../general/base_import/import_faq.rst:46 +msgid "" +"In order to re-create relationships between different records, you should " +"use the unique identifier from the original application and map it to the " +"**ID** (External ID) column in Odoo. When you import another record that " +"links to the first one, use **XXX/ID** (XXX/External ID) to the original " +"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 "" + +#: ../../general/base_import/import_faq.rst:54 +msgid "" +"The **ID** will also be used to update the original import if you need to " +"re-import modified data later, it's thus good practice to specify it " +"whenever possible." +msgstr "" + +#: ../../general/base_import/import_faq.rst:60 +msgid "I cannot find the field I want to map my column to" +msgstr "" + +#: ../../general/base_import/import_faq.rst:62 +msgid "" +"Odoo tries to find with some heuristic, based on the first ten lines of the " +"files, the type of field for each column inside your file. For example if " +"you have a column only containing numbers, only the fields that are of type " +"*Integer* will be displayed for you to choose from. While this behavior " +"might be good and easy for most cases, it is also possible that it goes " +"wrong or that you want to map your column to a field that is not proposed by" +" default." +msgstr "" + +#: ../../general/base_import/import_faq.rst:71 +msgid "" +"If that happens, you just have to check the ** Show fields of relation " +"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 "" -#: ../../general/base_import/import_faq.rst:32 +#: ../../general/base_import/import_faq.rst:81 msgid "" "Odoo can automatically detect if a column is a date and it will try to guess" " the date format from a set of most used date format. While this process can" @@ -151,7 +283,7 @@ msgid "" " day and which one is the month in a date like '01-03-2016'." msgstr "" -#: ../../general/base_import/import_faq.rst:34 +#: ../../general/base_import/import_faq.rst:83 msgid "" "To view which date format Odoo has found from your file you can check the " "**Date Format** that is shown when clicking on **Options** under the file " @@ -159,7 +291,7 @@ msgid "" " the *ISO 8601* to define the format." msgstr "" -#: ../../general/base_import/import_faq.rst:37 +#: ../../general/base_import/import_faq.rst:86 msgid "" "If you are importing an excel (.xls, .xlsx) file, you can use date cells to " "store dates as the display of dates in excel is different from the way it is" @@ -167,11 +299,11 @@ msgid "" "whatever your locale date format is." msgstr "" -#: ../../general/base_import/import_faq.rst:42 +#: ../../general/base_import/import_faq.rst:91 msgid "Can I import numbers with currency sign (e.g.: $32.00)?" msgstr "" -#: ../../general/base_import/import_faq.rst:44 +#: ../../general/base_import/import_faq.rst:93 msgid "" "Yes, we fully support numbers with parenthesis to represent negative sign as" " well as numbers with currency sign attached to them. Odoo also " @@ -181,56 +313,56 @@ msgid "" "crash." msgstr "" -#: ../../general/base_import/import_faq.rst:46 +#: ../../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:48 +#: ../../general/base_import/import_faq.rst:97 msgid "32.000,00" msgstr "" -#: ../../general/base_import/import_faq.rst:49 +#: ../../general/base_import/import_faq.rst:98 msgid "32000,00" msgstr "" -#: ../../general/base_import/import_faq.rst:50 +#: ../../general/base_import/import_faq.rst:99 msgid "32,000.00" msgstr "" -#: ../../general/base_import/import_faq.rst:51 +#: ../../general/base_import/import_faq.rst:100 msgid "-32000.00" msgstr "" -#: ../../general/base_import/import_faq.rst:52 +#: ../../general/base_import/import_faq.rst:101 msgid "(32000.00)" msgstr "" -#: ../../general/base_import/import_faq.rst:53 +#: ../../general/base_import/import_faq.rst:102 msgid "$ 32.000,00" msgstr "" -#: ../../general/base_import/import_faq.rst:54 +#: ../../general/base_import/import_faq.rst:103 msgid "(32000.00 €)" msgstr "" -#: ../../general/base_import/import_faq.rst:56 +#: ../../general/base_import/import_faq.rst:105 msgid "Example that will not work:" msgstr "" -#: ../../general/base_import/import_faq.rst:58 +#: ../../general/base_import/import_faq.rst:107 msgid "ABC 32.000,00" msgstr "" -#: ../../general/base_import/import_faq.rst:59 +#: ../../general/base_import/import_faq.rst:108 msgid "$ (32.000,00)" msgstr "" -#: ../../general/base_import/import_faq.rst:64 +#: ../../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:66 +#: ../../general/base_import/import_faq.rst:115 msgid "" "By default the Import preview is set on commas as field separators and " "quotation marks as text delimiters. If your csv file does not have these " @@ -238,20 +370,20 @@ msgid "" " CSV file bar after you select your file)." msgstr "" -#: ../../general/base_import/import_faq.rst:68 +#: ../../general/base_import/import_faq.rst:117 msgid "" "Note that if your CSV file has a tabulation as separator, Odoo will not " "detect the separations. You will need to change the file format options in " "your spreadsheet application. See the following question." msgstr "" -#: ../../general/base_import/import_faq.rst:73 +#: ../../general/base_import/import_faq.rst:122 msgid "" "How can I change the CSV file format options when saving in my spreadsheet " "application?" msgstr "" -#: ../../general/base_import/import_faq.rst:75 +#: ../../general/base_import/import_faq.rst:124 msgid "" "If you edit and save CSV files in speadsheet applications, your computer's " "regional settings will be applied for the separator and delimiter. We " @@ -260,17 +392,17 @@ msgid "" "filter settings' > Save)." msgstr "" -#: ../../general/base_import/import_faq.rst:77 +#: ../../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 "" -#: ../../general/base_import/import_faq.rst:82 +#: ../../general/base_import/import_faq.rst:131 msgid "What's the difference between Database ID and External ID?" msgstr "" -#: ../../general/base_import/import_faq.rst:84 +#: ../../general/base_import/import_faq.rst:133 msgid "" "Some fields define a relationship with another object. For example, the " "country of a contact is a link to a record of the 'Country' object. When you" @@ -280,58 +412,58 @@ msgid "" "import." msgstr "" -#: ../../general/base_import/import_faq.rst:86 +#: ../../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 "" -#: ../../general/base_import/import_faq.rst:88 +#: ../../general/base_import/import_faq.rst:137 msgid "Country: the name or code of the country" msgstr "国家：国家的名称或代码" -#: ../../general/base_import/import_faq.rst:89 +#: ../../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 "" -#: ../../general/base_import/import_faq.rst:90 +#: ../../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 "" -#: ../../general/base_import/import_faq.rst:92 +#: ../../general/base_import/import_faq.rst:141 msgid "For the country Belgium, you can use one of these 3 ways to import:" msgstr "" -#: ../../general/base_import/import_faq.rst:94 +#: ../../general/base_import/import_faq.rst:143 msgid "Country: Belgium" msgstr "国家: 比利时" -#: ../../general/base_import/import_faq.rst:95 +#: ../../general/base_import/import_faq.rst:144 msgid "Country/Database ID: 21" msgstr "" -#: ../../general/base_import/import_faq.rst:96 +#: ../../general/base_import/import_faq.rst:145 msgid "Country/External ID: base.be" msgstr "Country/External ID: base.be" -#: ../../general/base_import/import_faq.rst:98 +#: ../../general/base_import/import_faq.rst:147 msgid "" "According to your need, you should use one of these 3 ways to reference " "records in relations. Here is when you should use one or the other, " "according to your need:" msgstr "" -#: ../../general/base_import/import_faq.rst:100 +#: ../../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 "" -#: ../../general/base_import/import_faq.rst:101 +#: ../../general/base_import/import_faq.rst:150 msgid "" "Use Country/Database ID: You should rarely use this notation. It's mostly " "used by developers as it's main advantage is to never have conflicts (you " @@ -339,13 +471,13 @@ msgid "" "Database ID)" msgstr "" -#: ../../general/base_import/import_faq.rst:102 +#: ../../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 "" -#: ../../general/base_import/import_faq.rst:104 +#: ../../general/base_import/import_faq.rst:153 msgid "" "When you use External IDs, you can import CSV files with the \"External ID\"" " column to define the External ID of each record you import. Then, you will " @@ -354,23 +486,23 @@ msgid "" "Products and their Categories." msgstr "" -#: ../../general/base_import/import_faq.rst:106 +#: ../../general/base_import/import_faq.rst:155 msgid "" "`CSV file for categories " "<../../_static/example_files/External_id_3rd_party_application_product_categories.csv>`_." msgstr "" -#: ../../general/base_import/import_faq.rst:108 +#: ../../general/base_import/import_faq.rst:157 msgid "" "`CSV file for Products " "<../../_static/example_files/External_id_3rd_party_application_products.csv>`_." msgstr "" -#: ../../general/base_import/import_faq.rst:112 +#: ../../general/base_import/import_faq.rst:161 msgid "What can I do if I have multiple matches for a field?" msgstr "如果我有多对一的字段怎么做？" -#: ../../general/base_import/import_faq.rst:114 +#: ../../general/base_import/import_faq.rst:163 msgid "" "If for example you have two product categories with the child name " "\"Sellable\" (ie. \"Misc. Products/Sellable\" & \"Other " @@ -381,20 +513,20 @@ msgid "" "the duplicates' values or your product category hierarchy." msgstr "" -#: ../../general/base_import/import_faq.rst:116 +#: ../../general/base_import/import_faq.rst:165 msgid "" "However if you do not wish to change your configuration of product " "categories, we recommend you use make use of the external ID for this field " "'Category'." msgstr "" -#: ../../general/base_import/import_faq.rst:121 +#: ../../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 "" -#: ../../general/base_import/import_faq.rst:123 +#: ../../general/base_import/import_faq.rst:172 msgid "" "The tags should be separated by a comma without any spacing. For example, if" " you want your customer to be linked to both tags 'Manufacturer' and " @@ -402,19 +534,19 @@ msgid "" " of your CSV file." msgstr "" -#: ../../general/base_import/import_faq.rst:125 +#: ../../general/base_import/import_faq.rst:174 msgid "" "`CSV file for Manufacturer, Retailer " "<../../_static/example_files/m2m_customers_tags.csv>`_." msgstr "" -#: ../../general/base_import/import_faq.rst:130 +#: ../../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 "" -#: ../../general/base_import/import_faq.rst:132 +#: ../../general/base_import/import_faq.rst:181 msgid "" "If you want to import sales order having several order lines; for each order" " line, you need to reserve a specific row in the CSV file. The first order " @@ -425,41 +557,41 @@ msgid "" "you can import, based on demo data." msgstr "" -#: ../../general/base_import/import_faq.rst:135 +#: ../../general/base_import/import_faq.rst:184 msgid "" "`File for some Quotations " "<../../_static/example_files/purchase.order_functional_error_line_cant_adpat.csv>`_." msgstr "" -#: ../../general/base_import/import_faq.rst:137 +#: ../../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 "" -#: ../../general/base_import/import_faq.rst:139 +#: ../../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 "" -#: ../../general/base_import/import_faq.rst:141 +#: ../../general/base_import/import_faq.rst:190 msgid "" "The following CSV file shows how to import customers and their respective " "contacts:" msgstr "" -#: ../../general/base_import/import_faq.rst:143 +#: ../../general/base_import/import_faq.rst:192 msgid "" "`Customers and their respective contacts " "<../../_static/example_files/o2m_customers_contacts.csv>`_." msgstr "" -#: ../../general/base_import/import_faq.rst:148 +#: ../../general/base_import/import_faq.rst:197 msgid "Can I import several times the same record?" msgstr "我可以导入多次相同的记录？" -#: ../../general/base_import/import_faq.rst:150 +#: ../../general/base_import/import_faq.rst:199 msgid "" "If you import a file that contains one of the column \"External ID\" or " "\"Database ID\", records that have already been imported will be modified " @@ -469,17 +601,17 @@ msgid "" "depending if it's new or not." msgstr "" -#: ../../general/base_import/import_faq.rst:152 +#: ../../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 "" -#: ../../general/base_import/import_faq.rst:157 +#: ../../general/base_import/import_faq.rst:206 msgid "What happens if I do not provide a value for a specific field?" msgstr "" -#: ../../general/base_import/import_faq.rst:159 +#: ../../general/base_import/import_faq.rst:208 msgid "" "If you do not set all fields in your CSV file, Odoo will assign the default " "value for every non defined fields. But if you set fields with empty values " @@ -487,11 +619,11 @@ msgid "" "assigning the default value." msgstr "" -#: ../../general/base_import/import_faq.rst:164 +#: ../../general/base_import/import_faq.rst:213 msgid "How to export/import different tables from an SQL application to Odoo?" msgstr "" -#: ../../general/base_import/import_faq.rst:166 +#: ../../general/base_import/import_faq.rst:215 msgid "" "If you need to import data from different tables, you will have to recreate " "relations between records belonging to different tables. (e.g. if you import" @@ -499,7 +631,7 @@ msgid "" "person and the company they work for)." msgstr "" -#: ../../general/base_import/import_faq.rst:168 +#: ../../general/base_import/import_faq.rst:217 msgid "" "To manage relations between tables, you can use the \"External ID\" " "facilities of Odoo. The \"External ID\" of a record is the unique identifier" @@ -509,7 +641,7 @@ msgid "" "'company_1', 'person_1' instead of '1')" msgstr "" -#: ../../general/base_import/import_faq.rst:170 +#: ../../general/base_import/import_faq.rst:219 msgid "" "As an example, suppose you have a SQL database with two tables you want to " "import: companies and persons. Each person belong to one company, so you " @@ -519,27 +651,27 @@ msgid "" "PostgreSQL database)" msgstr "" -#: ../../general/base_import/import_faq.rst:172 +#: ../../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 "" -#: ../../general/base_import/import_faq.rst:178 +#: ../../general/base_import/import_faq.rst:227 msgid "This SQL command will create the following CSV file::" msgstr "" -#: ../../general/base_import/import_faq.rst:185 +#: ../../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 "" -#: ../../general/base_import/import_faq.rst:191 +#: ../../general/base_import/import_faq.rst:240 msgid "It will produce the following CSV file::" msgstr "" -#: ../../general/base_import/import_faq.rst:199 +#: ../../general/base_import/import_faq.rst:248 msgid "" "As you can see in this file, Fabien and Laurence are working for the Bigees " "company (company_1) and Eric is working for the Organi company. The relation" @@ -549,7 +681,7 @@ msgid "" " who shared the same ID 1 in the orignial database)." msgstr "" -#: ../../general/base_import/import_faq.rst:201 +#: ../../general/base_import/import_faq.rst:250 msgid "" "The two files produced are ready to be imported in Odoo without any " "modifications. After having imported these two CSV files, you will have 4 " diff --git a/locale/zh_CN/LC_MESSAGES/inventory.po b/locale/zh_CN/LC_MESSAGES/inventory.po index be31f6e75..3c70616da 100644 --- a/locale/zh_CN/LC_MESSAGES/inventory.po +++ b/locale/zh_CN/LC_MESSAGES/inventory.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-04-20 15:45+0200\n" +"POT-Creation-Date: 2017-05-09 14:24+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: 苏州远鼎 , 2017\n" "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n" @@ -748,16 +748,28 @@ msgstr "" "最小库存规则的配置是在菜单项 :menuselection:`库存(Inventory) --> 存货控制(Inventory Control) -->" " 再定点规则(Reordering Rule)` 的下拉菜单中。然后点击 **创建** 去设置给定产品最小和最大库存数值。" +#: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0 +msgid "Active" +msgstr "" + #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0 msgid "" "If the active field is set to False, it will allow you to hide the " "orderpoint without removing it." msgstr "如果没有选中“可用”字段，那么将隐藏需求单记录且不会删除它。" +#: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0 +msgid "Product Unit of Measure" +msgstr "" + #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0 msgid "Default Unit of Measure used for all stock operation." msgstr "所有库存作业的默认计量单位" +#: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0 +msgid "Procurement Group" +msgstr "" + #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0 msgid "" "Moves created through this orderpoint will be put in this procurement group." @@ -765,6 +777,10 @@ msgid "" "into one big picking." msgstr "通过此订购点创建的移动将放在此补货组中。如果没有被提供，由补货规则生成的移动将被组合到一个大分拣。" +#: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0 +msgid "Minimum Quantity" +msgstr "" + #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0 msgid "" "When the virtual stock goes below the Min Quantity specified for this field," @@ -772,6 +788,10 @@ msgid "" "Quantity." msgstr "当虚拟库存小于指定的最小数量，Odoo生成补货将预测数量带到最大数量。" +#: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0 +msgid "Maximum Quantity" +msgstr "" + #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0 msgid "" "When the virtual stock goes below the Min Quantity, Odoo generates a " @@ -779,12 +799,20 @@ msgid "" "Max Quantity." msgstr "当虚拟库存低于最小数量， Odoo生成补货将预测数量带到最大数量。" +#: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0 +msgid "Quantity Multiple" +msgstr "" + #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0 msgid "" "The procurement quantity will be rounded up to this multiple. If it is 0, " "the exact quantity will be used." msgstr "补货数量会翻转到此倍数。 如果它是0, 那么确切的数量会被使用。" +#: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0 +msgid "Lead Time" +msgstr "" + #: ../../inventory/management/adjustment/min_stock_rule_vs_mto.rst:0 msgid "" "Number of days after the orderpoint is triggered to receive the products or " diff --git a/locale/zh_CN/LC_MESSAGES/point_of_sale.po b/locale/zh_CN/LC_MESSAGES/point_of_sale.po index bfa8f7420..ca0d4b41a 100644 --- a/locale/zh_CN/LC_MESSAGES/point_of_sale.po +++ b/locale/zh_CN/LC_MESSAGES/point_of_sale.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-04-20 15:45+0200\n" +"POT-Creation-Date: 2017-05-09 14:24+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Martin Trigaux , 2017\n" "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n" @@ -2016,136 +2016,252 @@ msgid "" "location,..." msgstr "你可以根据硬件，位置等条件配置ＰＯＳ" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Point of Sale Name" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "An internal identification of the point of sale" msgstr "这个一个ＰＯＳ的内部识别" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Sales Journal" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "Accounting journal used to post sales entries." msgstr "会计日记账用来登录销售分录。" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Invoice Journal" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "Accounting journal used to create invoices." msgstr "" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Group Journal Items" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "" "Check this if you want to group the Journal Items by Product while closing a" " Session" msgstr "如果您想在关闭一个会话时，按产品来对分类账项目进行分组，请勾选此项。" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Barcodes" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "" "Defines what kind of barcodes are available and how they are assigned to " "products, customers and cashiers" msgstr "定义并分配相关的条码给商品，客户和收银员" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Order IDs Sequence" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "" "This sequence is automatically created by Odoo but you can change it to " "customize the reference numbers of your orders." msgstr "这个序列号是由Odoo自动产生的，不过您可以自己定义订单的序列号。" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Sales Channel" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "This Point of sale's sales will be related to this Sales Channel." msgstr "" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Virtual KeyBoard" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "Enables an integrated Virtual Keyboard" msgstr "允许集成虚拟键盘" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Invoicing" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "Enables invoice generation from the Point of Sale" msgstr "启用POS生成发票" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Prefill Cash Payment" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "" "The payment input will behave similarily to bank payment input, and will be " "prefilled with the exact due amount" msgstr "付款输入和银行凭证输入类似，将事先录入到期金额" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Start Category" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "" "The point of sale will display this product category by default. If no " "category is specified, all available products will be shown" msgstr "ＰＯＳ会默认显示属于该类别的商品，如果没有指定，所有商品将显示。" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Tip Product" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "" "The product used to encode the customer tip. Leave empty if you do not " "accept tips." msgstr "该商品通常含有小费，如果不接受小费，请留空" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Include Taxes in Prices" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "" "The displayed prices will always include all taxes, even if the taxes have " "been setup differently" msgstr "显示的价格总是包含所有的税，即使税被不同的设置" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Large Scrollbars" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "For imprecise industrial touchscreens" msgstr "用于非工业级触摸屏" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Display Category Pictures" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "The product categories will be displayed with pictures." msgstr "在图片上会显示商品类别" +#: ../../point_of_sale/overview/start.rst:0 +msgid "IP Address" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "" "The hostname or ip address of the hardware proxy, Will be autodetected if " "left empty" msgstr "如果保持为空，硬件代理服务器的主机名或ＩＰ地址会被自动识别到" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Barcode Scanner" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "Enable barcode scanning with a remotely connected barcode scanner" msgstr "允许通过远程连接的条码枪进行扫描" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Electronic Scale" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "Enables Electronic Scale integration" msgstr "允许电子秤集成" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Cashdrawer" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "Automatically open the cashdrawer" msgstr "自动打开钱箱" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Receipt Printer" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "Bypass browser printing and prints via the hardware proxy" msgstr "通过浏览器打印和通过硬件代理打印" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Automatic Receipt Printing" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "The receipt will automatically be printed at the end of each order" msgstr "每张订单的最后会自动的打印出收据" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Skip Receipt Screen" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "" "The receipt screen will be skipped if the receipt can be printed " "automatically." msgstr "小票预览将被略过如果小票是设置成自动打印" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Header" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "A short text that will be inserted as a header in the printed receipt" msgstr "短文本会作为表头插入到打印的销售小票上" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Footer" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "A short text that will be inserted as a footer in the printed receipt" msgstr "短文本会作为结尾插入到打印的销售小票上" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Cash Control" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "Check the amount of the cashbox at opening and closing." msgstr "在开业和关闭检查钱箱的总额" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Bill Splitting" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "Enables Bill Splitting in the Point of Sale" msgstr "允许在ＰＯＳ中进行销售付款拆分" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Bill Printing" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "Allows to print the Bill before payment" msgstr "允许在付款前打印销售发票" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Orderline Notes" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "Allow custom notes on Orderlines" msgstr "允许在订单行中自定义" +#: ../../point_of_sale/overview/start.rst:0 +msgid "Restaurant Floors" +msgstr "" + #: ../../point_of_sale/overview/start.rst:0 msgid "The restaurant floors served by this point of sale" msgstr "该ＰＯＳ对应的餐馆层" @@ -2906,11 +3022,19 @@ msgid "" "all products or only on specific ones. Click on **Add an item**." msgstr "为你的ＰＯＳ建一个价格列表，每个价格列表可以包含多个不同价格和日期的商品，可以选择所有商品或者指定的商品。点击××增加一个项目××" +#: ../../point_of_sale/shop/seasonal_discount.rst:0 +msgid "Active" +msgstr "" + #: ../../point_of_sale/shop/seasonal_discount.rst:0 msgid "" "If unchecked, it will allow you to hide the pricelist without removing it." msgstr "如果不选中，允许您隐藏价格表而无需删除" +#: ../../point_of_sale/shop/seasonal_discount.rst:0 +msgid "Selectable" +msgstr "" + #: ../../point_of_sale/shop/seasonal_discount.rst:0 msgid "Allow the end user to choose this price list" msgstr "允许最终用户选择此价格表" diff --git a/locale/zh_CN/LC_MESSAGES/purchase.po b/locale/zh_CN/LC_MESSAGES/purchase.po index 263eacdb9..3a88482f1 100644 --- a/locale/zh_CN/LC_MESSAGES/purchase.po +++ b/locale/zh_CN/LC_MESSAGES/purchase.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-04-20 15:45+0200\n" +"POT-Creation-Date: 2017-05-09 14:24+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: max_xu , 2017\n" +"Last-Translator: Yuan Xulei , 2017\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" @@ -1687,10 +1687,18 @@ 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 " @@ -1698,32 +1706,56 @@ msgid "" "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 or an internal procurement request)" msgstr "" +#: ../../purchase/purchases/rfq/create.rst:0 +msgid "Deliver To" +msgstr "交货到" + #: ../../purchase/purchases/rfq/create.rst:0 msgid "This will determine picking 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 " diff --git a/locale/zh_CN/LC_MESSAGES/sales.po b/locale/zh_CN/LC_MESSAGES/sales.po index 88a0bf54b..2a1451213 100644 --- a/locale/zh_CN/LC_MESSAGES/sales.po +++ b/locale/zh_CN/LC_MESSAGES/sales.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Odoo Business 9.0\n" +"Project-Id-Version: Odoo Business 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-23 15:39+0100\n" +"POT-Creation-Date: 2017-05-09 14:24+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: waveyeung , 2017\n" "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n" @@ -781,13 +781,11 @@ msgstr " **追踪服务**: 合同上的记工单。一个分析科目会被自 #: ../../sales/invoicing/services/support.rst:66 msgid "" -"There are different ways to track the service related to a sale order or " +"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 "" @@ -804,17 +802,16 @@ msgid "Managing support contract" msgstr "管理支持合同" #: ../../sales/invoicing/services/support.rst:81 -msgid "Quotations and Sale Orders" +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 sale order with" -" the related product. Once the quotation is confirmed and transformed into a" -" sale order, your users will be able to record services related to this " -"support contract using the timesheet application." +"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" @@ -831,8 +828,8 @@ msgstr "" "\"), 然后只要服务被销售掉就可以对之进行跟踪。" #: ../../sales/invoicing/services/support.rst:104 -msgid "Control delivered support on the sale order" -msgstr "在销售订单上控制已交付的支持" +msgid "Control delivered support on the sales order" +msgstr "" #: ../../sales/invoicing/services/support.rst:106 msgid "" @@ -852,71 +849,56 @@ 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, the sale order " -"**Invoicing Status** is automatically set to **Upselling**. This means you " -"have an opportunity to sell an extra contract to the customer since he used " -"all his quota of service." +"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`." msgstr "" -"如果在销售合同上记录的小时数大于或者等于客户采购的数量, 销售订单的 **开票状态** 就会自动的被设置为 **向上销售** " -"。这样意味着你有一个额外合同的新的商机可以卖给该客户, 因为他已经使用完了所购的服务" -#: ../../sales/invoicing/services/support.rst:124 -msgid "" -"Periodically (ideally once every two weeks), you should check the sales " -"order that are in an upselling status. To do this, go to the " -":menuselection:`Sales --> Sales Order` menu and use the **Upselling** filter" -" to get all orders that are in upselling." -msgstr "" -"定期地(最好每两周一次), 你可以检查在向上销售状态的销售订单。要这样做的话, 进入菜单项 :menuselection:`销售(Sales) --> " -"销售订单(Sales Orders)` 菜单并使用 **向上销售** 过滤器收集所有在向上销售状态的订单。" - -#: ../../sales/invoicing/services/support.rst:130 +#: ../../sales/invoicing/services/support.rst:127 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:134 +#: ../../sales/invoicing/services/support.rst:131 msgid "" "If you sell an extra support contract, you can either add a new line on the " -"existing sale order (thus, you continue to timesheet on the same order) or " +"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 sale order as **Upselling**, you can set the sale " -"order as done and it will disappear from your upselling list." +"contract). To unmark the sales order as **Upselling**, you can set the sales" +" order as done and it will disappear from your upselling list." msgstr "" -"如果你销售额外的支持合同, 你还可以在目前的销售订单中添加新的订单行(因此, 你可以继续在同一张合同上记工单)或者创建一个新的订单(这样, " -"就需要在新建的合同上记工单)。取消标记销售订单的 **向上销售** 状态, 并把销售订单设置完成状态, 然后该订单就从向上销售列表中消失" -#: ../../sales/invoicing/services/support.rst:141 +#: ../../sales/invoicing/services/support.rst:138 msgid "Special Configuration" msgstr "特殊配置" -#: ../../sales/invoicing/services/support.rst:143 +#: ../../sales/invoicing/services/support.rst:140 msgid "" "When creating the product form, you may set a different approach to track " "the service:" msgstr "在创建产品表单的时候, 选择不同方式跟踪该服务" -#: ../../sales/invoicing/services/support.rst:146 +#: ../../sales/invoicing/services/support.rst:143 msgid "" "**Create task and track hours**: in this mode, a task is created for every " -"sale order line. Then when you do the timesheet, you don't record hours on a" -" sale order/contract, but you record hours on a task (that represents the " +"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 sale order." +"service contracts within the same sales order." msgstr "" -" **创建任务并追踪小时数**: 在该模式下, 每个订单行都会创建一个任务。然后在你记录记工单的时候, " -"不需要在销售订单／合同上输入。而是在每个任务(代表合同)上记录记工单。该方案的优点是能够在同一张销售订单上销售不同服务合同。" -#: ../../sales/invoicing/services/support.rst:153 +#: ../../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 sale order line directly, in the delivered quantity field." -msgstr " **手工地**: 如果你不在Odoo中记录记工单就可以使用该种模式。特定合同的工作时间手工地在销售订单行的交货数量字段直接记录。" +"manually on the sales order line directly, in the delivered quantity field." +msgstr "" -#: ../../sales/invoicing/services/support.rst:159 +#: ../../sales/invoicing/services/support.rst:156 msgid ":doc:`../../../inventory/settings/products/uom`" msgstr ":doc:`../../../inventory/settings/products/uom` " @@ -1132,11 +1114,11 @@ msgstr ":menuselection:`电商订单(eCommerce Order) --> 开票(Invoice)` " #: ../../sales/overview/main_concepts/invoicing.rst:69 msgid "" -"An eCommerce order will also trigger the creation of the order when it is " +"An eCommerce order will also trigger the creation of the invoice when it is " "fully paid. If you allow paying orders by check or wire transfer, Odoo only " "creates an order and the invoice will be triggered once the payment is " "received." -msgstr "在全部付款完成后, 电商订单也会触发订单的创建, 如果允许通过支票和电汇付款, Odoo只会创建一张订单并且一旦付款完成发票会触发。" +msgstr "" #: ../../sales/overview/main_concepts/invoicing.rst:75 msgid "Creating an invoice manually" @@ -1440,140 +1422,76 @@ msgid "Manage your products" msgstr "" #: ../../sales/products_prices/products/import.rst:3 -msgid "How to import my products" +msgid "How to import products with categories and variants" msgstr "" -#: ../../sales/products_prices/products/import.rst:6 -msgid "How to start" -msgstr "" - -#: ../../sales/products_prices/products/import.rst:8 -msgid "Download the following import templates:" -msgstr "" - -#: ../../sales/products_prices/products/import.rst:10 +#: ../../sales/products_prices/products/import.rst:5 msgid "" -"Partners: customers, vendors (no relation field, can be imported as is)" +"Import templates are provided in the import tool of the most common data to " +"import (contacts, products, bank statements, etc.). You can open them with " +"any spreadsheets software (Microsoft Office, OpenOffice, Google Drive, " +"etc.)." msgstr "" #: ../../sales/products_prices/products/import.rst:11 -msgid "Products (no relation field, can be imported as is)" -msgstr "" - -#: ../../sales/products_prices/products/import.rst:12 -msgid "Product Website Categories" +msgid "How to customize the file" msgstr "" #: ../../sales/products_prices/products/import.rst:13 -msgid "Product Attributes & Values" +msgid "" +"Remove columns you don't need. We advise to not remove the *ID* one (see why" +" here below)." msgstr "" -#: ../../sales/products_prices/products/import.rst:14 -msgid "Products with Categories & Attributes (3 & 4 must be imported first)" +#: ../../sales/products_prices/products/import.rst:15 +msgid "" +"Set a unique ID to every single record by dragging down the ID sequencing." msgstr "" #: ../../sales/products_prices/products/import.rst:16 msgid "" -"Download link: " -"https://drive.google.com/drive/folders/0B1uIL9E_zXrrTEp5eGI2dXJSUjg?usp=sharing" +"Don't change labels of columns you want to import. Otherwise Odoo won't " +"recognize them anymore and you will have to map them on your own in the " +"import screen." msgstr "" #: ../../sales/products_prices/products/import.rst:18 msgid "" -"You can open them with any spreadsheets software (Microsoft Office, " -"OpenOffice, Google Drive, etc.)." +"To add new columns,Feel free to add new columns but the fields need to exist" +" in Odoo. If Odoo fails in matching the column name with a field, you can " +"make it manually when importing by browsing a list of available fields." msgstr "" -#: ../../sales/products_prices/products/import.rst:21 -msgid "How to customize the file" -msgstr "" - -#: ../../sales/products_prices/products/import.rst:23 -msgid "" -"Remove columns you don't need. Don't remove the first one (called *ID*, see " -"why here below)." -msgstr "" - -#: ../../sales/products_prices/products/import.rst:25 -msgid "" -"Don't change labels of columns you want to import. Otherwse Odoo won't match" -" the columns automatically." -msgstr "" - -#: ../../sales/products_prices/products/import.rst:27 -msgid "" -"Feel free to add new columns but the fields need to exist in Odoo. If Odoo " -"fails in matching the column name with a field, you can make it manually " -"when importing by browsing a list of available fields." -msgstr "" - -#: ../../sales/products_prices/products/import.rst:30 -msgid "Once modified, keep your file in .csv format." -msgstr "" - -#: ../../sales/products_prices/products/import.rst:33 -msgid "How to import the file" -msgstr "" - -#: ../../sales/products_prices/products/import.rst:35 -msgid "Go to the Products menu in Sales, Purchase, Website Admin, etc." -msgstr "" - -#: ../../sales/products_prices/products/import.rst:36 -msgid "Switch to list view (top-right corner)." -msgstr "" - -#: ../../sales/products_prices/products/import.rst:37 -msgid "Click the *Import* button (top-left corner)." -msgstr "" - -#: ../../sales/products_prices/products/import.rst:38 -msgid "" -"Make sure all the columns match an existing field. If not select it manually" -" from the drop-down list." -msgstr "" - -#: ../../sales/products_prices/products/import.rst:40 -msgid "Press * Validate* to test the import." -msgstr "" - -#: ../../sales/products_prices/products/import.rst:41 -msgid "" -"If you get \"Everything seems valid.\" as result message, press *Import* to " -"process the real import. Otherwise correct the issues spotted during the " -"test." -msgstr "" - -#: ../../sales/products_prices/products/import.rst:45 +#: ../../sales/products_prices/products/import.rst:24 msgid "Why an “ID” column" msgstr "" -#: ../../sales/products_prices/products/import.rst:47 +#: ../../sales/products_prices/products/import.rst:26 msgid "" "The ID is an unique identifier for the line item. Feel free to use the one " "of your previous software to ease the transition to Odoo." msgstr "" -#: ../../sales/products_prices/products/import.rst:50 +#: ../../sales/products_prices/products/import.rst:29 msgid "" "Setting an ID is not mandatory when importing but it helps in many cases:" msgstr "" -#: ../../sales/products_prices/products/import.rst:52 +#: ../../sales/products_prices/products/import.rst:31 msgid "" "Update imports: you can import the same file several times without creating " "duplicates;" msgstr "" -#: ../../sales/products_prices/products/import.rst:53 +#: ../../sales/products_prices/products/import.rst:32 msgid "Import relation fields (see here below)." msgstr "" -#: ../../sales/products_prices/products/import.rst:56 +#: ../../sales/products_prices/products/import.rst:35 msgid "How to import relation fields" msgstr "" -#: ../../sales/products_prices/products/import.rst:58 +#: ../../sales/products_prices/products/import.rst:37 msgid "" "An Odoo object is always related to many other objects (e.g. a product is " "linked to product categories, attributes, vendors, etc.). To import those " @@ -1581,7 +1499,7 @@ msgid "" "their own list menu." msgstr "" -#: ../../sales/products_prices/products/import.rst:62 +#: ../../sales/products_prices/products/import.rst:41 msgid "" "You can do it using either the name of the related record or its ID. The ID " "is expected when two records have the same name. In such a case add \" / "