From d85f37266d71604eaeb50b24d308ca3ccb6e7ee1 Mon Sep 17 00:00:00 2001
From: Unai Beristain <unaiberis@gmail.com>
Date: Fri, 13 Sep 2024 11:23:26 +0200
Subject: [PATCH] [ADD] mrp_bom_import_line_layer_and_designator

---
 .../__manifest__.py                           |  1 +
 .../i18n/en_US.po                             | 31 +++++++++++++++++++
 .../i18n/es.po                                | 21 +++++++++++--
 .../models/__init__.py                        |  2 +-
 .../models/mrp_bom_import.py                  | 17 ++++++++++
 .../models/mrp_bom_line_import.py             | 10 ++----
 .../views/mrp_bom_import_view.xml             | 20 ++++++------
 .../views/mrp_bom_line_import_view.xml        | 17 ++++++++++
 8 files changed, 97 insertions(+), 22 deletions(-)
 create mode 100644 mrp_bom_import_line_layer_and_designator/i18n/en_US.po
 create mode 100644 mrp_bom_import_line_layer_and_designator/models/mrp_bom_import.py
 create mode 100644 mrp_bom_import_line_layer_and_designator/views/mrp_bom_line_import_view.xml

diff --git a/mrp_bom_import_line_layer_and_designator/__manifest__.py b/mrp_bom_import_line_layer_and_designator/__manifest__.py
index 99f025705..13ae84705 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 000000000..403825e74
--- /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 c5ce663da..ba2824e18 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 "<code>Designator</code>: this will fill <b>Designator</b>"
+msgstr "<code>Designator</code>: esto rellenará el <b>Designador</b>"
+
+#. 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 "<code>Layer</code>: this will fill <b>Layer</b>"
+msgstr "<code>Layer</code>: esto rellenará la <b>Capa</b>"
+
 #. 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 6eb7f630c..f3c5955de 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 @@
-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 000000000..79fe53678
--- /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 fe1d041a1..1e1d7b47f 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,5 @@
 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()
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 1ec887353..c25ddb583 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 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-    <record id="mrp_bom_line_component_import_view_tree" model="ir.ui.view">
-        <field name="name">mrp.bom.line.import.form.inherit</field>
-        <field name="model">mrp.bom.line.import</field>
-        <field
-      name="inherit_id"
-      ref="mrp_bom_import.mrp_bom_line_component_import_view_tree"
-    />
+    <record id="mrp_bom_import_view_form" model="ir.ui.view">
+        <field name="model">mrp.bom.import</field>
+        <field name="inherit_id" ref="mrp_bom_import.mrp_bom_import_view_form" />
         <field name="arch" type="xml">
-            <xpath expr="//tree" position="inside">
-                <field name="layer" optional="show" />
-                <field name="designator" optional="show" />
+            <xpath expr="//notebook/page[3]/div/ul" position="inside">
+                <li>
+                    <code>Layer</code>: this will fill <b>Layer</b>
+                </li>
+                <li>
+                    <code>Designator</code>: this will fill <b>Designator</b>
+                </li>
             </xpath>
         </field>
     </record>
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 000000000..1ec887353
--- /dev/null
+++ b/mrp_bom_import_line_layer_and_designator/views/mrp_bom_line_import_view.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="mrp_bom_line_component_import_view_tree" model="ir.ui.view">
+        <field name="name">mrp.bom.line.import.form.inherit</field>
+        <field name="model">mrp.bom.line.import</field>
+        <field
+      name="inherit_id"
+      ref="mrp_bom_import.mrp_bom_line_component_import_view_tree"
+    />
+        <field name="arch" type="xml">
+            <xpath expr="//tree" position="inside">
+                <field name="layer" optional="show" />
+                <field name="designator" optional="show" />
+            </xpath>
+        </field>
+    </record>
+</odoo>