[FIX] duplicate labels (category_id, uom_category_id) of rma())

This commit is contained in:
Kev-Roche
2022-01-16 14:11:35 +01:00
committed by Antoni Marroig Campomar
parent 1bd05894ed
commit 3ed79410be
10 changed files with 108 additions and 70 deletions

View File

@@ -3,7 +3,7 @@
{
"name": "Return Merchandise Authorization Management",
"summary": "Return Merchandise Authorization (RMA)",
"version": "14.0.1.0.3",
"version": "14.0.1.1.0",
"development_status": "Production/Stable",
"category": "RMA",
"website": "https://github.com/OCA/rma",

View File

@@ -474,11 +474,15 @@ msgid "Canceled"
msgstr "Cancelado"
#. module: rma
#: model:ir.model.fields,field_description:rma.field_rma__uom_category_id
#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__uom_category_id
msgid "Category"
msgstr ""
#. module: rma
#: model:ir.model.fields,field_description:rma.field_rma__uom_category_id
msgid "Category UoM"
msgstr ""
#. module: rma
#: model_terms:ir.actions.act_window,help:rma.rma_action
#: model_terms:ir.actions.act_window,help:rma.rma_team_action

View File

@@ -43,8 +43,8 @@ msgid ""
"${object.company_id.name} Your RMA has been succesfully created (Ref "
"${object.name or 'n/a' })"
msgstr ""
"${object.company_id.name} Il tuo RMA è stato creato correttamente (Ref ${"
"object.name or 'n/a' })"
"${object.company_id.name} Il tuo RMA è stato creato correttamente (Ref "
"${object.name or 'n/a' })"
#. module: rma
#: code:addons/rma/models/rma_team.py:0
@@ -73,7 +73,8 @@ msgid ""
" (${object.partner_id.parent_id.name})\n"
" % endif\n"
" <br/><br/>\n"
" Here is the RMA <strong>${object.name}</strong> from ${object.company_id.name}.\n"
" Here is the RMA <strong>${object.name}</strong> from ${object.company_id."
"name}.\n"
" <br/><br/>\n"
" Do not hesitate to contact us if you have any question.\n"
"</p>\n"
@@ -165,7 +166,9 @@ msgstr ""
#. module: rma
#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
msgid "<i class=\"fa fa-download\" role=\"img\" aria-label=\"Download\" title=\"Download\"/>"
msgid ""
"<i class=\"fa fa-download\" role=\"img\" aria-label=\"Download\" title="
"\"Download\"/>"
msgstr ""
"<i class=\"fa fa-download\" role=\"img\" aria-label=\"Download\" title="
"\"Download\"/>"
@@ -191,8 +194,8 @@ msgstr ""
#. module: rma
#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
msgid ""
"<i class=\"fa fa-pencil-square-o mr-1\" role=\"img\" aria-label=\"Download\""
" title=\"Download\"/>"
"<i class=\"fa fa-pencil-square-o mr-1\" role=\"img\" aria-label=\"Download\" "
"title=\"Download\"/>"
msgstr ""
"<i class=\"fa fa-pencil-square-o mr-1\" role=\"img\" aria-label=\"Download\" "
"title=\"Download\"/>"
@@ -200,8 +203,8 @@ msgstr ""
#. module: rma
#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
msgid ""
"<i class=\"fa fa-truck mr-1\" role=\"img\" aria-label=\"Download\" "
"title=\"Download\"/>"
"<i class=\"fa fa-truck mr-1\" role=\"img\" aria-label=\"Download\" title="
"\"Download\"/>"
msgstr ""
"<i class=\"fa fa-truck mr-1\" role=\"img\" aria-label=\"Download\" title="
"\"Download\"/>"
@@ -504,11 +507,15 @@ msgid "Canceled"
msgstr "Annullato"
#. module: rma
#: model:ir.model.fields,field_description:rma.field_rma__uom_category_id
#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__uom_category_id
msgid "Category"
msgstr "Categoria"
#. module: rma
#: model:ir.model.fields,field_description:rma.field_rma__uom_category_id
msgid "Category UoM"
msgstr ""
#. module: rma
#: model_terms:ir.actions.act_window,help:rma.rma_action
#: model_terms:ir.actions.act_window,help:rma.rma_team_action
@@ -834,8 +841,8 @@ msgstr "ID"
#. module: rma
#: model:ir.model.fields,help:rma.field_rma_team__alias_parent_thread_id
msgid ""
"ID of the parent record holding the alias (example: project holding the task"
" creation alias)"
"ID of the parent record holding the alias (example: project holding the task "
"creation alias)"
msgstr ""
"ID del record padre che contiene l'alias (esempio: progetto che contiene "
"l'alias di creazione dell'attività)"
@@ -1023,8 +1030,7 @@ msgid "Name"
msgstr "Nome"
#. module: rma
#: code:addons/rma/models/rma.py:0 code:addons/rma/models/rma.py:0
#: code:addons/rma/models/rma.py:0 code:addons/rma/models/rma.py:0
#: code:addons/rma/models/rma.py:0
#, python-format
msgid "New"
msgstr "Nuovo"
@@ -1140,8 +1146,8 @@ msgstr "ID Filo Record Padre"
#. module: rma
#: model:ir.model.fields,help:rma.field_rma_team__alias_parent_model_id
msgid ""
"Parent model holding the alias. The model holding the alias reference is not"
" necessarily the model given by alias_model_id (example: project "
"Parent model holding the alias. The model holding the alias reference is not "
"necessarily the model given by alias_model_id (example: project "
"(parent_model) and task (model))"
msgstr ""
"Modello genitore che detiene l'alias. Il modello che contiene il riferimento "
@@ -1159,7 +1165,8 @@ msgid ""
"Policy to post a message on the document using the mailgateway.\n"
"- everyone: everyone can post\n"
"- partners: only authenticated partners\n"
"- followers: only followers of the related document or members of following channels\n"
"- followers: only followers of the related document or members of following "
"channels\n"
msgstr ""
#. module: rma
@@ -1514,13 +1521,13 @@ msgstr "Sostituito"
#: code:addons/rma/models/rma.py:0
#, python-format
msgid ""
"Replacement: Move <a href=\"#\" data-oe-model=\"stock.move\" data-oe-"
"id=\"%d\">%s</a> (Picking <a href=\"#\" data-oe-model=\"stock.picking\" "
"data-oe-id=\"%d\">%s</a>) has been created."
"Replacement: Move <a href=\"#\" data-oe-model=\"stock.move\" data-oe-id=\"%d"
"\">%s</a> (Picking <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id="
"\"%d\">%s</a>) has been created."
msgstr ""
"Sostituzione: Il trasferimento <a href=\"#\" data-oe-model=\"stock.move\" "
"data-oe-id=\"%d\">%s</a> (Picking <a href=\"#\" data-oe-model=\"stock."
"picking\" data-oe-id=\"%d\">%s</a>) è stato creato."
"data-oe-id=\"%d\">%s</a> (Picking <a href=\"#\" data-oe-model=\"stock.picking"
"\" data-oe-id=\"%d\">%s</a>) è stato creato."
#. module: rma
#: code:addons/rma/models/rma.py:0
@@ -1579,8 +1586,8 @@ msgstr "Rendi al cliente"
#: code:addons/rma/models/rma.py:0
#, python-format
msgid ""
"Return: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-"
"id=\"%d\">%s</a> has been created."
"Return: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%d\">%s</"
"a> has been created."
msgstr ""
"Reso: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%d\">%s</a> "
"è stato creato."
@@ -1722,8 +1729,8 @@ msgstr "Dividi RMA"
#: code:addons/rma/models/rma.py:0
#, python-format
msgid ""
"Split: <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%d\">%s</a> has been"
" created."
"Split: <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%d\">%s</a> has been "
"created."
msgstr ""
"Divisione: <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%d\">%s</a> è "
"stato creato."
@@ -1808,9 +1815,9 @@ msgstr "Il campo attivo permette di nascondere la categoria senza rimuoverla."
#. module: rma
#: model:ir.model.fields,help:rma.field_rma_team__alias_model_id
msgid ""
"The model (Odoo Document Kind) to which this alias corresponds. Any incoming"
" email that does not reply to an existing record will cause the creation of "
"a new record of this model (e.g. a Project Task)"
"The model (Odoo Document Kind) to which this alias corresponds. Any incoming "
"email that does not reply to an existing record will cause the creation of a "
"new record of this model (e.g. a Project Task)"
msgstr ""
#. module: rma
@@ -1854,8 +1861,8 @@ msgstr "L'etichetta è visibile nella vista del portale"
#: code:addons/rma/models/account_move.py:0
#, python-format
msgid ""
"There is at least one invoice lines whose quantity is less than the quantity"
" specified in its linked RMA."
"There is at least one invoice lines whose quantity is less than the quantity "
"specified in its linked RMA."
msgstr ""
"C'è almeno una riga di fatturazione con una quantità minore della quantità "
"specificata nella riga dell'RMA collegato."
@@ -2023,8 +2030,7 @@ msgstr ""
#: model:ir.model.fields,help:rma.field_res_company__send_rma_receipt_confirmation
#: model:ir.model.fields,help:rma.field_res_config_settings__send_rma_receipt_confirmation
msgid ""
"When the RMA receipt is confirmed, send a confirmation email to the "
"customer."
"When the RMA receipt is confirmed, send a confirmation email to the customer."
msgstr ""
"Quando la ricevuta RMA è confermata, inviare un'e-mail di conferma al "
"cliente."

View File

@@ -436,11 +436,15 @@ msgid "Canceled"
msgstr ""
#. module: rma
#: model:ir.model.fields,field_description:rma.field_rma__uom_category_id
#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__uom_category_id
msgid "Category"
msgstr ""
#. module: rma
#: model:ir.model.fields,field_description:rma.field_rma__uom_category_id
msgid "Category UoM"
msgstr ""
#. module: rma
#: model_terms:ir.actions.act_window,help:rma.rma_action
#: model_terms:ir.actions.act_window,help:rma.rma_team_action

View File

@@ -69,7 +69,8 @@ msgid ""
" (${object.partner_id.parent_id.name})\n"
" % endif\n"
" <br/><br/>\n"
" Here is the RMA <strong>${object.name}</strong> from ${object.company_id.name}.\n"
" Here is the RMA <strong>${object.name}</strong> from ${object.company_id."
"name}.\n"
" <br/><br/>\n"
" Do not hesitate to contact us if you have any question.\n"
"</p>\n"
@@ -118,7 +119,9 @@ msgstr ""
#. module: rma
#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
msgid "<i class=\"fa fa-download\" role=\"img\" aria-label=\"Download\" title=\"Download\"/>"
msgid ""
"<i class=\"fa fa-download\" role=\"img\" aria-label=\"Download\" title="
"\"Download\"/>"
msgstr ""
"<i class=\"fa fa-download\" role=\"img\" aria-label=\"Download\" title="
"\"Download\"/>"
@@ -140,8 +143,8 @@ msgstr ""
#. module: rma
#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
msgid ""
"<i class=\"fa fa-pencil-square-o mr-1\" role=\"img\" aria-label=\"Download\""
" title=\"Download\"/>"
"<i class=\"fa fa-pencil-square-o mr-1\" role=\"img\" aria-label=\"Download\" "
"title=\"Download\"/>"
msgstr ""
"<i class=\"fa fa-pencil-square-o mr-1\" role=\"img\" aria-label=\"Descarregar"
"\" title=\"Descarregar\"/>"
@@ -149,8 +152,8 @@ msgstr ""
#. module: rma
#: model_terms:ir.ui.view,arch_db:rma.portal_rma_page
msgid ""
"<i class=\"fa fa-truck mr-1\" role=\"img\" aria-label=\"Download\" "
"title=\"Download\"/>"
"<i class=\"fa fa-truck mr-1\" role=\"img\" aria-label=\"Download\" title="
"\"Download\"/>"
msgstr ""
"<i class=\"fa fa-truck mr-1\" role=\"img\" aria-label=\"Descarregar\" title="
"\"Descarregar\"/>"
@@ -453,11 +456,15 @@ msgid "Canceled"
msgstr "Cancelado(a)"
#. module: rma
#: model:ir.model.fields,field_description:rma.field_rma__uom_category_id
#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__uom_category_id
msgid "Category"
msgstr ""
#. module: rma
#: model:ir.model.fields,field_description:rma.field_rma__uom_category_id
msgid "Category UoM"
msgstr ""
#. module: rma
#: model_terms:ir.actions.act_window,help:rma.rma_action
#: model_terms:ir.actions.act_window,help:rma.rma_team_action
@@ -780,8 +787,8 @@ msgstr "ID"
#. module: rma
#: model:ir.model.fields,help:rma.field_rma_team__alias_parent_thread_id
msgid ""
"ID of the parent record holding the alias (example: project holding the task"
" creation alias)"
"ID of the parent record holding the alias (example: project holding the task "
"creation alias)"
msgstr ""
"ID do registo ascendente que contém o alias (exemplo: projeto que contém o "
"alias de criação da tarefa)"
@@ -965,8 +972,7 @@ msgid "Name"
msgstr "Nome"
#. module: rma
#: code:addons/rma/models/rma.py:0 code:addons/rma/models/rma.py:0
#: code:addons/rma/models/rma.py:0 code:addons/rma/models/rma.py:0
#: code:addons/rma/models/rma.py:0
#, python-format
msgid "New"
msgstr "Novo(a)"
@@ -1082,8 +1088,8 @@ msgstr "Id da Thread do Registo Ascendente"
#. module: rma
#: model:ir.model.fields,help:rma.field_rma_team__alias_parent_model_id
msgid ""
"Parent model holding the alias. The model holding the alias reference is not"
" necessarily the model given by alias_model_id (example: project "
"Parent model holding the alias. The model holding the alias reference is not "
"necessarily the model given by alias_model_id (example: project "
"(parent_model) and task (model))"
msgstr ""
"Modelo pai que contém o alias. O modelo que contém a referência de alias não "
@@ -1101,7 +1107,8 @@ msgid ""
"Policy to post a message on the document using the mailgateway.\n"
"- everyone: everyone can post\n"
"- partners: only authenticated partners\n"
"- followers: only followers of the related document or members of following channels\n"
"- followers: only followers of the related document or members of following "
"channels\n"
msgstr ""
"Política para publicar uma mensagem no documento usando o mail gateway.\n"
"- todos: todos podem postar\n"
@@ -1461,9 +1468,9 @@ msgstr "Substituído"
#: code:addons/rma/models/rma.py:0
#, python-format
msgid ""
"Replacement: Move <a href=\"#\" data-oe-model=\"stock.move\" data-oe-"
"id=\"%d\">%s</a> (Picking <a href=\"#\" data-oe-model=\"stock.picking\" "
"data-oe-id=\"%d\">%s</a>) has been created."
"Replacement: Move <a href=\"#\" data-oe-model=\"stock.move\" data-oe-id=\"%d"
"\">%s</a> (Picking <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id="
"\"%d\">%s</a>) has been created."
msgstr ""
"Substituição: Movimentação <a href=\"#\" data-oe-model=\"stock.move\" data-"
"oe-id=\"%d\">%s</a> (A Coleta <a href=\"#\" data-oe-model=\"stock.picking\" "
@@ -1526,11 +1533,11 @@ msgstr "Devolver ao cliente"
#: code:addons/rma/models/rma.py:0
#, python-format
msgid ""
"Return: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-"
"id=\"%d\">%s</a> has been created."
"Return: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%d\">%s</"
"a> has been created."
msgstr ""
"Devolução: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%d\""
">%s</a> foi criada."
"Devolução: <a href=\"#\" data-oe-model=\"stock.picking\" data-oe-id=\"%d\">"
"%s</a> foi criada."
#. module: rma
#: model:ir.model.fields.selection,name:rma.selection__rma__state__returned
@@ -1668,8 +1675,8 @@ msgstr "Dividir RMA"
#: code:addons/rma/models/rma.py:0
#, python-format
msgid ""
"Split: <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%d\">%s</a> has been"
" created."
"Split: <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%d\">%s</a> has been "
"created."
msgstr ""
"Divisão: <a href=\"#\" data-oe-model=\"rma\" data-oe-id=\"%d\">%s</a> foi "
"criada."
@@ -1754,9 +1761,9 @@ msgstr ""
#. module: rma
#: model:ir.model.fields,help:rma.field_rma_team__alias_model_id
msgid ""
"The model (Odoo Document Kind) to which this alias corresponds. Any incoming"
" email that does not reply to an existing record will cause the creation of "
"a new record of this model (e.g. a Project Task)"
"The model (Odoo Document Kind) to which this alias corresponds. Any incoming "
"email that does not reply to an existing record will cause the creation of a "
"new record of this model (e.g. a Project Task)"
msgstr ""
"Modelo (tipo de documento Odoo) ao qual esse alias corresponde. Qualquer e-"
"mail recebido que não responda a um registo existente causará a criação de "
@@ -1809,8 +1816,8 @@ msgstr ""
#: code:addons/rma/models/account_move.py:0
#, python-format
msgid ""
"There is at least one invoice lines whose quantity is less than the quantity"
" specified in its linked RMA."
"There is at least one invoice lines whose quantity is less than the quantity "
"specified in its linked RMA."
msgstr ""
"Há pelo menos uma linha de fatura cuja quantidade é menor que a quantidade "
"especificada na sua RMA vinculada."
@@ -1974,8 +1981,7 @@ msgstr ""
#: model:ir.model.fields,help:rma.field_res_company__send_rma_receipt_confirmation
#: model:ir.model.fields,help:rma.field_res_config_settings__send_rma_receipt_confirmation
msgid ""
"When the RMA receipt is confirmed, send a confirmation email to the "
"customer."
"When the RMA receipt is confirmed, send a confirmation email to the customer."
msgstr ""
#. module: rma

View File

@@ -454,11 +454,15 @@ msgid "Canceled"
msgstr "Cancelado(a)"
#. module: rma
#: model:ir.model.fields,field_description:rma.field_rma__uom_category_id
#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__uom_category_id
msgid "Category"
msgstr ""
#. module: rma
#: model:ir.model.fields,field_description:rma.field_rma__uom_category_id
msgid "Category UoM"
msgstr ""
#. module: rma
#: model_terms:ir.actions.act_window,help:rma.rma_action
#: model_terms:ir.actions.act_window,help:rma.rma_team_action

View File

@@ -432,11 +432,15 @@ msgid "Canceled"
msgstr ""
#. module: rma
#: model:ir.model.fields,field_description:rma.field_rma__uom_category_id
#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__uom_category_id
msgid "Category"
msgstr ""
#. module: rma
#: model:ir.model.fields,field_description:rma.field_rma__uom_category_id
msgid "Category UoM"
msgstr ""
#. module: rma
#: model_terms:ir.actions.act_window,help:rma.rma_action
#: model_terms:ir.actions.act_window,help:rma.rma_team_action

View File

@@ -473,11 +473,15 @@ msgid "Canceled"
msgstr "Anulat"
#. module: rma
#: model:ir.model.fields,field_description:rma.field_rma__uom_category_id
#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__uom_category_id
msgid "Category"
msgstr ""
#. module: rma
#: model:ir.model.fields,field_description:rma.field_rma__uom_category_id
msgid "Category UoM"
msgstr ""
#. module: rma
#: model_terms:ir.actions.act_window,help:rma.rma_action
#: model_terms:ir.actions.act_window,help:rma.rma_team_action

View File

@@ -438,11 +438,15 @@ msgid "Canceled"
msgstr ""
#. module: rma
#: model:ir.model.fields,field_description:rma.field_rma__uom_category_id
#: model:ir.model.fields,field_description:rma.field_rma_delivery_wizard__uom_category_id
msgid "Category"
msgstr ""
#. module: rma
#: model:ir.model.fields,field_description:rma.field_rma__uom_category_id
msgid "Category UoM"
msgstr ""
#. module: rma
#: model_terms:ir.actions.act_window,help:rma.rma_action
#: model_terms:ir.actions.act_window,help:rma.rma_team_action

View File

@@ -255,7 +255,9 @@ class Rma(models.Model):
digits="Product Unit of Measure",
compute="_compute_remaining_qty",
)
uom_category_id = fields.Many2one(related="product_id.uom_id.category_id")
uom_category_id = fields.Many2one(
related="product_id.uom_id.category_id", string="Category UoM"
)
# Split fields
can_be_split = fields.Boolean(
compute="_compute_can_be_split",