From 4483a86907aaa23511d5f3f6b66c3cd4f8de8835 Mon Sep 17 00:00:00 2001 From: Odoo Translation Bot Date: Sun, 30 May 2021 02:31:25 +0200 Subject: [PATCH 1/5] [I18N] Update translation terms from Transifex --- locale/es/LC_MESSAGES/finance.po | 52 ++++++++++++++++++++++++++++---- 1 file changed, 46 insertions(+), 6 deletions(-) diff --git a/locale/es/LC_MESSAGES/finance.po b/locale/es/LC_MESSAGES/finance.po index 691dd8827..65427c456 100644 --- a/locale/es/LC_MESSAGES/finance.po +++ b/locale/es/LC_MESSAGES/finance.po @@ -52,7 +52,7 @@ # Jon Perez , 2021 # Althay Ramallo Fuentes , 2021 # Cinthya Yepez , 2021 -# jabelchi, 2021 +# Josep Anton Belchi Riera, 2021 # #, fuzzy msgid "" @@ -61,7 +61,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-05-14 14:53+0200\n" "PO-Revision-Date: 2021-05-14 13:19+0000\n" -"Last-Translator: jabelchi, 2021\n" +"Last-Translator: Josep Anton Belchi Riera, 2021\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" @@ -2634,11 +2634,11 @@ msgstr "" #: ../../content/applications/finance/accounting/localizations/colombia_ES.rst:28 msgid "Flujo General" -msgstr "" +msgstr "Flujo General" #: ../../content/applications/finance/accounting/localizations/colombia_ES.rst:31 msgid "Configuración" -msgstr "" +msgstr "Configuración" #: ../../content/applications/finance/accounting/localizations/colombia_ES.rst:34 msgid "1. Instalación de los módulos de Localización Colombiana" @@ -2664,6 +2664,9 @@ msgid "" "Servicio Web de Carvajal T&S, es necesario configurar el Usuario y las " "Credenciales. Esta información será provista por Carvajal T&S." msgstr "" +"Una vez que los módulos están instalados, para poderte conectar con el " +"Servicio Web de Carvajal T&S, es necesario configurar el Usuario y las " +"Credenciales. Esta información será provista por Carvajal T&S." #: ../../content/applications/finance/accounting/localizations/colombia_ES.rst:48 msgid "" @@ -2727,6 +2730,10 @@ msgid "" "cual ya es posible asignarles su número de identificación asociado al tipo " "de documento correspondiente." msgstr "" +"Como parte de la Localización Colombiana, los tipos de documentos definidos " +"por la DIAN ahora están disponibles en el formulario de Contactos, por lo " +"cual ya es posible asignarles su número de identificación asociado al tipo " +"de documento correspondiente." #: ../../content/applications/finance/accounting/localizations/colombia_ES.rst:93 msgid "" @@ -2734,6 +2741,9 @@ msgid "" "ingresada en Odoo incluyendo el Dígito de Verificación. Odoo separará este " "número cuando la información sea enviada a los proveedores terceros." msgstr "" +"Nota: Cuando el tipo de documento es RUT la identificación necesita ser " +"ingresada en Odoo incluyendo el Dígito de Verificación. Odoo separará este " +"número cuando la información sea enviada a los proveedores terceros." #: ../../content/applications/finance/accounting/localizations/colombia_ES.rst:99 msgid "4.1.2 Estructura Fiscal (RUT)" @@ -2745,6 +2755,9 @@ msgid "" "el documento de RUT), son incluidos como parte del módulo de Facturación " "Electrónica, dado que es información requerida por la DIAN." msgstr "" +"Los Códigos de tipo de Obligación aplicables a los terceros (sección 53 en " +"el documento de RUT), son incluidos como parte del módulo de Facturación " +"Electrónica, dado que es información requerida por la DIAN." #: ../../content/applications/finance/accounting/localizations/colombia_ES.rst:105 msgid "" @@ -2760,6 +2773,11 @@ msgid "" "Contribuyentes y Régimen simplificado, por lo se muestran solo estas dos " "opciones." msgstr "" +"Adicionalmente dos últimos campos fueron agregados para especificar el " +"régimen fiscal del contacto. Cabe aclarar que para envío de Factura " +"electrónica de Carvajal, únicamente se hace distinción de entre Grandes " +"Contribuyentes y Régimen simplificado, por lo se muestran solo estas dos " +"opciones." #: ../../content/applications/finance/accounting/localizations/colombia_ES.rst:118 msgid "4.2 Impuestos" @@ -2785,6 +2803,10 @@ msgid "" "considerada para desplegar correctamente los impuestos en la representación " "gráfica de la Factura. (PDF)" msgstr "" +"Los impuestos para Retenciones (ICA, IVA y Fuente) también están incluidos " +"en las opciones para configurar tus impuestos, esta configuración es " +"considerada para desplegar correctamente los impuestos en la representación " +"gráfica de la Factura. (PDF)" #: ../../content/applications/finance/accounting/localizations/colombia_ES.rst:138 msgid "4.3 Diarios" @@ -2796,6 +2818,9 @@ msgid "" "resolución de la Facturación Electrónica, los Diarios de Ventas relacionados" " con tus documentos de facturación necesitan ser actualizados en Odoo." msgstr "" +"Una vez que la DIAN ha asignado la secuencia y prefijo oficiales para la " +"resolución de la Facturación Electrónica, los Diarios de Ventas relacionados" +" con tus documentos de facturación necesitan ser actualizados en Odoo." #: ../../content/applications/finance/accounting/localizations/colombia_ES.rst:145 msgid "" @@ -2824,14 +2849,16 @@ msgid "" "La plantilla por defecto que es usada por Odoo en la representación gráfica " "incluye el nombre del Vendedor, así que estos campos deben ser considerados:" msgstr "" +"La plantilla por defecto que es usada por Odoo en la representación gráfica " +"incluye el nombre del Vendedor, así que estos campos deben ser considerados:" #: ../../content/applications/finance/accounting/localizations/colombia_ES.rst:170 msgid "Uso y Pruebas" -msgstr "" +msgstr "Uso y Pruebas" #: ../../content/applications/finance/accounting/localizations/colombia_ES.rst:173 msgid "Facturas" -msgstr "" +msgstr "Facturas" #: ../../content/applications/finance/accounting/localizations/colombia_ES.rst:175 msgid "" @@ -2839,6 +2866,9 @@ msgid "" "configuradas, es posible empezar a probar el flujo de la Facturación " "Electrónica siguiendo las instrucciones que se detallan a continuación:" msgstr "" +"Una vez que toda la información principal y las credenciales han sido " +"configuradas, es posible empezar a probar el flujo de la Facturación " +"Electrónica siguiendo las instrucciones que se detallan a continuación:" #: ../../content/applications/finance/accounting/localizations/colombia_ES.rst:180 msgid "1. Invoice Creation" @@ -2851,12 +2881,18 @@ msgid "" "independientemente de si es creada desde una Orden de Venta o si es creado " "manualmente." msgstr "" +"El flujo de trabajo funcional que lleva lugar antes de la validación de una " +"factura continua siendo igual con Facturación Electrónica, " +"independientemente de si es creada desde una Orden de Venta o si es creado " +"manualmente." #: ../../content/applications/finance/accounting/localizations/colombia_ES.rst:187 msgid "" "Los cambios principales que son introducidos con la Facturación Electrónica " "son los siguientes:" msgstr "" +"Los cambios principales que son introducidos con la Facturación Electrónica " +"son los siguientes:" #: ../../content/applications/finance/accounting/localizations/colombia_ES.rst:190 msgid "Hay tres tipos de documentos" @@ -2910,6 +2946,10 @@ msgid "" " que es desplegado con el estatus de la Factura Electrónica, con el valor " "inicial **En Proceso**." msgstr "" +"Un campo adicional es ahora desplegado en la pestaña de “Otra Información” " +"con el nombre del archivo XML. Adicionalmente hay un segundo campo adicional" +" que es desplegado con el estatus de la Factura Electrónica, con el valor " +"inicial **En Proceso**." #: ../../content/applications/finance/accounting/localizations/colombia_ES.rst:226 msgid "1. Recepción del XML y PDF Legal" From e96bc804d3dea6c2057ac2a5207bffde21d2d52b Mon Sep 17 00:00:00 2001 From: Victor Feyens Date: Mon, 31 May 2021 11:33:32 +0200 Subject: [PATCH 2/5] [FIX] content/developer/*: typos Found with codespell --- content/developer/howtos/profilecode.rst | 4 ++-- content/developer/howtos/themes.rst | 2 +- content/developer/howtos/web.rst | 2 +- content/developer/reference/actions.rst | 2 +- content/developer/reference/cmdline.rst | 2 +- content/developer/reference/guidelines.rst | 6 ++--- .../reference/javascript_reference.rst | 8 +++---- content/developer/reference/mixins.rst | 24 +++++++++---------- content/developer/reference/mobile.rst | 2 +- content/developer/reference/orm.rst | 4 ++-- content/developer/reference/reports.rst | 2 +- content/developer/reference/security.rst | 2 +- content/developer/reference/testing.rst | 8 +++---- content/developer/reference/views.rst | 2 +- content/developer/webservices/iap.rst | 8 +++---- content/developer/webservices/odoo.rst | 4 ++-- content/developer/webservices/upgrade.rst | 8 +++---- 17 files changed, 45 insertions(+), 45 deletions(-) diff --git a/content/developer/howtos/profilecode.rst b/content/developer/howtos/profilecode.rst index d21c1f389..99d8eb4f1 100644 --- a/content/developer/howtos/profilecode.rst +++ b/content/developer/howtos/profilecode.rst @@ -10,7 +10,7 @@ Profiling Odoo code Graph a method ============== -Odoo embeds a profiler of code. This embeded profiler output can be used to +Odoo embeds a profiler of code. This embedded profiler output can be used to generate a graph of calls triggered by the method, number of queries, percentage of time taken in the method itself as well as the time that the method took and its sub-called methods. @@ -85,7 +85,7 @@ Dump stack Sending the SIGQUIT signal to an Odoo process (only available on POSIX) makes this process output the current stack trace to log, with info level. When an -odoo process seems stucked, sending this signal to the process permit to know +odoo process seems stuck, sending this signal to the process permit to know what the process is doing, and letting the process continue his job. Tracing code execution diff --git a/content/developer/howtos/themes.rst b/content/developer/howtos/themes.rst index f4cb6bff7..ead6d6cdb 100644 --- a/content/developer/howtos/themes.rst +++ b/content/developer/howtos/themes.rst @@ -394,7 +394,7 @@ So here are the steps to create a robust and consistent style for your theme: \(1) Set the values for Odoo-provided SCSS variables -Odoo declares many CSS rules, most being entirely customizable by overridding +Odoo declares many CSS rules, most being entirely customizable by overriding the related SCSS variables. First, create a new file called primary_variables.scss and add it the same way as the style.scss file. The only difference it that you won't add it in the ``assets_frontend`` template but in the ``_assets_primary_variables`` diff --git a/content/developer/howtos/web.rst b/content/developer/howtos/web.rst index b57f0d4f6..d0a8ae14c 100644 --- a/content/developer/howtos/web.rst +++ b/content/developer/howtos/web.rst @@ -1782,7 +1782,7 @@ When a client action must be executed, the action manager looks up its tag in the registry, walks the specified path and displays the widget it finds at the end. -.. note:: a client action handler can also be a regular function, in whch case +.. note:: a client action handler can also be a regular function, in which case it'll be called and its result (if any) will be interpreted as the next action to execute. diff --git a/content/developer/reference/actions.rst b/content/developer/reference/actions.rst index 9cd81aaa3..2b77d8bb4 100644 --- a/content/developer/reference/actions.rst +++ b/content/developer/reference/actions.rst @@ -236,7 +236,7 @@ corresponding behaviors) are shared between states: * ``object_write``: Updates the current record(s) following ``fields_lines`` specifications -* ``multi``: Executes serveral actions given through the ``child_ids`` argument. +* ``multi``: Executes several actions given through the ``child_ids`` argument. State fields ------------ diff --git a/content/developer/reference/cmdline.rst b/content/developer/reference/cmdline.rst index 28acbe08f..53a2fbce7 100644 --- a/content/developer/reference/cmdline.rst +++ b/content/developer/reference/cmdline.rst @@ -154,7 +154,7 @@ Database .. option:: --db_sslmode Control the SSL security of the connection between Odoo and PostgreSQL. - Value should bve one of 'disable', 'allow', 'prefer', 'require', + Value should be one of 'disable', 'allow', 'prefer', 'require', 'verify-ca' or 'verify-full' Default value is 'prefer' diff --git a/content/developer/reference/guidelines.rst b/content/developer/reference/guidelines.rst index 8ff141d64..c3f221f44 100644 --- a/content/developer/reference/guidelines.rst +++ b/content/developer/reference/guidelines.rst @@ -280,7 +280,7 @@ Odoo supports custom tags acting as syntactic sugar: - report: use to declare a :ref:`report action ` - act_window: use it if the record notation can't do what you want -The 4 first tags are prefered over the *record* notation. +The 4 first tags are preferred over the *record* notation. XML IDs and naming @@ -330,7 +330,7 @@ should have a real naming as it is used as display name. - Model Access Childs + Model Access Children @@ -572,7 +572,7 @@ So, you can write ``if some_collection:`` instead of ``if len(some_collection):` for element in iterable: values.setdefault(element, []).append(other_value) -- As a good developper, document your code (docstring on methods, simple +- As a good developer, document your code (docstring on methods, simple comments for tricky part of code) - In additions to these guidelines, you may also find the following link interesting: http://python.net/~goodger/projects/pycon/2007/idiomatic/handout.html diff --git a/content/developer/reference/javascript_reference.rst b/content/developer/reference/javascript_reference.rst index aaa893096..f1622cc69 100644 --- a/content/developer/reference/javascript_reference.rst +++ b/content/developer/reference/javascript_reference.rst @@ -178,7 +178,7 @@ to add a file from that addon. In that case, it should be done in three steps: Note that the files in a bundle are all loaded immediately when the user loads the odoo web client. This means that the files are transferred through the network - everytime (except when the browser cache is active). In some cases, it may be + every time (except when the browser cache is active). In some cases, it may be better to lazyload some assets. For example, if a widget requires a large library, and that widget is not a core part of the experience, then it may be a good idea to only load the library when the widget is actually created. The @@ -1148,7 +1148,7 @@ may need to directly call a controller (available on some route). Notifications ============== -The Odoo framework has a standard way to communicate various informations to the +The Odoo framework has a standard way to communicate various information to the user: notifications, which are displayed on the top right of the user interface. There are two types of notifications: @@ -1499,7 +1499,7 @@ integer (FieldInteger) - type: setting the input type (*text* by default, can be set on *number*) On edit mode, the field is rendered as an input with the HTML attribute type - setted on *number* (so user can benefit the native support, especially on + set on *number* (so user can benefit the native support, especially on mobile). In this case, the default formatting is disabled to avoid incompability. .. code-block:: xml @@ -1531,7 +1531,7 @@ float (FieldFloat) - type: setting the input type (*text* by default, can be set on *number*) On edit mode, the field is rendered as an input with the HTML attribute type - setted on *number* (so user can benefit the native support, especially on + set on *number* (so user can benefit the native support, especially on mobile). In this case, the default formatting is disabled to avoid incompability. .. code-block:: xml diff --git a/content/developer/reference/mixins.rst b/content/developer/reference/mixins.rst index 1a64a1b7a..dc0840cc0 100644 --- a/content/developer/reference/mixins.rst +++ b/content/developer/reference/mixins.rst @@ -109,7 +109,7 @@ to manage followers on your record: Helper method to send a mail with a template :param template_id: the id of the template to render to create the body of the message - :param `\**kwargs`: parameter to create a mail.compose.message wizzard (which inherit from mail.message) + :param `\**kwargs`: parameter to create a mail.compose.message wizard (which inherit from mail.message) .. rubric:: Receiving messages @@ -254,11 +254,11 @@ Subtypes are created as data in your module; the model has the following fields: ``res_model`` - :class:`~odoo.fields.Char` model the subtype applies to; if False, this subtype applies to all models ``default`` - :class:`~odoo.fields.Boolean` - wether the subtype is activated by default when subscribing + whether the subtype is activated by default when subscribing ``sequence`` - :class:`~odoo.fields.Integer` used to order subtypes in the notification customization popup ``hidden`` - :class:`~odoo.fields.Boolean` - wether the subtype is hidden in the notification customization popup + whether the subtype is hidden in the notification customization popup Interfacing subtypes with field tracking allows to subscribe to different kind @@ -381,7 +381,7 @@ yourself by overriding the function ``_notification_recipients``. following the thread). True by default for new groups, False for portal / customer. - button_follow - dict with url adn title of the button + dict with url and title of the button - has_button_unfollow whether to display Unfollow in email (if recipient is currently following the thread). True by default for new groups, False for portal / customer. @@ -578,7 +578,7 @@ some default values these records may have depending on the parent object: tasks getting created in the right project) by setting a dictionary of default values in the alias' ``alias_defaults`` field. - :return: dictionnary of values that will be written to the new alias + :return: dictionary of values that will be written to the new alias :rtype: dict The ``get_alias_values()`` override is particularly interesting as it allows you @@ -641,7 +641,7 @@ you to make your alias easily configurable from the record's form view. def get_alias_values(self): """ Specify some default values that will be set in the alias at its creation """ values = super(BusinessTrip, self).get_alias_values() - # alias_defaults holds a dictionnary that will be written + # alias_defaults holds a dictionary that will be written # to all records created by this alias # # in this case, we want all expense records sent to a trip alias @@ -706,7 +706,7 @@ you to make your alias easily configurable from the record's form view. of the expense, try to find a partner with this email address and do a regex match to find the amount of the expense.""" name = msg_dict.get('subject', 'New Expense') - # Match the last occurence of a float in the string + # Match the last occurrence of a float in the string # Example: '50.3 bar 34.5' becomes '34.5'. This is potentially the price # to encode on the expense. If not, take 1.0 instead amount_pattern = '(\d+(\.\d*)?|\.\d+)' @@ -758,7 +758,7 @@ widgets, respectively). name = fields.Char() # [...] - We modify the form view of our trips to display their next activites: + We modify the form view of our trips to display their next activities: .. code-block:: xml @@ -781,7 +781,7 @@ You can find concrete examples of integration in the following models: * ``crm.lead`` in the CRM (*crm*) Application * ``sale.order`` in the Sales (*sale*) Application -* ``project.task`` in the Project (*poject*) Application +* ``project.task`` in the Project (*project*) Application .. _reference/mixins/website: @@ -871,7 +871,7 @@ case for this mixin is any object that has a frontend-page; being able to contro the visibility of the page allows you to take your time while editing the page and only publish it when you're satisfied. -To include the functionnality, you only need to inherit ``website.published.mixin``: +To include the functionality, you only need to inherit ``website.published.mixin``: .. code-block:: python @@ -998,13 +998,13 @@ The behaviour of the mixin adapts to your model: * The ``rating.rating`` record will be linked to the ``partner_id`` field of your model (if the field is present). - - this behaviour can be overriden with the function ``rating_get_partner_id()`` + - this behaviour can be overridden with the function ``rating_get_partner_id()`` if you use another field than ``partner_id`` * The ``rating.rating`` record will be linked to the partner of the ``user_id`` field of your model (if the field is present) (i.e. the partner who is rated) - - this behaviour can be overriden with the function ``rating_get_rated_partner_id()`` + - this behaviour can be overridden with the function ``rating_get_rated_partner_id()`` if you use another field than ``user_id`` (note that the function must return a ``res.partner``, for ``user_id`` the system automatically fetches the partner of the user) diff --git a/content/developer/reference/mobile.rst b/content/developer/reference/mobile.rst index e8536c43e..73f0cd5a0 100644 --- a/content/developer/reference/mobile.rst +++ b/content/developer/reference/mobile.rst @@ -61,7 +61,7 @@ Check if the method is available and then execute it. Methods ------- -.. note:: Each of the methods returns a JQuery Deffered object which returns +.. note:: Each of the methods returns a JQuery Deferred object which returns a data JSON dictionary Show Toast in device diff --git a/content/developer/reference/orm.rst b/content/developer/reference/orm.rst index 1b152fd57..c20d46c86 100644 --- a/content/developer/reference/orm.rst +++ b/content/developer/reference/orm.rst @@ -974,7 +974,7 @@ Date / Datetime comparison best practices: date string, therefore this practice is **heavily** discouraged. -Common operations with dates and datetimes such as addition, substraction or +Common operations with dates and datetimes such as addition, subtraction or fetching the start/end of a period are exposed through both :class:`~odoo.fields.Date` and :class:`~odoo.fields.Datetime`. These helpers are also available by importing `odoo.tools.date_utils`. @@ -1395,7 +1395,7 @@ decorating the old-style method: will automatically prepend the current cursor to explicitly provided parameters, positionally :func:`~odoo.api.cr_uid` - will automatically prepend the current cursor and user's id to explictly + will automatically prepend the current cursor and user's id to explicitly provided parameters :func:`~odoo.api.cr_uid_ids` will automatically prepend the current cursor, user's id and recordset's diff --git a/content/developer/reference/reports.rst b/content/developer/reference/reports.rst index ff0d1a81e..ab3f5f762 100644 --- a/content/developer/reference/reports.rst +++ b/content/developer/reference/reports.rst @@ -56,7 +56,7 @@ can take the following attributes: for example) ``attachment`` python expression that defines the name of the report; the record is - acessible as the variable ``object`` + accessible as the variable ``object`` ``paperformat`` external id of the paperformat you wish to use (defaults to the company's paperformat if not specified) diff --git a/content/developer/reference/security.rst b/content/developer/reference/security.rst index 030af532f..e9349df7d 100644 --- a/content/developer/reference/security.rst +++ b/content/developer/reference/security.rst @@ -10,7 +10,7 @@ data-driven mechanisms to manage or restrict access to data. Both mechanisms are linked to specific users through *groups*: a user belongs to any number of groups, and security mechanisms are associated to groups, -thus applying security mechamisms to users. +thus applying security mechanisms to users. .. _reference/security/acl: diff --git a/content/developer/reference/testing.rst b/content/developer/reference/testing.rst index d2e00eec8..d2fb4fc09 100644 --- a/content/developer/reference/testing.rst +++ b/content/developer/reference/testing.rst @@ -148,7 +148,7 @@ default you can remove the ``standard`` tag: ... This test will not be selected by default, to run it the relevant tag will -have to be selected explicitely: +have to be selected explicitly: .. code-block:: console @@ -176,7 +176,7 @@ ones: When you write a test that does not inherit from the :class:`~odoo.tests.common.BaseCase`, this test will not have the default tags, -you have to add them explicitely to have the test included in the default test +you have to add them explicitly to have the test included in the default test suite. This is a common issue when using a simple ``unittest.TestCase`` as they're not going to get run: @@ -193,7 +193,7 @@ Special tags ^^^^^^^^^^^^ - ``standard``: All Odoo tests that inherit from - :class:`~odoo.tests.common.BaseCase` are implicitely tagged standard. + :class:`~odoo.tests.common.BaseCase` are implicitly tagged standard. :option:`--test-tags ` also defaults to ``standard``. That means untagged test will be executed by default when tests are enabled. @@ -207,7 +207,7 @@ Special tags will generally not want both ``post_install`` is usually paired with ``-at_install`` when tagging a test class. - *module_name*: Odoo tests classes extending - :class:`~odoo.tests.common.BaseCase` are implicitely tagged with the + :class:`~odoo.tests.common.BaseCase` are implicitly tagged with the technical name of their module. This allows easily selecting or excluding specific modules when testing e.g. if you want to only run tests from ``stock_account``: diff --git a/content/developer/reference/views.rst b/content/developer/reference/views.rst index 671dfbe3d..4da3dc9fe 100644 --- a/content/developer/reference/views.rst +++ b/content/developer/reference/views.rst @@ -966,7 +966,7 @@ take the following attributes: if set to true it displays a striped zone in the consolidation line .. warning:: - The dictionnary definition must use double-quotes, ``{'user_id': 100}`` is + The dictionary definition must use double-quotes, ``{'user_id': 100}`` is not a valid value ``create``, ``edit`` allows *dis*\ abling the corresponding action in the view by setting the diff --git a/content/developer/webservices/iap.rst b/content/developer/webservices/iap.rst index a72001a04..2fbe813d8 100644 --- a/content/developer/webservices/iap.rst +++ b/content/developer/webservices/iap.rst @@ -135,7 +135,7 @@ on Odoo (https://iap.odoo.com/my/home) and select *In-App Services*. on sandbox to ease the tests. Log in then go to :menuselection:`My Account --> Your In-App Services`, click -Create and provide the informations of your service. +Create and provide the information of your service. The service has *seven* important fields: @@ -415,7 +415,7 @@ The :class:`~odoo.addons.iap.models.iap.charge` helper will: if the account does not have enough credits it will raise the relevant error 2. execute the body of the ``with`` statement -3. if the body of the ``with`` executes succesfully, update the price +3. if the body of the ``with`` executes successfully, update the price of the transaction if needed 4. capture (confirm) the transaction 5. otherwise, if an error is raised from the body of the ``with``, cancel the @@ -688,7 +688,7 @@ care how they are implemented. Test the API ------------ -In order to test the developped app, we propose a sandbox platform that allows you to: +In order to test the developed app, we propose a sandbox platform that allows you to: 1. Test the whole flow from the client's point of view - Actual services and transactions that can be consulted. (again this requires to change the endpoint, see the danger note @@ -702,7 +702,7 @@ The latter consists in specific tokens that will work on **IAP-Sandbox only**. * Token ``000111``: Represents an account without sufficient credits to perform any service. Returns an :class:`~odoo.addons.iap.models.iap.InsufficientCreditError` on authorize attempt. * Token ``111111``: Represents an account with enough credits to perform any service. - An authorize attempt will return a dummy transacion token that is processed by the capture + An authorize attempt will return a dummy transaction token that is processed by the capture and cancel routes. .. note:: diff --git a/content/developer/webservices/odoo.rst b/content/developer/webservices/odoo.rst index 04b6574e4..a41d8a215 100644 --- a/content/developer/webservices/odoo.rst +++ b/content/developer/webservices/odoo.rst @@ -12,7 +12,7 @@ all of its data are also available from the outside for external analysis or integration with various tools. Part of the :ref:`reference/orm/model` API is easily available over XML-RPC_ and accessible from a variety of languages. -.. Odoo XML-RPC idiosyncracies: +.. Odoo XML-RPC idiosyncrasies: * uses multiple endpoint and a nested call syntax instead of a "hierarchical" server structure (e.g. ``odoo.res.partner.read()``) * uses its own own manual auth system instead of basic auth or sessions @@ -852,7 +852,7 @@ Records can be updated using :meth:`~odoo.models.Model.write`, it takes a list of records to update and a mapping of updated fields to values similar to :meth:`~odoo.models.Model.create`. -Multiple records can be updated simultanously, but they will all get the same +Multiple records can be updated simultaneously, but they will all get the same values for the fields being set. It is not currently possible to perform "computed" updates (where the value being set depends on an existing value of a record). diff --git a/content/developer/webservices/upgrade.rst b/content/developer/webservices/upgrade.rst index 839b65fd2..4238b120d 100644 --- a/content/developer/webservices/upgrade.rst +++ b/content/developer/webservices/upgrade.rst @@ -135,7 +135,7 @@ Here are 2 examples of database upgrade request creation using: * one in the python programming language using the requests library * one in the bash programming language using `curl `_ (tool - for transfering data using http) and `jq `_ (JSON processor): + for transferring data using http) and `jq `_ (JSON processor): .. rst-class:: setup doc-aside @@ -247,7 +247,7 @@ should be empty if everything went fine. The ``request_sftp_access`` method ---------------------------------- -This method is recommanded for big database dumps. +This method is recommended for big database dumps. It uses the SFTP protocol and supports resuming. It will create a temporary SFTP server where you can connect to and allow you @@ -323,7 +323,7 @@ explanation about the JSON dictionary returned in case of failure. ''''''''''' If the call is successful, the value associated to the *request* key -will be a dictionary containing your SFTP connexion parameters: +will be a dictionary containing your SFTP connection parameters: * ``hostname``: the host address to connect to * ``sftp_port``: the port to connect to @@ -641,7 +641,7 @@ Beside downloading your migrated database using the URL provided by the protocol as described in the :ref:`request_sftp_access method ` -The diffence is that you'll only be able to download the migrated database. No +The difference is that you'll only be able to download the migrated database. No uploading will be possible. Your database upgrade request should be in the ``done`` state. From 0a4e0610c63eb1547f3ad9b0a0396d51082a89ca Mon Sep 17 00:00:00 2001 From: Victor Feyens Date: Mon, 31 May 2021 11:45:13 +0200 Subject: [PATCH 3/5] [FIX] content/administration/*: typos --- content/administration/db_management/db_online.rst | 4 ++-- content/administration/deployment/deploy.rst | 6 +++--- content/administration/install.rst | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/content/administration/db_management/db_online.rst b/content/administration/db_management/db_online.rst index 9e6e81b63..ac27b000f 100644 --- a/content/administration/db_management/db_online.rst +++ b/content/administration/db_management/db_online.rst @@ -15,7 +15,7 @@ button. :align: center Make sure you are connected as the administrator of the database you -want to manage - many operations depends on indentifying you remotely to that +want to manage - many operations depends on identifying you remotely to that database. Several actions are available: @@ -114,7 +114,7 @@ receive an e-mail with the URL of the test database. **Testing your database is the most important step of the upgrade process!** Even though we test all upgrades manually, we do not know your work processes. -A change in standard worfklows of Odoo in new versions might require you to +A change in standard workflows of Odoo in new versions might require you to change internal processes, or some of the customizations you made through Odoo Studio might now work properly. *It is up to you to make sure that everything works as it should!* You can report issues with your test database through our diff --git a/content/administration/deployment/deploy.rst b/content/administration/deployment/deploy.rst index 6bd254cf2..ea90af970 100644 --- a/content/administration/deployment/deploy.rst +++ b/content/administration/deployment/deploy.rst @@ -69,7 +69,7 @@ in ``/etc/odoo.conf`` set: of securing your deployment. Once it is correctly working and only matching a single database per hostname, it is strongly recommended to block access to the database manager screens, - and to use the ``--no-database-list`` startup paramater to prevent listing + and to use the ``--no-database-list`` startup parameter to prevent listing your databases, and to block access to the database management screens. See also security_. @@ -171,7 +171,7 @@ SSL Between Odoo and PostgreSQL Since Odoo 11.0, you can enforce ssl connection between Odoo and PostgreSQL. in Odoo the db_sslmode control the ssl security of the connection -with value choosed out of 'disable', 'allow', 'prefer', 'require', 'verify-ca' +with value chosen out of 'disable', 'allow', 'prefer', 'require', 'verify-ca' or 'verify-full' `PostgreSQL Doc `_ @@ -392,7 +392,7 @@ notifications. The solutions to support livechat/motifications in a WSGI application are: -* Deploy a threaded version of Odoo (instread of a process-based preforking +* Deploy a threaded version of Odoo (instead of a process-based preforking one) and redirect only requests to URLs starting with ``/longpolling/`` to that Odoo, this is the simplest and the longpolling URL can double up as the cron instance. diff --git a/content/administration/install.rst b/content/administration/install.rst index 630fe6451..720f5e277 100644 --- a/content/administration/install.rst +++ b/content/administration/install.rst @@ -233,7 +233,7 @@ found in our `wiki `_. Repository ^^^^^^^^^^ -Odoo S.A. provides a repository that can be used with the Fedora distibutions. +Odoo S.A. provides a repository that can be used with the Fedora distributions. It can be used to install Odoo Community Edition by executing the following commands: From becf7a207dfd9525af327e832d6e23662d47f1fa Mon Sep 17 00:00:00 2001 From: Victor Feyens Date: Mon, 31 May 2021 11:52:17 +0200 Subject: [PATCH 4/5] [FIX] content/applications/*: typos found with codespell --- .../finance/accounting/bank/feeds/paypal.rst | 2 +- .../accounting/bank/setup/create_bank_account.rst | 4 ++-- .../finance/accounting/localizations/mexico.rst | 4 ++-- .../finance/accounting/others/adviser/assets.rst | 2 +- .../finance/accounting/others/analytic/usage.rst | 4 ++-- .../finance/accounting/others/taxes/taxcloud.rst | 2 +- .../finance/accounting/payables/pay/sepa.rst | 4 ++-- .../customer_invoices/payment_terms.rst | 2 +- .../receivables/customer_payments/check.rst | 2 +- .../general/base_import/import_faq.rst | 15 +++++++++++---- .../general/unsplash/unsplash_access_key.rst | 2 +- .../inventory/barcode/operations/receipts.rst | 2 +- .../inventory/management/incoming/two_steps.rst | 4 ++-- .../reporting/valuation_methods_continental.rst | 2 +- .../overview/process/sale_to_delivery.rst | 2 +- .../inventory/routes/concepts/inter_warehouse.rst | 2 +- .../inventory/routes/costing/landed_costs.rst | 2 +- .../inventory/shipping/setup/ups_credentials.rst | 2 +- .../purchase/purchases/master/uom.rst | 2 +- .../purchase/purchases/rfq/3_way_matching.rst | 2 +- .../purchase/purchases/rfq/analyze.rst | 4 ++-- .../productivity/discuss/email_servers.rst | 4 ++-- .../sales/crm/track_leads/lead_scoring.rst | 4 ++-- .../seasonal_discount.rst | 2 +- content/applications/sales/sales/ebay/manage.rst | 4 ++-- .../sales/products_prices/prices/pricing.rst | 12 ++++++------ .../sales/send_quotations/quote_template.rst | 2 +- .../ecommerce/shopper_experience/authorize.rst | 2 +- .../shopper_experience/payment_acquirer.rst | 2 +- .../websites/website/optimize/link_tracker.rst | 2 +- .../websites/website/publish/multi_website.rst | 2 +- 31 files changed, 55 insertions(+), 48 deletions(-) diff --git a/content/applications/finance/accounting/bank/feeds/paypal.rst b/content/applications/finance/accounting/bank/feeds/paypal.rst index 2dd5f61fa..2e7099d35 100644 --- a/content/applications/finance/accounting/bank/feeds/paypal.rst +++ b/content/applications/finance/accounting/bank/feeds/paypal.rst @@ -47,7 +47,7 @@ Then, you will have to provide your credentials to connect to PayPal. .. note:: Your Paypal **must be in English** (if it is not the case you must change - the langage of your Paypal account) and if you use a Paypal business account + the language of your Paypal account) and if you use a Paypal business account you must switch back to the old interface in order for it to work with Online feeds (you can switch from new to old interface in your Paypal account). diff --git a/content/applications/finance/accounting/bank/setup/create_bank_account.rst b/content/applications/finance/accounting/bank/setup/create_bank_account.rst index be01a67f8..ccc681d19 100644 --- a/content/applications/finance/accounting/bank/setup/create_bank_account.rst +++ b/content/applications/finance/accounting/bank/setup/create_bank_account.rst @@ -38,8 +38,8 @@ support with this bank account. .. note:: - If you are working in a multi-company environnement, you'll have to switch - the company on your user preferences in order to add, edit or delete bank + If you are working in a multi-company environment, you'll have to switch + the company on your user preferences in order to add, edit or delete bank accounts from another company. .. todo:: add inherited field tooltip diff --git a/content/applications/finance/accounting/localizations/mexico.rst b/content/applications/finance/accounting/localizations/mexico.rst index db3b7f7e1..878fba856 100644 --- a/content/applications/finance/accounting/localizations/mexico.rst +++ b/content/applications/finance/accounting/localizations/mexico.rst @@ -278,7 +278,7 @@ process in Odoo, this considerations to understand the behavior are important. **1.1. How can I generate an invoice with payment term `PUE`?** `According to the SAT documentation`_ a payment is classified as ``PUE`` if - the invoice was agreed to be fully payed before the 17th of the next + the invoice was agreed to be fully paid before the 17th of the next calendar month (the next month of the CFDI date), any other condition will generate a ``PPD`` invoice. @@ -556,7 +556,7 @@ generic one with no explanation. '{http://www.sat.gob.mx/sitio_internet/cfd/catalogos}c_TipoRelacion' does not resolve to a(n) simple type definition., line 36 - This can be caused because of a database backup restored in anothe server, + This can be caused because of a database backup restored in another server, or when the XSD files are not correctly downloaded. Follow the same steps as above but: diff --git a/content/applications/finance/accounting/others/adviser/assets.rst b/content/applications/finance/accounting/others/adviser/assets.rst index 8869166e0..71cf581ac 100644 --- a/content/applications/finance/accounting/others/adviser/assets.rst +++ b/content/applications/finance/accounting/others/adviser/assets.rst @@ -129,7 +129,7 @@ Odoo will automatically recompute a new depreciation board. How to record the sale or disposal of an asset? =============================================== -If you sell or dispose an asset, you need to deprecate completly this +If you sell or dispose an asset, you need to deprecate completely this asset. Click on the button :guilabel:`Sell or Dispose`. This action will post the full costs of this assets but it will not record the sales transaction that should be registered through a customer diff --git a/content/applications/finance/accounting/others/analytic/usage.rst b/content/applications/finance/accounting/others/analytic/usage.rst index 19c5816af..5c91090e2 100644 --- a/content/applications/finance/accounting/others/analytic/usage.rst +++ b/content/applications/finance/accounting/others/analytic/usage.rst @@ -183,8 +183,8 @@ automatic recharging of the services to the customer at the end of the month. To invoice customers, just link the analytic account to a sale order and sell products that manage timesheet or expenses . -Case 3: IT Services Company: perfomance analysis ------------------------------------------------- +Case 3: IT Services Company: performance analysis +------------------------------------------------- Most IT service companies face the following problems: diff --git a/content/applications/finance/accounting/others/taxes/taxcloud.rst b/content/applications/finance/accounting/others/taxes/taxcloud.rst index 4a8f4cdfe..4509af19a 100644 --- a/content/applications/finance/accounting/others/taxes/taxcloud.rst +++ b/content/applications/finance/accounting/others/taxes/taxcloud.rst @@ -51,7 +51,7 @@ Salestax is calculated in Odoo based on fiscal positions A Fiscal Position for the United States is created when installing *TaxCloud*. Everything works out-of-the-box. -You can configure Odoo to automtically detect which Customers should use this fiscal +You can configure Odoo to automatically detect which Customers should use this fiscal position. Go to :menuselection:`Accounting --> Configuration --> Fiscal Positions` to open and edit the record. diff --git a/content/applications/finance/accounting/payables/pay/sepa.rst b/content/applications/finance/accounting/payables/pay/sepa.rst index cb16ba141..be66691dc 100644 --- a/content/applications/finance/accounting/payables/pay/sepa.rst +++ b/content/applications/finance/accounting/payables/pay/sepa.rst @@ -119,9 +119,9 @@ Troubleshooting The bank refuses my SEPA file ----------------------------- -Ask your bank if they support the **SEPA Credit Transfer specification** +Ask your bank if they support the **SEPA Credit Transfer specification** (the SEPA pain version depends on the country set on your company). If -they don't, or cannot provide relevant informations, please forward the +they don't, or cannot provide relevant information, please forward the error message to your Odoo partner. There is no Bank Identifier Code recorded for bank account ... diff --git a/content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst b/content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst index f4a372637..7436e60f4 100644 --- a/content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst +++ b/content/applications/finance/accounting/receivables/customer_invoices/payment_terms.rst @@ -28,7 +28,7 @@ term with several lines, be sure the latest one is the balance. (avoid doing 50% in 10 days and 50% in 21 days because, with the rounding, it may not do exactly 100%) -.. todo:: screenshot payment term forms, after QDP have commited the change +.. todo:: screenshot payment term forms, after QDP have committed the change planned on this object Using Payment Terms diff --git a/content/applications/finance/accounting/receivables/customer_payments/check.rst b/content/applications/finance/accounting/receivables/customer_payments/check.rst index 7f8d7f090..708270eef 100644 --- a/content/applications/finance/accounting/receivables/customer_payments/check.rst +++ b/content/applications/finance/accounting/receivables/customer_payments/check.rst @@ -40,7 +40,7 @@ Configuration - Create a journal **Checks** -- Set **Undeposited Checks** as a defaut credit/debit account +- Set **Undeposited Checks** as a default credit/debit account - Set the bank account related to this journal as **Allow Reconciliation** diff --git a/content/applications/general/base_import/import_faq.rst b/content/applications/general/base_import/import_faq.rst index d61e2478c..e7b465780 100644 --- a/content/applications/general/base_import/import_faq.rst +++ b/content/applications/general/base_import/import_faq.rst @@ -178,7 +178,9 @@ The tags should be separated by a comma without any spacing. For example, if you How can I import a one2many relationship (e.g. several Order Lines of a Sales Order)? ------------------------------------------------------------------------------------- -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 line will be imported on the same row as the information relative to order. Any additional lines will need an addtional row that does not have any information in the fields relative to the order. +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 line will be imported on the same row as the information relative to order. +Any additional lines will need an additional row that does not have any information in the fields relative to the order. As an example, here is purchase.order_functional_error_line_cant_adpat.CSV file of some quotations you can import, based on demo data. :download:`File for some Quotations `. @@ -194,7 +196,9 @@ The following CSV file shows how to import customers and their respective contac Can I import several times the same record? ------------------------------------------- -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 instead of being created. This is very usefull as it allows you to import several times the same CSV file while having made some changes in between two imports. Odoo will take care of creating or modifying each record depending if it's new or not. +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 instead of being created. +This is very useful as it allows you to import several times the same CSV file while having made some changes in between two imports. +Odoo will take care of creating or modifying each record depending if it's new or not. This feature allows you to use the Import/Export tool of Odoo to modify a batch of records in your favorite spreadsheet application. @@ -246,6 +250,9 @@ It will produce the following CSV file:: person_3,Eric,False,company_2 person_4,Ramsy,False,company_3 -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 between persons and companies is done using the External ID of the companies. We had to prefix the "External ID" by the name of the table to avoid a conflict of ID between persons and companies (person_1 and company_1 who shared the same ID 1 in the orignial database). +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 between persons and companies is done using the External ID of the companies. +We had to prefix the "External ID" by the name of the table to avoid a conflict of ID between persons and companies (person_1 and company_1 who shared the same ID 1 in the original database). -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 contacts and 3 companies. (the firsts two contacts are linked to the first company). You must first import the companies and then the persons. +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 contacts and 3 companies. (the firsts two contacts are linked to the first company). +You must first import the companies and then the persons. diff --git a/content/applications/general/unsplash/unsplash_access_key.rst b/content/applications/general/unsplash/unsplash_access_key.rst index 5dc39a3b5..7e28420ff 100644 --- a/content/applications/general/unsplash/unsplash_access_key.rst +++ b/content/applications/general/unsplash/unsplash_access_key.rst @@ -3,7 +3,7 @@ How to generate an Unsplash access key ======================================================= .. tip:: - **As an SaaS user**, you are ready to use Unsplash. You won't need to follow this guide to set up Unsplash informations, since you will use our own Odoo Unsplash key in a transparent way. + **As an SaaS user**, you are ready to use Unsplash. You won't need to follow this guide to set up Unsplash information, since you will use our own Odoo Unsplash key in a transparent way. Generate an Unsplash access key for **non-Saas** users ====================================================== diff --git a/content/applications/inventory_and_mrp/inventory/barcode/operations/receipts.rst b/content/applications/inventory_and_mrp/inventory/barcode/operations/receipts.rst index 01d555add..926c9e109 100644 --- a/content/applications/inventory_and_mrp/inventory/barcode/operations/receipts.rst +++ b/content/applications/inventory_and_mrp/inventory/barcode/operations/receipts.rst @@ -51,7 +51,7 @@ Scan. .. image:: media/receipts02.png :align: center -The picking appears. Scan items and/or fill in informations using the +The picking appears. Scan items and/or fill in information using the mouse and keyboard. .. image:: media/receipts03.png diff --git a/content/applications/inventory_and_mrp/inventory/management/incoming/two_steps.rst b/content/applications/inventory_and_mrp/inventory/management/incoming/two_steps.rst index 396457630..571656b8d 100644 --- a/content/applications/inventory_and_mrp/inventory/management/incoming/two_steps.rst +++ b/content/applications/inventory_and_mrp/inventory/management/incoming/two_steps.rst @@ -73,7 +73,7 @@ How to process the Receipt step ? Click on the receipt that you want to process, then click on **Validate** to complete the move from the **Vendor** to **WH/Input**. -This has completed the Receipt Step and the move refered with **WH/IN**. +This has completed the Receipt Step and the move referred with **WH/IN**. The product has been moved from the **Vendor** to the **WH/Input** location, which makes the product available for the next step. @@ -90,7 +90,7 @@ the quality control. Click on the picking you want to process. Click on **Validate** to complete the move from **WH/Input** to **WH/Stock**. -This has completed the internal transfer step and the move refered with **WH/INT**. +This has completed the internal transfer step and the move referred with **WH/INT**. The receipt has been moved to your stock. .. seealso:: diff --git a/content/applications/inventory_and_mrp/inventory/management/reporting/valuation_methods_continental.rst b/content/applications/inventory_and_mrp/inventory/management/reporting/valuation_methods_continental.rst index 0f4495454..78fca9a51 100644 --- a/content/applications/inventory_and_mrp/inventory/management/reporting/valuation_methods_continental.rst +++ b/content/applications/inventory_and_mrp/inventory/management/reporting/valuation_methods_continental.rst @@ -311,7 +311,7 @@ Profit&Loss section to your assets. ===================================== ===== ====== If the stock value decreased, the **Inventory** account is credited - and te **Inventory Variations** debited. + and the **Inventory Variations** debited. .. raw:: html diff --git a/content/applications/inventory_and_mrp/inventory/overview/process/sale_to_delivery.rst b/content/applications/inventory_and_mrp/inventory/overview/process/sale_to_delivery.rst index 698227a71..3339901bc 100644 --- a/content/applications/inventory_and_mrp/inventory/overview/process/sale_to_delivery.rst +++ b/content/applications/inventory_and_mrp/inventory/overview/process/sale_to_delivery.rst @@ -111,7 +111,7 @@ team. You will get the list of all your quotations. Click on the **Create** button. -Fill in the **Customer informations** and click on **Add an Item** to add +Fill in the **Customer information** and click on **Add an Item** to add some products to your quotation. .. image:: media/sale_to_delivery09.png diff --git a/content/applications/inventory_and_mrp/inventory/routes/concepts/inter_warehouse.rst b/content/applications/inventory_and_mrp/inventory/routes/concepts/inter_warehouse.rst index 56cf561b8..50ad8bc81 100644 --- a/content/applications/inventory_and_mrp/inventory/routes/concepts/inter_warehouse.rst +++ b/content/applications/inventory_and_mrp/inventory/routes/concepts/inter_warehouse.rst @@ -80,7 +80,7 @@ Create an internal transfer =========================== The final step is to create your internal transfer. If you want to -tranfer 2 units of a product from your first warehouse to another one in +transfer 2 units of a product from your first warehouse to another one in Brussels, proceed as follows: From your dashboard, select a internal movement of one of the two diff --git a/content/applications/inventory_and_mrp/inventory/routes/costing/landed_costs.rst b/content/applications/inventory_and_mrp/inventory/routes/costing/landed_costs.rst index 1ced3fe7d..bed5b35c0 100644 --- a/content/applications/inventory_and_mrp/inventory/routes/costing/landed_costs.rst +++ b/content/applications/inventory_and_mrp/inventory/routes/costing/landed_costs.rst @@ -30,7 +30,7 @@ Go in :menuselection:`Inventory --> Operations --> Landed Costs` and click on th **Create** button. You then have to select the transfers on which you want to attribute additional costs and the costs lines you want to add up. Once it's done, click on the **Compute** button to see how the costs lines will be split -accross your transfers lines. +across your transfers lines. .. image:: media/landed_costs_v12_02.png :align: center diff --git a/content/applications/inventory_and_mrp/inventory/shipping/setup/ups_credentials.rst b/content/applications/inventory_and_mrp/inventory/shipping/setup/ups_credentials.rst index dd913e287..d63d97211 100644 --- a/content/applications/inventory_and_mrp/inventory/shipping/setup/ups_credentials.rst +++ b/content/applications/inventory_and_mrp/inventory/shipping/setup/ups_credentials.rst @@ -10,7 +10,7 @@ In order to use the Odoo UPS API, you will need: - An Access Key -An Access Key is a 16 character alpha-numeric code that allows access to +An Access Key is a 16 character alphanumeric code that allows access to the UPS Developer Kit API Development and Production servers. Create a UPS Account diff --git a/content/applications/inventory_and_mrp/purchase/purchases/master/uom.rst b/content/applications/inventory_and_mrp/purchase/purchases/master/uom.rst index 803474802..53687cb74 100644 --- a/content/applications/inventory_and_mrp/purchase/purchases/master/uom.rst +++ b/content/applications/inventory_and_mrp/purchase/purchases/master/uom.rst @@ -49,7 +49,7 @@ Standard units of measures ~~~~~~~~~~~~~~~~~~~~~~~~~~ Let's take the classic units of measures existing in Odoo as first -example. Please remember that differents units of measures between sales +example. Please remember that different units of measures between sales and purchase necessarily need to share the same category. Categories include: **Unit**, **weight**, **working time**, **volume**, etc. diff --git a/content/applications/inventory_and_mrp/purchase/purchases/rfq/3_way_matching.rst b/content/applications/inventory_and_mrp/purchase/purchases/rfq/3_way_matching.rst index 328234076..4f4b916db 100644 --- a/content/applications/inventory_and_mrp/purchase/purchases/rfq/3_way_matching.rst +++ b/content/applications/inventory_and_mrp/purchase/purchases/rfq/3_way_matching.rst @@ -7,7 +7,7 @@ receiving the ordered products. However, you might not want to pay it until the products have been received. To define whether the vendor bill should be paid or not, you can use -what we call *3-way matching*. It refers to the comparaison of the +what we call *3-way matching*. It refers to the comparison of the information appearing on the *Purchase Order*, the *Vendor Bill* and the *Receipt*. diff --git a/content/applications/inventory_and_mrp/purchase/purchases/rfq/analyze.rst b/content/applications/inventory_and_mrp/purchase/purchases/rfq/analyze.rst index 3b43a998a..0eb82f157 100644 --- a/content/applications/inventory_and_mrp/purchase/purchases/rfq/analyze.rst +++ b/content/applications/inventory_and_mrp/purchase/purchases/rfq/analyze.rst @@ -6,7 +6,7 @@ If your company regularly buys products from several suppliers, it would be useful to get statistics on your purchases. There are several reasons to track and analyze your vendor's performance : -- You can see how dependant from a supplier your company is; +- You can see how dependent from a supplier your company is; - you can negotiate discounts on prices; @@ -84,7 +84,7 @@ To do so, use the **Advanced search view** located in the right hand side of your screen, by clicking on the magnifying glass icon at the end of the search bar button. This function allows you to highlight only selected data on your report. The **filters** option is very useful in -order to display some categories of datas, while the **Group by** option +order to display some categories of data, while the **Group by** option improves the readability of your reports. Note that you can filter and group by any existing field, making your customization very flexible and powerful. diff --git a/content/applications/productivity/discuss/email_servers.rst b/content/applications/productivity/discuss/email_servers.rst index 27d46c15d..d05852059 100644 --- a/content/applications/productivity/discuss/email_servers.rst +++ b/content/applications/productivity/discuss/email_servers.rst @@ -15,8 +15,8 @@ to manage your email server's reputation yourself. You will find here below some useful information on how to integrate your own email solution with Odoo. -.. note:: Office 365 email servers don't allow easiliy to send external emails - from hosts like Odoo. +.. note:: Office 365 email servers don't allow easily to send external emails + from hosts like Odoo. Refer to the `Microsoft's documentation `__ to make it work. diff --git a/content/applications/sales/crm/track_leads/lead_scoring.rst b/content/applications/sales/crm/track_leads/lead_scoring.rst index 3a9b0e042..86a530898 100644 --- a/content/applications/sales/crm/track_leads/lead_scoring.rst +++ b/content/applications/sales/crm/track_leads/lead_scoring.rst @@ -3,7 +3,7 @@ Assign leads based on scoring ============================= With *Leads Scoring* you can automatically rank your leads based on -selected criterias. +selected criteria. For example you could score customers from your country higher or the ones that visited specific pages on your website. @@ -24,7 +24,7 @@ You now have a new tab in your *CRM* app called *Leads Management* where you can manage your scoring rules. Here's an example for a Canadian lead, you can modify for whatever -criteria you wish to score your leads on. You can add as many criterias +criteria you wish to score your leads on. You can add as many criteria as you wish. .. image:: media/lead_scoring02.png diff --git a/content/applications/sales/point_of_sale/advanced_pricing_features/seasonal_discount.rst b/content/applications/sales/point_of_sale/advanced_pricing_features/seasonal_discount.rst index a8e81e708..ab5144172 100644 --- a/content/applications/sales/point_of_sale/advanced_pricing_features/seasonal_discount.rst +++ b/content/applications/sales/point_of_sale/advanced_pricing_features/seasonal_discount.rst @@ -28,7 +28,7 @@ By default, you have a *Public Pricelist* to create more, go to .. image:: media/seasonal_discount02.png :align: center -You can set several criterias to use a specific price: periods, min. +You can set several criteria to use a specific price: periods, min. quantity (meet a minimum ordered quantity and get a price break), etc. You can also chose to only apply that pricelist on specific products or on the whole range. diff --git a/content/applications/sales/sales/ebay/manage.rst b/content/applications/sales/sales/ebay/manage.rst index 5930b927f..cb11d98f2 100644 --- a/content/applications/sales/sales/ebay/manage.rst +++ b/content/applications/sales/sales/ebay/manage.rst @@ -24,7 +24,7 @@ Listing with variations ======================= When the **use eBay** on a product with variations is checked and with **Fixed -Price** as **Listing Type**, the eBay form is sligthly different. In the +Price** as **Listing Type**, the eBay form is slightly different. In the variants array, you can choose which variant will be listed on eBay as well as set the price and the quantity for each variant. @@ -47,4 +47,4 @@ Products identifiers such as EAN, UPC, Brand or MPN are required in most of the The module manages the EAN and UPC identifiers with the **Barcode** field of the product variant. If the **Barcode** field is empty or is value is not valid, the EAN and UPC values will be set as 'Does not apply' as recommended by eBay. The Brand and MPN values are working as item specifics and should be define in the **Variants** tab on the product form. -If theses values are not set, 'Does not apply' will be used for the eBay listing. \ No newline at end of file +If these values are not set, 'Does not apply' will be used for the eBay listing. diff --git a/content/applications/sales/sales/products_prices/prices/pricing.rst b/content/applications/sales/sales/products_prices/prices/pricing.rst index f730ea7dd..087b2f7c3 100644 --- a/content/applications/sales/sales/products_prices/prices/pricing.rst +++ b/content/applications/sales/sales/products_prices/prices/pricing.rst @@ -66,12 +66,12 @@ Prices per minimum quantity Discounts, margins, roundings ============================= -*Advanced pricing based on formula* allows to set price change rules. -Changes can be relative to the product list/catalog price, the product cost price, -or to another pricelist. Changes are calculated via discounts or surcharges and can be -forced to fit within floor (minumum margin) and ceilings (maximum margins). -Prices can be rounded to the nearest cent/dollar or multiple of either -(nearest 5 cents, nearest 10 dollars). +*Advanced pricing based on formula* allows to set price change rules. +Changes can be relative to the product list/catalog price, the product cost price, +or to another pricelist. Changes are calculated via discounts or surcharges and can be +forced to fit within floor (minimum margin) and ceilings (maximum margins). +Prices can be rounded to the nearest cent/dollar or multiple of either +(nearest 5 cents, nearest 10 dollars). Once installed go to :menuselection:`Sales --> Configuration --> Pricelists` diff --git a/content/applications/sales/sales/send_quotations/quote_template.rst b/content/applications/sales/sales/send_quotations/quote_template.rst index 2955ca996..28b1cfeee 100644 --- a/content/applications/sales/sales/send_quotations/quote_template.rst +++ b/content/applications/sales/sales/send_quotations/quote_template.rst @@ -30,7 +30,7 @@ expiration time for the quotation. On each template, you can also specify discounts if the option is activated in the *Sales* settings. The base price is set in the -product configuration and can be alterated by customer pricelists. +product configuration and can be altered by customer pricelists. Edit your template ================== diff --git a/content/applications/websites/ecommerce/shopper_experience/authorize.rst b/content/applications/websites/ecommerce/shopper_experience/authorize.rst index 3e3796586..fcdc9b3b7 100644 --- a/content/applications/websites/ecommerce/shopper_experience/authorize.rst +++ b/content/applications/websites/ecommerce/shopper_experience/authorize.rst @@ -68,7 +68,7 @@ you are still in *Test* mode. You can also log in to `Authorize.Net sandbox platform `__ to configure your sandbox account. -To perform ficticious transactions you can use fake card numbers +To perform fictitious transactions you can use fake card numbers provided in the `Authorize.Net Testing Guide `__. .. seealso:: diff --git a/content/applications/websites/ecommerce/shopper_experience/payment_acquirer.rst b/content/applications/websites/ecommerce/shopper_experience/payment_acquirer.rst index 913587c7d..84eeadd07 100644 --- a/content/applications/websites/ecommerce/shopper_experience/payment_acquirer.rst +++ b/content/applications/websites/ecommerce/shopper_experience/payment_acquirer.rst @@ -27,7 +27,7 @@ At anytime, the salesman can check the transaction status from the order. * *Done*: the payment is authorized and captured. The order has been confirmed. -* *Error*: an error has occured during the transaction. +* *Error*: an error has occurred during the transaction. The customer needs to retry the payment. The order is still in draft. diff --git a/content/applications/websites/website/optimize/link_tracker.rst b/content/applications/websites/website/optimize/link_tracker.rst index 263834a53..a986dce7f 100644 --- a/content/applications/websites/website/optimize/link_tracker.rst +++ b/content/applications/websites/website/optimize/link_tracker.rst @@ -23,7 +23,7 @@ to get a specific tracked URL based on the campaign, medium, and source being us .. image:: media/link_tracker_fields.png :align: center - :alt: View of the link traker fields for Odoo Website + :alt: View of the link tracker fields for Odoo Website - **URL**: url of the page you want to track (e.g. the home page or a product's page). - **Campaign**: context of your link (e.g. a special promotion). diff --git a/content/applications/websites/website/publish/multi_website.rst b/content/applications/websites/website/publish/multi_website.rst index f72a48b4f..e07454e07 100644 --- a/content/applications/websites/website/publish/multi_website.rst +++ b/content/applications/websites/website/publish/multi_website.rst @@ -119,7 +119,7 @@ be redirected to the right website using Geo IP. Geo IP is installed by default in Odoo Online. If you run Odoo on-premise, don’t forget to install *Geoip* library. -`Read the full documenation about domain names here `__, +`Read the full documentation about domain names here `__, Customize the visitor experience ================================ From bfec9a58f927cbe00bc603c4909833674785d314 Mon Sep 17 00:00:00 2001 From: Victor Feyens Date: Mon, 31 May 2021 11:56:48 +0200 Subject: [PATCH 5/5] [FIX] code: typos --- conf.py | 2 +- extensions/github_link/__init__.py | 2 +- extensions/odoo_theme/static/scss/bootstrap_scss/_tables.scss | 2 +- static/js/entries.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf.py b/conf.py index 9499ec7bb..b5fde0d2b 100644 --- a/conf.py +++ b/conf.py @@ -131,7 +131,7 @@ github_project = 'documentation' locale_dirs = ['../locale/'] -# custom docname_to_domain to devide the translations of applications in subdirectories +# custom docname_to_domain to divide the translations of applications in subdirectories sphinx.transforms.i18n.docname_to_domain = ( sphinx.util.i18n.docname_to_domain ) = lambda docname, compact: docname.split('/')[1 if docname.startswith('applications/') else 0] diff --git a/extensions/github_link/__init__.py b/extensions/github_link/__init__.py index 5d1752c5e..0c2bf6722 100644 --- a/extensions/github_link/__init__.py +++ b/extensions/github_link/__init__.py @@ -110,7 +110,7 @@ def add_doc_link(app, pagename, templatename, context, doctree): return # FIXME: find other way to recover current document's source suffix - # in Sphinx 1.3 it's possible to have mutliple source suffixes and that + # in Sphinx 1.3 it's possible to have multiple source suffixes and that # may be useful in the future source_suffix = app.config.source_suffix source_suffix = next(iter(source_suffix)) diff --git a/extensions/odoo_theme/static/scss/bootstrap_scss/_tables.scss b/extensions/odoo_theme/static/scss/bootstrap_scss/_tables.scss index 506c60be0..09626add3 100644 --- a/extensions/odoo_theme/static/scss/bootstrap_scss/_tables.scss +++ b/extensions/odoo_theme/static/scss/bootstrap_scss/_tables.scss @@ -71,7 +71,7 @@ // // When borders are added on all sides of the cells, the corners can render odd when // these borders do not have the same color or if they are semi-transparent. -// Therefor we add top and border bottoms to the `tr`s and left and right borders +// Therefore we add top and border bottoms to the `tr`s and left and right borders // to the `td`s or `th`s .table-bordered { diff --git a/static/js/entries.js b/static/js/entries.js index 716aba871..d2a3bdad0 100644 --- a/static/js/entries.js +++ b/static/js/entries.js @@ -160,7 +160,7 @@ ], configuration: [ "Revenue: defined on the product, or the product category if not on the product, field Income Account", - "Defered Tax Liabilities: defined on the tax used on the invoice line", + "Deferred Tax Liabilities: defined on the tax used on the invoice line", "Accounts Receivable: defined on the customer (property)", "Inventory: defined on the category of the related product (property)", "Expenses: defined on the product, or the category of product (property)",