diff --git a/ir_module_compare_wizard/__manifest__.py b/ir_module_compare_wizard/__manifest__.py index 13fa4373b0..ed2d2bf9b1 100644 --- a/ir_module_compare_wizard/__manifest__.py +++ b/ir_module_compare_wizard/__manifest__.py @@ -13,8 +13,8 @@ "base_import_wizard", ], "data": [ - "views/ir_module_import_line_views.xml", "views/ir_module_import_views.xml", + "views/ir_module_import_line_views.xml", "security/ir.model.access.csv", ], "external_dependencies": {"python": ["xlrd"]}, diff --git a/ir_module_compare_wizard/i18n/es.po b/ir_module_compare_wizard/i18n/es.po index 24133b73ad..e18c021bcf 100644 --- a/ir_module_compare_wizard/i18n/es.po +++ b/ir_module_compare_wizard/i18n/es.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-03-21 11:55+0000\n" -"PO-Revision-Date: 2024-03-21 11:55+0000\n" +"POT-Creation-Date: 2024-08-08 12:25+0000\n" +"PO-Revision-Date: 2024-08-08 12:25+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -102,7 +102,10 @@ msgid "Attachment Count" msgstr "Nº de archivos adjuntos" #. module: ir_module_compare_wizard +#. odoo-python +#: code:addons/ir_module_compare_wizard/models/ir_module_compare.py:0 #: model:ir.model.fields,field_description:ir_module_compare_wizard.field_ir_module_import_line__module_author +#, python-format msgid "Author" msgstr "Autor" @@ -115,14 +118,20 @@ msgstr "Autor generico" #: model:ir.actions.act_window,name:ir_module_compare_wizard.ir_module_import_action #: model:ir.ui.menu,name:ir_module_compare_wizard.ir_module_import_management_menu #: model:ir.ui.menu,name:ir_module_compare_wizard.ir_module_import_menu -msgid "Compare Module to Install" -msgstr "Compara modulos a instalar" +msgid "Compare Module Wizards" +msgstr "Comparar modulos" #. module: ir_module_compare_wizard #: model:ir.actions.act_window,name:ir_module_compare_wizard.ir_module_import_line_action +#: model:ir.ui.menu,name:ir_module_compare_wizard.ir_module_import_line_management_menu #: model:ir.ui.menu,name:ir_module_compare_wizard.ir_module_import_line_menu -msgid "Compare Module to Install Lines" -msgstr "Líneas para comparar modulos a instalar" +msgid "Compare Module by Lines" +msgstr "Líneas para comparar modulos" + +#. module: ir_module_compare_wizard +#: model:ir.ui.menu,name:ir_module_compare_wizard.module_import_management_menu +msgid "Compare Module to Install" +msgstr "Comparador de modulos a instalar" #. module: ir_module_compare_wizard #: model:ir.model.fields,field_description:ir_module_compare_wizard.field_ir_module_import__create_uid @@ -286,6 +295,20 @@ msgstr "Líneas importadas" msgid "Install" msgstr "Instalar" +#. module: ir_module_compare_wizard +#. odoo-python +#: code:addons/ir_module_compare_wizard/models/ir_module_compare.py:0 +#, python-format +msgid "Install Module" +msgstr "Instalar Módulo" + +#. module: ir_module_compare_wizard +#. odoo-python +#: code:addons/ir_module_compare_wizard/models/ir_module_compare.py:0 +#, python-format +msgid "Installed Version" +msgstr "Versión instalada" + #. module: ir_module_compare_wizard #: model:ir.model.fields,field_description:ir_module_compare_wizard.field_ir_module_import__message_is_follower msgid "Is Follower" @@ -314,6 +337,13 @@ msgstr "Última actualización el" msgid "Last Version" msgstr "Última versión" +#. module: ir_module_compare_wizard +#. odoo-python +#: code:addons/ir_module_compare_wizard/models/ir_module_compare.py:0 +#, python-format +msgid "Latest Version" +msgstr "Última versión" + #. module: ir_module_compare_wizard #: model:ir.model.fields,field_description:ir_module_compare_wizard.field_ir_module_import__import_line_ids msgid "Lines to Import" @@ -345,6 +375,13 @@ msgstr "Mensajes" msgid "Migrate" msgstr "Migrar" +#. module: ir_module_compare_wizard +#. odoo-python +#: code:addons/ir_module_compare_wizard/models/ir_module_compare.py:0 +#, python-format +msgid "Migrate Module" +msgstr "Migrar Módulo" + #. module: ir_module_compare_wizard #. odoo-python #: code:addons/ir_module_compare_wizard/models/ir_module_compare.py:0 @@ -353,6 +390,20 @@ msgstr "Migrar" msgid "Module %(module_name)s not installable" msgstr "Modulo %(module_name)s no instalable" +#. module: ir_module_compare_wizard +#. odoo-python +#: code:addons/ir_module_compare_wizard/models/ir_module_compare.py:0 +#, python-format +msgid "Module Author Generic" +msgstr "Autor Genérico del Módulo" + +#. module: ir_module_compare_wizard +#. odoo-python +#: code:addons/ir_module_compare_wizard/models/ir_module_compare.py:0 +#, python-format +msgid "Module Name" +msgstr "Nombre de módulo" + #. module: ir_module_compare_wizard #: model:ir.model.fields,field_description:ir_module_compare_wizard.field_ir_module_import__my_activity_date_deadline msgid "My Activity Deadline" @@ -387,7 +438,10 @@ msgid "No module %(module_name)s found." msgstr "No se ha encontrado el modulo %(module_name)s." #. module: ir_module_compare_wizard +#. odoo-python +#: code:addons/ir_module_compare_wizard/models/ir_module_compare.py:0 #: model:ir.model.fields,field_description:ir_module_compare_wizard.field_ir_module_import_line__module_notes +#, python-format msgid "Notes" msgstr "Notas" @@ -411,13 +465,21 @@ msgstr "Número de mensajes que requieren una acción" msgid "Number of messages with delivery error" msgstr "Número de mensajes con error de envío" +#. module: ir_module_compare_wizard +#: model:ir.model.fields,field_description:ir_module_compare_wizard.field_ir_module_import_line__module_path +msgid "Path" +msgstr "" + #. module: ir_module_compare_wizard #: model_terms:ir.ui.view,arch_db:ir_module_compare_wizard.ir_module_import_view_search msgid "Pending" msgstr "Pendiente" #. module: ir_module_compare_wizard +#. odoo-python +#: code:addons/ir_module_compare_wizard/models/ir_module_compare.py:0 #: model:ir.model.fields,field_description:ir_module_compare_wizard.field_ir_module_import_line__priority +#, python-format msgid "Priority" msgstr "Prioridad" @@ -463,7 +525,10 @@ msgstr "" "Planificada: futuras actividades." #. module: ir_module_compare_wizard +#. odoo-python +#: code:addons/ir_module_compare_wizard/models/ir_module_compare.py:0 #: model:ir.model.fields,field_description:ir_module_compare_wizard.field_ir_module_import_line__module_technical_name +#, python-format msgid "Technical Name" msgstr "Nombre técnico" @@ -484,6 +549,7 @@ msgid "Update" msgstr "Actualizar" #. module: ir_module_compare_wizard +#: model:ir.actions.server,name:ir_module_compare_wizard.action_button_validate #: model_terms:ir.ui.view,arch_db:ir_module_compare_wizard.ir_module_import_line_base_view_tree #: model_terms:ir.ui.view,arch_db:ir_module_compare_wizard.ir_module_import_line_view_form #: model_terms:ir.ui.view,arch_db:ir_module_compare_wizard.ir_module_import_view_form @@ -491,7 +557,10 @@ msgid "Validate" msgstr "Validar" #. module: ir_module_compare_wizard +#. odoo-python +#: code:addons/ir_module_compare_wizard/models/ir_module_compare.py:0 #: model:ir.model.fields,field_description:ir_module_compare_wizard.field_ir_module_import_line__module_website +#, python-format msgid "Website" msgstr "Sitio web" diff --git a/ir_module_compare_wizard/i18n/ir_module_compare_wizard.pot b/ir_module_compare_wizard/i18n/ir_module_compare_wizard.pot index 20d287289d..83087c5921 100644 --- a/ir_module_compare_wizard/i18n/ir_module_compare_wizard.pot +++ b/ir_module_compare_wizard/i18n/ir_module_compare_wizard.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 16.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-03-21 11:55+0000\n" -"PO-Revision-Date: 2024-03-21 11:55+0000\n" +"POT-Creation-Date: 2024-08-08 12:24+0000\n" +"PO-Revision-Date: 2024-08-08 12:24+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -102,7 +102,10 @@ msgid "Attachment Count" msgstr "" #. module: ir_module_compare_wizard +#. odoo-python +#: code:addons/ir_module_compare_wizard/models/ir_module_compare.py:0 #: model:ir.model.fields,field_description:ir_module_compare_wizard.field_ir_module_import_line__module_author +#, python-format msgid "Author" msgstr "" @@ -115,13 +118,19 @@ msgstr "" #: model:ir.actions.act_window,name:ir_module_compare_wizard.ir_module_import_action #: model:ir.ui.menu,name:ir_module_compare_wizard.ir_module_import_management_menu #: model:ir.ui.menu,name:ir_module_compare_wizard.ir_module_import_menu -msgid "Compare Module to Install" +msgid "Compare Module Wizards" msgstr "" #. module: ir_module_compare_wizard #: model:ir.actions.act_window,name:ir_module_compare_wizard.ir_module_import_line_action +#: model:ir.ui.menu,name:ir_module_compare_wizard.ir_module_import_line_management_menu #: model:ir.ui.menu,name:ir_module_compare_wizard.ir_module_import_line_menu -msgid "Compare Module to Install Lines" +msgid "Compare Module by Lines" +msgstr "" + +#. module: ir_module_compare_wizard +#: model:ir.ui.menu,name:ir_module_compare_wizard.module_import_management_menu +msgid "Compare Module to Install" msgstr "" #. module: ir_module_compare_wizard @@ -286,6 +295,20 @@ msgstr "" msgid "Install" msgstr "" +#. module: ir_module_compare_wizard +#. odoo-python +#: code:addons/ir_module_compare_wizard/models/ir_module_compare.py:0 +#, python-format +msgid "Install Module" +msgstr "" + +#. module: ir_module_compare_wizard +#. odoo-python +#: code:addons/ir_module_compare_wizard/models/ir_module_compare.py:0 +#, python-format +msgid "Installed Version" +msgstr "" + #. module: ir_module_compare_wizard #: model:ir.model.fields,field_description:ir_module_compare_wizard.field_ir_module_import__message_is_follower msgid "Is Follower" @@ -314,6 +337,13 @@ msgstr "" msgid "Last Version" msgstr "" +#. module: ir_module_compare_wizard +#. odoo-python +#: code:addons/ir_module_compare_wizard/models/ir_module_compare.py:0 +#, python-format +msgid "Latest Version" +msgstr "" + #. module: ir_module_compare_wizard #: model:ir.model.fields,field_description:ir_module_compare_wizard.field_ir_module_import__import_line_ids msgid "Lines to Import" @@ -345,6 +375,13 @@ msgstr "" msgid "Migrate" msgstr "" +#. module: ir_module_compare_wizard +#. odoo-python +#: code:addons/ir_module_compare_wizard/models/ir_module_compare.py:0 +#, python-format +msgid "Migrate Module" +msgstr "" + #. module: ir_module_compare_wizard #. odoo-python #: code:addons/ir_module_compare_wizard/models/ir_module_compare.py:0 @@ -353,6 +390,20 @@ msgstr "" msgid "Module %(module_name)s not installable" msgstr "" +#. module: ir_module_compare_wizard +#. odoo-python +#: code:addons/ir_module_compare_wizard/models/ir_module_compare.py:0 +#, python-format +msgid "Module Author Generic" +msgstr "" + +#. module: ir_module_compare_wizard +#. odoo-python +#: code:addons/ir_module_compare_wizard/models/ir_module_compare.py:0 +#, python-format +msgid "Module Name" +msgstr "" + #. module: ir_module_compare_wizard #: model:ir.model.fields,field_description:ir_module_compare_wizard.field_ir_module_import__my_activity_date_deadline msgid "My Activity Deadline" @@ -387,7 +438,10 @@ msgid "No module %(module_name)s found." msgstr "" #. module: ir_module_compare_wizard +#. odoo-python +#: code:addons/ir_module_compare_wizard/models/ir_module_compare.py:0 #: model:ir.model.fields,field_description:ir_module_compare_wizard.field_ir_module_import_line__module_notes +#, python-format msgid "Notes" msgstr "" @@ -411,13 +465,21 @@ msgstr "" msgid "Number of messages with delivery error" msgstr "" +#. module: ir_module_compare_wizard +#: model:ir.model.fields,field_description:ir_module_compare_wizard.field_ir_module_import_line__module_path +msgid "Path" +msgstr "" + #. module: ir_module_compare_wizard #: model_terms:ir.ui.view,arch_db:ir_module_compare_wizard.ir_module_import_view_search msgid "Pending" msgstr "" #. module: ir_module_compare_wizard +#. odoo-python +#: code:addons/ir_module_compare_wizard/models/ir_module_compare.py:0 #: model:ir.model.fields,field_description:ir_module_compare_wizard.field_ir_module_import_line__priority +#, python-format msgid "Priority" msgstr "" @@ -459,7 +521,10 @@ msgid "" msgstr "" #. module: ir_module_compare_wizard +#. odoo-python +#: code:addons/ir_module_compare_wizard/models/ir_module_compare.py:0 #: model:ir.model.fields,field_description:ir_module_compare_wizard.field_ir_module_import_line__module_technical_name +#, python-format msgid "Technical Name" msgstr "" @@ -480,6 +545,7 @@ msgid "Update" msgstr "" #. module: ir_module_compare_wizard +#: model:ir.actions.server,name:ir_module_compare_wizard.action_button_validate #: model_terms:ir.ui.view,arch_db:ir_module_compare_wizard.ir_module_import_line_base_view_tree #: model_terms:ir.ui.view,arch_db:ir_module_compare_wizard.ir_module_import_line_view_form #: model_terms:ir.ui.view,arch_db:ir_module_compare_wizard.ir_module_import_view_form @@ -487,7 +553,10 @@ msgid "Validate" msgstr "" #. module: ir_module_compare_wizard +#. odoo-python +#: code:addons/ir_module_compare_wizard/models/ir_module_compare.py:0 #: model:ir.model.fields,field_description:ir_module_compare_wizard.field_ir_module_import_line__module_website +#, python-format msgid "Website" msgstr "" diff --git a/ir_module_compare_wizard/models/ir_module_compare.py b/ir_module_compare_wizard/models/ir_module_compare.py index 2e52cf7ab7..f5657bc280 100644 --- a/ir_module_compare_wizard/models/ir_module_compare.py +++ b/ir_module_compare_wizard/models/ir_module_compare.py @@ -26,17 +26,37 @@ def _get_line_values(self, row_values, datemode=False): self.ensure_one() values = super()._get_line_values(row_values, datemode=datemode) if row_values: - module_technical_name = row_values.get("Name", "") + module_technical_name = row_values.get( + _("Technical Name"), + row_values.get( + "Technical Name", + row_values.get(_("Module Name"), row_values.get("Module Name", "")), + ), + ) if not module_technical_name: return {} - module_last_version = row_values.get("Last Version", "") - module_website = row_values.get("Website", "") - module_author = row_values.get("Author", "") - module_notes = row_values.get("Notes", "") - module_author_generic = row_values.get("Module Author Generic", "") - priority = row_values.get("Priority", 0) - migrate_module = row_values.get("Migrate Module", True) - install_module = row_values.get("Install Module", True) + module_last_version = row_values.get( + _("Installed Version"), + row_values.get( + "Installed Version", + row_values.get( + _("Latest Version"), row_values.get("Latest Version", "") + ), + ), + ) + module_website = row_values.get(_("Website"), row_values.get("Website", "")) + module_author = row_values.get(_("Author"), row_values.get("Author", "")) + module_notes = row_values.get(_("Notes"), row_values.get("Notes", "")) + module_author_generic = row_values.get( + _("Module Author Generic"), row_values.get("Module Author Generic", "") + ) + priority = row_values.get(_("Priority"), row_values.get("Priority", 0)) + migrate_module = row_values.get( + _("Migrate Module"), row_values.get("Migrate Module", True) + ) + install_module = row_values.get( + _("Install Module"), row_values.get("Install Module", True) + ) log_info = "" values.update( { diff --git a/ir_module_compare_wizard/views/ir_module_import_line_views.xml b/ir_module_compare_wizard/views/ir_module_import_line_views.xml index 06d4c6f5b4..52116e936b 100644 --- a/ir_module_compare_wizard/views/ir_module_import_line_views.xml +++ b/ir_module_compare_wizard/views/ir_module_import_line_views.xml @@ -4,8 +4,6 @@ ir.module.import.line - - @@ -15,6 +13,8 @@ + + primary - 0 + + hide - Compare Module to Install Lines + Compare Module by Lines ir.actions.act_window ir.module.import.line tree,form @@ -184,4 +185,29 @@ parent="base_import_wizard.base_import_menu" sequence="11" /> + + + + + Validate + + + ir.actions.server + code + + if records: + records.button_validate() + + diff --git a/ir_module_compare_wizard/views/ir_module_import_views.xml b/ir_module_compare_wizard/views/ir_module_import_views.xml index 12afd6559d..4f2b03dda2 100644 --- a/ir_module_compare_wizard/views/ir_module_import_views.xml +++ b/ir_module_compare_wizard/views/ir_module_import_views.xml @@ -80,10 +80,10 @@
  • Name: this will fill Technical Name
  • + >Technical Name: this will fill Technical Name
  • Last Version: this will fill Last Version
  • + >Latest Version: this will fill Last Version
  • Website: this will fill Website
  • @@ -152,8 +152,15 @@ + + - Compare Module to Install + Compare Module Wizards ir.actions.act_window ir.module.import tree,form @@ -170,7 +177,7 @@