[16.0][IMP] lighting_reporting_vanguard_product: show RAL after the Finish

lighting_reporting_vanguard_product/models/__init__.py

@@ -1,2 +1,3 @@
 from . import res_config_settings
 from . import lighting_product_source_line
+from . import lighting_product

lighting_reporting_vanguard_product/models/lighting_product.py

@@ -0,0 +1,30 @@
+# Copyright NuoBiT Solutions - Frank Cespedes <[email protected]>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
+
+from odoo import models
+
+
+class LightingProduct(models.Model):
+    _inherit = "lighting.product"
+
+    def get_finish_display(self):
+        self.ensure_one()
+        res, res_l = None, []
+
+        # add finish description
+        finish_l = []
+        if self.finish_id:
+            finish_l.append(self.finish_id.display_name)
+        if self.finish2_id:
+            finish_l.append(self.finish2_id.display_name)
+        if finish_l:
+            res_l.append("/".join(finish_l))
+
+        # add RAL description
+        if self.ral_id:
+            res_l.append("(%s)" % self.ral_id.display_name)
+
+        if res_l:
+            res = " ".join(res_l)
+
+        return res

lighting_reporting_vanguard_product/views/report_vanguard.xml

@@ -172,9 +172,7 @@
                                         Finish
                                     </td>
                                     <td>
-                                        <span
-                                            t-out="' / '.join(filter(None, [doc.finish_id.display_name, doc.finish2_id.display_name]))"
-                                        />
+                                        <span t-out="doc.get_finish_display()" />
                                     </td>
                                 </tr>
                                 <tr t-if="doc.location_ids">