From 59874c40bd0bbc1c63421bb53cda635510890ccd Mon Sep 17 00:00:00 2001 From: FrankC013 Date: Mon, 17 Feb 2025 18:34:48 +0100 Subject: [PATCH 1/3] [IMP] lighting: header in catalog form view + code in catalog + uom in dimension type + migration --- lighting/__manifest__.py | 3 +++ lighting/i18n/es.po | 4 +++- lighting/i18n/fr.po | 4 +++- lighting/i18n/pt.po | 7 +++++++ lighting/models/product_catalog.py | 1 + lighting/models/product_dimension_type.py | 4 ++++ lighting/static/description/index.html | 7 ++++--- lighting/views/product_catalog_views.xml | 4 ++++ lighting/views/product_dimension_type_views.xml | 1 + 9 files changed, 30 insertions(+), 5 deletions(-) diff --git a/lighting/__manifest__.py b/lighting/__manifest__.py index 91eea8606..d16c9b6b5 100644 --- a/lighting/__manifest__.py +++ b/lighting/__manifest__.py @@ -60,5 +60,8 @@ "data/lighting_data.xml", "data/lighting_product_ral_data.xml", ], + "external_dependencies": { + "python": ["openupgradelib"], + }, "application": True, } diff --git a/lighting/i18n/es.po b/lighting/i18n/es.po index b51892f74..52538005f 100644 --- a/lighting/i18n/es.po +++ b/lighting/i18n/es.po @@ -762,6 +762,7 @@ msgstr "Cerrar" #: model_terms:ir.ui.view,arch_db:lighting.product_family_search_view #: model_terms:ir.ui.view,arch_db:lighting.product_finish_form_view #: model_terms:ir.ui.view,arch_db:lighting.product_ral_form_view +#: model:ir.model.fields,field_description:lighting.field_lighting_catalog__code msgid "Code" msgstr "Código" @@ -5327,8 +5328,9 @@ msgstr "" #. module: lighting #: model:ir.model.fields,field_description:lighting.field_lighting_product__uom_id +#: model:ir.model.fields,field_description:lighting.field_lighting_dimension_type__uom_id msgid "Unit of Measure" -msgstr "" +msgstr "Unidad de medida" #. module: lighting #: model:ir.model.fields,field_description:lighting.field_lighting_product__uom_name diff --git a/lighting/i18n/fr.po b/lighting/i18n/fr.po index 35de9f41a..c134eacbc 100644 --- a/lighting/i18n/fr.po +++ b/lighting/i18n/fr.po @@ -758,6 +758,7 @@ msgstr "Fermer" #: model_terms:ir.ui.view,arch_db:lighting.product_family_search_view #: model_terms:ir.ui.view,arch_db:lighting.product_finish_form_view #: model_terms:ir.ui.view,arch_db:lighting.product_ral_form_view +#: model:ir.model.fields,field_description:lighting.field_lighting_catalog__code msgid "Code" msgstr "Code" @@ -5326,8 +5327,9 @@ msgstr "" #. module: lighting #: model:ir.model.fields,field_description:lighting.field_lighting_product__uom_id +#: model:ir.model.fields,field_description:lighting.field_lighting_dimension_type__uom_id msgid "Unit of Measure" -msgstr "" +msgstr "Unité de measure" #. module: lighting #: model:ir.model.fields,field_description:lighting.field_lighting_product__uom_name diff --git a/lighting/i18n/pt.po b/lighting/i18n/pt.po index 093d9fce4..921e2a830 100644 --- a/lighting/i18n/pt.po +++ b/lighting/i18n/pt.po @@ -442,6 +442,7 @@ msgstr "Perto" #: model:ir.ui.view,arch_db:lighting.product_finish_form_view #: model:ir.model.fields,field_description:lighting.field_lighting_product_special_spectrum_code #: model:ir.model.fields,field_description:lighting.field_lighting_product_family_code +#: model:ir.model.fields,field_description:lighting.field_lighting_catalog__code msgid "Code" msgstr "Código" @@ -2776,6 +2777,12 @@ msgstr "Tipos" msgid "Categories" msgstr "Categorias" +#. module: lighting +#: model:ir.model.fields,field_description:lighting.field_lighting_dimension_type__uom_id +#: model:ir.model.fields,field_description:lighting.field_lighting_product__uom_id +msgid "Unit of Measure" +msgstr "Unidade de medida" + #. module: lighting #: model:ir.model.fields,field_description:lighting.field_lighting_product_category_id #: model:ir.ui.view,arch_db:lighting.lighting_product_view diff --git a/lighting/models/product_catalog.py b/lighting/models/product_catalog.py index e8d66d1cd..39217b0eb 100644 --- a/lighting/models/product_catalog.py +++ b/lighting/models/product_catalog.py @@ -19,6 +19,7 @@ class LightingCatalog(models.Model): string="Catalog", required=True, ) + code = fields.Char(required=True, tracking=True) description_show_ip = fields.Boolean( string="Description show IP", help="If checked, IP and IP2 will be shown on a generated product description " diff --git a/lighting/models/product_dimension_type.py b/lighting/models/product_dimension_type.py index 3f5d4bbdc..0872c85c1 100644 --- a/lighting/models/product_dimension_type.py +++ b/lighting/models/product_dimension_type.py @@ -20,6 +20,10 @@ class LightingDimensionType(models.Model): uom = fields.Char( help="Unit of measure", ) + uom_id = fields.Many2one( + comodel_name="uom.uom", + string="Unit of Measure", + ) description = fields.Char( string="Internal description", ) diff --git a/lighting/static/description/index.html b/lighting/static/description/index.html index 93f3bb4f2..e8c6a6152 100644 --- a/lighting/static/description/index.html +++ b/lighting/static/description/index.html @@ -8,10 +8,11 @@ /* :Author: David Goodger (goodger@python.org) -:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $ +:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $ :Copyright: This stylesheet has been placed in the public domain. Default cascading style sheet for the HTML output of Docutils. +Despite the name, some widely supported CSS2 features are used. See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to customize this style sheet. @@ -274,7 +275,7 @@ margin-left: 2em ; margin-right: 2em } -pre.code .ln { color: grey; } /* line numbers */ +pre.code .ln { color: gray; } /* line numbers */ pre.code, code { background-color: #eeeeee } pre.code .comment, code .comment { color: #5C6576 } pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold } @@ -300,7 +301,7 @@ span.pre { white-space: pre } -span.problematic { +span.problematic, pre.problematic { color: red } span.section-subtitle { diff --git a/lighting/views/product_catalog_views.xml b/lighting/views/product_catalog_views.xml index ee224079c..913913e46 100644 --- a/lighting/views/product_catalog_views.xml +++ b/lighting/views/product_catalog_views.xml @@ -20,6 +20,7 @@ lighting.catalog
+
+ +
+
+
+ + + + + + + + + + + + + + + +
+ + +
+ + + + + + lighting.export.bmecat.tree + lighting.export.bmecat + + + + + + + + + + + + + + lighting.export.bmecat.search + lighting.export.bmecat + + + + + + + + + BMEcat Catalogs + lighting.export.bmecat + tree,form + {'search_default_filter_state_published': 1} + +

Create the first bmecat

+ + + + + + + diff --git a/lighting_export_bmecat/views/product_catalog_views.xml b/lighting_export_bmecat/views/product_catalog_views.xml new file mode 100644 index 000000000..51627bc85 --- /dev/null +++ b/lighting_export_bmecat/views/product_catalog_views.xml @@ -0,0 +1,20 @@ + + + + + catalog.form + lighting.catalog + + +
+
+ + + diff --git a/lighting_export_bmecat/views/queue_job_views.xml b/lighting_export_bmecat/views/queue_job_views.xml new file mode 100644 index 000000000..e43e329a6 --- /dev/null +++ b/lighting_export_bmecat/views/queue_job_views.xml @@ -0,0 +1,24 @@ + + + + + queue.job + + + + + + + +