diff --git a/mrp_bom_import_line_layer_and_designator/__manifest__.py b/mrp_bom_import_line_layer_and_designator/__manifest__.py index 99f02570..13ae8470 100644 --- a/mrp_bom_import_line_layer_and_designator/__manifest__.py +++ b/mrp_bom_import_line_layer_and_designator/__manifest__.py @@ -11,6 +11,7 @@ ], "data": [ "views/mrp_bom_import_view.xml", + "views/mrp_bom_line_import_view.xml", ], "installable": True, "application": False, diff --git a/mrp_bom_import_line_layer_and_designator/i18n/en_US.po b/mrp_bom_import_line_layer_and_designator/i18n/en_US.po new file mode 100644 index 00000000..403825e7 --- /dev/null +++ b/mrp_bom_import_line_layer_and_designator/i18n/en_US.po @@ -0,0 +1,31 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * mrp_bom_import_line_layer_and_designator +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 16.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2024-09-13 11:28+0000\n" +"PO-Revision-Date: 2024-09-13 11:28+0000\n" +"Last-Translator: \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: mrp_bom_import_line_layer_and_designator +#: model:ir.model.fields,field_description:mrp_bom_import_line_layer_and_designator.field_mrp_bom_line_import__designator +msgid "Designator" +msgstr "" + +#. module: mrp_bom_import_line_layer_and_designator +#: model:ir.model,name:mrp_bom_import_line_layer_and_designator.model_mrp_bom_line_import +msgid "Import BoM lines" +msgstr "" + +#. module: mrp_bom_import_line_layer_and_designator +#: model:ir.model.fields,field_description:mrp_bom_import_line_layer_and_designator.field_mrp_bom_line_import__layer +msgid "Layer" +msgstr "" diff --git a/mrp_bom_import_line_layer_and_designator/i18n/es.po b/mrp_bom_import_line_layer_and_designator/i18n/es.po index c5ce663d..ba2824e1 100644 --- a/mrp_bom_import_line_layer_and_designator/i18n/es.po +++ b/mrp_bom_import_line_layer_and_designator/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-09-13 11:12+0000\n" -"PO-Revision-Date: 2024-09-13 11:12+0000\n" +"POT-Creation-Date: 2024-09-13 13:42+0000\n" +"PO-Revision-Date: 2024-09-13 13:42+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -15,15 +15,30 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" +#. module: mrp_bom_import_line_layer_and_designator +#: model_terms:ir.ui.view,arch_db:mrp_bom_import_line_layer_and_designator.mrp_bom_import_view_form +msgid "Designator: this will fill Designator" +msgstr "Designator: esto rellenarĂ¡ el Designador" + +#. module: mrp_bom_import_line_layer_and_designator +#: model_terms:ir.ui.view,arch_db:mrp_bom_import_line_layer_and_designator.mrp_bom_import_view_form +msgid "Layer: this will fill Layer" +msgstr "Layer: esto rellenarĂ¡ la Capa" + #. module: mrp_bom_import_line_layer_and_designator #: model:ir.model.fields,field_description:mrp_bom_import_line_layer_and_designator.field_mrp_bom_line_import__designator msgid "Designator" msgstr "Designador" +#. module: mrp_bom_import_line_layer_and_designator +#: model:ir.model,name:mrp_bom_import_line_layer_and_designator.model_mrp_bom_import +msgid "Import BoM from excel file" +msgstr "Importar LdM de fichero excel" + #. module: mrp_bom_import_line_layer_and_designator #: model:ir.model,name:mrp_bom_import_line_layer_and_designator.model_mrp_bom_line_import msgid "Import BoM lines" -msgstr "Importar lineas BoM" +msgstr "Lineas de importador de LdM" #. module: mrp_bom_import_line_layer_and_designator #: model:ir.model.fields,field_description:mrp_bom_import_line_layer_and_designator.field_mrp_bom_line_import__layer diff --git a/mrp_bom_import_line_layer_and_designator/models/__init__.py b/mrp_bom_import_line_layer_and_designator/models/__init__.py index 6eb7f630..23629f26 100644 --- a/mrp_bom_import_line_layer_and_designator/models/__init__.py +++ b/mrp_bom_import_line_layer_and_designator/models/__init__.py @@ -1 +1,2 @@ from . import mrp_bom_line_import +from . import mrp_bom_import diff --git a/mrp_bom_import_line_layer_and_designator/models/mrp_bom_import.py b/mrp_bom_import_line_layer_and_designator/models/mrp_bom_import.py new file mode 100644 index 00000000..79fe5367 --- /dev/null +++ b/mrp_bom_import_line_layer_and_designator/models/mrp_bom_import.py @@ -0,0 +1,17 @@ +from odoo import models + +from odoo.addons.mrp_bom_import.models.mrp_bom_import import convert2str + + +class MrpBomImport(models.Model): + _inherit = "mrp.bom.import" + + def _get_line_values(self, row_values): + res = super()._get_line_values(row_values) + res.update( + { + "layer": convert2str(row_values.get("Layer", "")), + "designator": convert2str(row_values.get("Designator", "")), + } + ) + return res diff --git a/mrp_bom_import_line_layer_and_designator/models/mrp_bom_line_import.py b/mrp_bom_import_line_layer_and_designator/models/mrp_bom_line_import.py index fe1d041a..8a232348 100644 --- a/mrp_bom_import_line_layer_and_designator/models/mrp_bom_line_import.py +++ b/mrp_bom_import_line_layer_and_designator/models/mrp_bom_line_import.py @@ -4,11 +4,16 @@ class MrpBomLineImport(models.Model): _inherit = "mrp.bom.line.import" - layer = fields.Char( - comodel_name="mrp.bom.line", - related="bom_line_id.layer", - ) - designator = fields.Char( - comodel_name="mrp.bom.line", - related="bom_line_id.designator", - ) + layer = fields.Char() + designator = fields.Char() + + def generate_bom_line_values(self): + self.ensure_one() + bom_line = super().generate_bom_line_values() + bom_line.update( + { + "layer": self.layer, + "designator": self.designator, + } + ) + return bom_line diff --git a/mrp_bom_import_line_layer_and_designator/views/mrp_bom_import_view.xml b/mrp_bom_import_line_layer_and_designator/views/mrp_bom_import_view.xml index 1ec88735..c25ddb58 100644 --- a/mrp_bom_import_line_layer_and_designator/views/mrp_bom_import_view.xml +++ b/mrp_bom_import_line_layer_and_designator/views/mrp_bom_import_view.xml @@ -1,16 +1,16 @@ - - mrp.bom.line.import.form.inherit - mrp.bom.line.import - + + mrp.bom.import + - - - + +
  • + Layer: this will fill Layer +
  • +
  • + Designator: this will fill Designator +
  • diff --git a/mrp_bom_import_line_layer_and_designator/views/mrp_bom_line_import_view.xml b/mrp_bom_import_line_layer_and_designator/views/mrp_bom_line_import_view.xml new file mode 100644 index 00000000..1ec88735 --- /dev/null +++ b/mrp_bom_import_line_layer_and_designator/views/mrp_bom_line_import_view.xml @@ -0,0 +1,17 @@ + + + + mrp.bom.line.import.form.inherit + mrp.bom.line.import + + + + + + + + +