diff --git a/lighting_reporting_vanguard_product/README.rst b/lighting_reporting_vanguard_product/README.rst index 3fabc355..612e400e 100644 --- a/lighting_reporting_vanguard_product/README.rst +++ b/lighting_reporting_vanguard_product/README.rst @@ -54,6 +54,7 @@ Contributors * Frank Cespedes * Eric Antones + * Bijaya Kumal Maintainers ~~~~~~~~~~~ diff --git a/lighting_reporting_vanguard_product/models/__init__.py b/lighting_reporting_vanguard_product/models/__init__.py index f1839453..14d3f23e 100644 --- a/lighting_reporting_vanguard_product/models/__init__.py +++ b/lighting_reporting_vanguard_product/models/__init__.py @@ -1,3 +1,2 @@ from . import res_config_settings from . import lighting_product_source_line -from . import lighting_product diff --git a/lighting_reporting_vanguard_product/models/lighting_product.py b/lighting_reporting_vanguard_product/models/lighting_product.py deleted file mode 100644 index ed5192cb..00000000 --- a/lighting_reporting_vanguard_product/models/lighting_product.py +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright NuoBiT Solutions - Frank Cespedes -# 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 diff --git a/lighting_reporting_vanguard_product/readme/CONTRIBUTORS.rst b/lighting_reporting_vanguard_product/readme/CONTRIBUTORS.rst index 8b351e64..5f23b698 100644 --- a/lighting_reporting_vanguard_product/readme/CONTRIBUTORS.rst +++ b/lighting_reporting_vanguard_product/readme/CONTRIBUTORS.rst @@ -2,3 +2,4 @@ * Frank Cespedes * Eric Antones + * Bijaya Kumal diff --git a/lighting_reporting_vanguard_product/static/description/index.html b/lighting_reporting_vanguard_product/static/description/index.html index 73a7714c..a4e0b0df 100644 --- a/lighting_reporting_vanguard_product/static/description/index.html +++ b/lighting_reporting_vanguard_product/static/description/index.html @@ -405,6 +405,7 @@

Contributors

  • NuoBiT:
  • diff --git a/lighting_reporting_vanguard_product/views/report_vanguard.xml b/lighting_reporting_vanguard_product/views/report_vanguard.xml index fe683629..60d6b246 100644 --- a/lighting_reporting_vanguard_product/views/report_vanguard.xml +++ b/lighting_reporting_vanguard_product/views/report_vanguard.xml @@ -1,5 +1,6 @@