From 81718f0e2939cf5b4432d0d590298163417c1a98 Mon Sep 17 00:00:00 2001 From: Carmen Bianca BAKKER Date: Fri, 23 Dec 2022 10:59:11 +0100 Subject: [PATCH 1/4] [REF] beesdoo_product_info_screen -> product_info_screen Signed-off-by: Carmen Bianca BAKKER --- .../README.rst | 0 .../__init__.py | 0 .../__manifest__.py | 0 .../i18n/beesdoo_product_info_screen.pot | 0 .../readme/CONTRIBUTORS.rst | 0 .../readme/DESCRIPTION.rst | 0 .../readme/USAGE.rst | 0 .../security/groups.xml | 0 .../security/ir.model.access.csv | 0 .../security/ir_rules.xml | 0 .../static/description/icon.png | Bin .../static/description/index.html | 0 .../views/menus.xml | 0 .../views/product.xml | 0 .../odoo/addons/beesdoo_product_info_screen | 1 - .../odoo/addons/product_info_screen | 1 + .../setup.py | 0 17 files changed, 1 insertion(+), 1 deletion(-) rename {beesdoo_product_info_screen => product_info_screen}/README.rst (100%) rename {beesdoo_product_info_screen => product_info_screen}/__init__.py (100%) rename {beesdoo_product_info_screen => product_info_screen}/__manifest__.py (100%) rename {beesdoo_product_info_screen => product_info_screen}/i18n/beesdoo_product_info_screen.pot (100%) rename {beesdoo_product_info_screen => product_info_screen}/readme/CONTRIBUTORS.rst (100%) rename {beesdoo_product_info_screen => product_info_screen}/readme/DESCRIPTION.rst (100%) rename {beesdoo_product_info_screen => product_info_screen}/readme/USAGE.rst (100%) rename {beesdoo_product_info_screen => product_info_screen}/security/groups.xml (100%) rename {beesdoo_product_info_screen => product_info_screen}/security/ir.model.access.csv (100%) rename {beesdoo_product_info_screen => product_info_screen}/security/ir_rules.xml (100%) rename {beesdoo_product_info_screen => product_info_screen}/static/description/icon.png (100%) rename {beesdoo_product_info_screen => product_info_screen}/static/description/index.html (100%) rename {beesdoo_product_info_screen => product_info_screen}/views/menus.xml (100%) rename {beesdoo_product_info_screen => product_info_screen}/views/product.xml (100%) delete mode 120000 setup/beesdoo_product_info_screen/odoo/addons/beesdoo_product_info_screen create mode 120000 setup/product_info_screen/odoo/addons/product_info_screen rename setup/{beesdoo_product_info_screen => product_info_screen}/setup.py (100%) diff --git a/beesdoo_product_info_screen/README.rst b/product_info_screen/README.rst similarity index 100% rename from beesdoo_product_info_screen/README.rst rename to product_info_screen/README.rst diff --git a/beesdoo_product_info_screen/__init__.py b/product_info_screen/__init__.py similarity index 100% rename from beesdoo_product_info_screen/__init__.py rename to product_info_screen/__init__.py diff --git a/beesdoo_product_info_screen/__manifest__.py b/product_info_screen/__manifest__.py similarity index 100% rename from beesdoo_product_info_screen/__manifest__.py rename to product_info_screen/__manifest__.py diff --git a/beesdoo_product_info_screen/i18n/beesdoo_product_info_screen.pot b/product_info_screen/i18n/beesdoo_product_info_screen.pot similarity index 100% rename from beesdoo_product_info_screen/i18n/beesdoo_product_info_screen.pot rename to product_info_screen/i18n/beesdoo_product_info_screen.pot diff --git a/beesdoo_product_info_screen/readme/CONTRIBUTORS.rst b/product_info_screen/readme/CONTRIBUTORS.rst similarity index 100% rename from beesdoo_product_info_screen/readme/CONTRIBUTORS.rst rename to product_info_screen/readme/CONTRIBUTORS.rst diff --git a/beesdoo_product_info_screen/readme/DESCRIPTION.rst b/product_info_screen/readme/DESCRIPTION.rst similarity index 100% rename from beesdoo_product_info_screen/readme/DESCRIPTION.rst rename to product_info_screen/readme/DESCRIPTION.rst diff --git a/beesdoo_product_info_screen/readme/USAGE.rst b/product_info_screen/readme/USAGE.rst similarity index 100% rename from beesdoo_product_info_screen/readme/USAGE.rst rename to product_info_screen/readme/USAGE.rst diff --git a/beesdoo_product_info_screen/security/groups.xml b/product_info_screen/security/groups.xml similarity index 100% rename from beesdoo_product_info_screen/security/groups.xml rename to product_info_screen/security/groups.xml diff --git a/beesdoo_product_info_screen/security/ir.model.access.csv b/product_info_screen/security/ir.model.access.csv similarity index 100% rename from beesdoo_product_info_screen/security/ir.model.access.csv rename to product_info_screen/security/ir.model.access.csv diff --git a/beesdoo_product_info_screen/security/ir_rules.xml b/product_info_screen/security/ir_rules.xml similarity index 100% rename from beesdoo_product_info_screen/security/ir_rules.xml rename to product_info_screen/security/ir_rules.xml diff --git a/beesdoo_product_info_screen/static/description/icon.png b/product_info_screen/static/description/icon.png similarity index 100% rename from beesdoo_product_info_screen/static/description/icon.png rename to product_info_screen/static/description/icon.png diff --git a/beesdoo_product_info_screen/static/description/index.html b/product_info_screen/static/description/index.html similarity index 100% rename from beesdoo_product_info_screen/static/description/index.html rename to product_info_screen/static/description/index.html diff --git a/beesdoo_product_info_screen/views/menus.xml b/product_info_screen/views/menus.xml similarity index 100% rename from beesdoo_product_info_screen/views/menus.xml rename to product_info_screen/views/menus.xml diff --git a/beesdoo_product_info_screen/views/product.xml b/product_info_screen/views/product.xml similarity index 100% rename from beesdoo_product_info_screen/views/product.xml rename to product_info_screen/views/product.xml diff --git a/setup/beesdoo_product_info_screen/odoo/addons/beesdoo_product_info_screen b/setup/beesdoo_product_info_screen/odoo/addons/beesdoo_product_info_screen deleted file mode 120000 index d1ecb4e13..000000000 --- a/setup/beesdoo_product_info_screen/odoo/addons/beesdoo_product_info_screen +++ /dev/null @@ -1 +0,0 @@ -../../../../beesdoo_product_info_screen \ No newline at end of file diff --git a/setup/product_info_screen/odoo/addons/product_info_screen b/setup/product_info_screen/odoo/addons/product_info_screen new file mode 120000 index 000000000..1880e82b1 --- /dev/null +++ b/setup/product_info_screen/odoo/addons/product_info_screen @@ -0,0 +1 @@ +../../../../product_info_screen \ No newline at end of file diff --git a/setup/beesdoo_product_info_screen/setup.py b/setup/product_info_screen/setup.py similarity index 100% rename from setup/beesdoo_product_info_screen/setup.py rename to setup/product_info_screen/setup.py From ff006a131bdce39a323fbc5156d1d8e6334f7b5c Mon Sep 17 00:00:00 2001 From: Carmen Bianca BAKKER Date: Fri, 23 Dec 2022 11:02:25 +0100 Subject: [PATCH 2/4] [ADD] beesdoo_product_info_screen: Emptied module Signed-off-by: Carmen Bianca BAKKER --- beesdoo_product_info_screen/__init__.py | 3 +++ beesdoo_product_info_screen/__manifest__.py | 23 +++++++++++++++++++ .../readme/CONTRIBUTORS.rst | 3 +++ .../readme/DESCRIPTION.rst | 1 + .../odoo/addons/beesdoo_product_info_screen | 1 + setup/beesdoo_product_info_screen/setup.py | 6 +++++ 6 files changed, 37 insertions(+) create mode 100644 beesdoo_product_info_screen/__init__.py create mode 100644 beesdoo_product_info_screen/__manifest__.py create mode 100644 beesdoo_product_info_screen/readme/CONTRIBUTORS.rst create mode 100644 beesdoo_product_info_screen/readme/DESCRIPTION.rst create mode 120000 setup/beesdoo_product_info_screen/odoo/addons/beesdoo_product_info_screen create mode 100644 setup/beesdoo_product_info_screen/setup.py diff --git a/beesdoo_product_info_screen/__init__.py b/beesdoo_product_info_screen/__init__.py new file mode 100644 index 000000000..087065725 --- /dev/null +++ b/beesdoo_product_info_screen/__init__.py @@ -0,0 +1,3 @@ +# SPDX-FileCopyrightText: 2022 Coop IT Easy SC +# +# SPDX-License-Identifier: AGPL-3.0-or-later diff --git a/beesdoo_product_info_screen/__manifest__.py b/beesdoo_product_info_screen/__manifest__.py new file mode 100644 index 000000000..e9a96479a --- /dev/null +++ b/beesdoo_product_info_screen/__manifest__.py @@ -0,0 +1,23 @@ +# SPDX-FileCopyrightText: 2022 Coop IT Easy SC +# +# SPDX-License-Identifier: AGPL-3.0-or-later + +{ + "name": "Product Information Screen", + "summary": """ + Emptied.""", + "version": "12.0.0.0.1", + "category": "Product", + "website": "https://github.com/beescoop/Obeesdoo", + "author": "Coop IT Easy SC", + "maintainers": ["carmenbianca"], + "license": "AGPL-3", + "application": False, + "depends": [ + "product_info_screen", + ], + "excludes": [], + "data": [], + "demo": [], + "qweb": [], +} diff --git a/beesdoo_product_info_screen/readme/CONTRIBUTORS.rst b/beesdoo_product_info_screen/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000..f1ac67577 --- /dev/null +++ b/beesdoo_product_info_screen/readme/CONTRIBUTORS.rst @@ -0,0 +1,3 @@ +* `Coop IT Easy SC `_: + + * Carmen Bianca BAKKER diff --git a/beesdoo_product_info_screen/readme/DESCRIPTION.rst b/beesdoo_product_info_screen/readme/DESCRIPTION.rst new file mode 100644 index 000000000..916155003 --- /dev/null +++ b/beesdoo_product_info_screen/readme/DESCRIPTION.rst @@ -0,0 +1 @@ +Emptied. diff --git a/setup/beesdoo_product_info_screen/odoo/addons/beesdoo_product_info_screen b/setup/beesdoo_product_info_screen/odoo/addons/beesdoo_product_info_screen new file mode 120000 index 000000000..d1ecb4e13 --- /dev/null +++ b/setup/beesdoo_product_info_screen/odoo/addons/beesdoo_product_info_screen @@ -0,0 +1 @@ +../../../../beesdoo_product_info_screen \ No newline at end of file diff --git a/setup/beesdoo_product_info_screen/setup.py b/setup/beesdoo_product_info_screen/setup.py new file mode 100644 index 000000000..28c57bb64 --- /dev/null +++ b/setup/beesdoo_product_info_screen/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) From 96446e7d9479ebfbe61e935e794897de380884e7 Mon Sep 17 00:00:00 2001 From: Carmen Bianca BAKKER Date: Fri, 23 Dec 2022 11:37:12 +0100 Subject: [PATCH 3/4] [REF] product_info_screen: beesdoo_product_info_screen -> product_info_screen Signed-off-by: Carmen Bianca BAKKER --- product_info_screen/README.rst | 6 ++-- .../i18n/beesdoo_product_info_screen.pot | 30 +++++++++---------- .../static/description/index.html | 6 ++-- product_info_screen/views/menus.xml | 2 +- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/product_info_screen/README.rst b/product_info_screen/README.rst index 2bcbd7ac2..4d7bfbf77 100644 --- a/product_info_screen/README.rst +++ b/product_info_screen/README.rst @@ -17,7 +17,7 @@ Product Information Screen :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-beescoop%2FObeesdoo-lightgray.png?logo=github - :target: https://github.com/beescoop/Obeesdoo/tree/12.0/beesdoo_product_info_screen + :target: https://github.com/beescoop/Obeesdoo/tree/12.0/product_info_screen :alt: beescoop/Obeesdoo |badge1| |badge2| |badge3| @@ -42,7 +42,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us to smash it by providing a detailed and welcomed -`feedback `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -63,6 +63,6 @@ Contributors Maintainers ~~~~~~~~~~~ -This module is part of the `beescoop/Obeesdoo `_ project on GitHub. +This module is part of the `beescoop/Obeesdoo `_ project on GitHub. You are welcome to contribute. diff --git a/product_info_screen/i18n/beesdoo_product_info_screen.pot b/product_info_screen/i18n/beesdoo_product_info_screen.pot index 10ac1ea32..be961b918 100644 --- a/product_info_screen/i18n/beesdoo_product_info_screen.pot +++ b/product_info_screen/i18n/beesdoo_product_info_screen.pot @@ -1,6 +1,6 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * beesdoo_product_info_screen +# * product_info_screen # msgid "" msgstr "" @@ -13,35 +13,35 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" -#. module: beesdoo_product_info_screen -#: model_terms:ir.ui.view,arch_db:beesdoo_product_info_screen.view_product_information_read_only_form_button +#. module: product_info_screen +#: model_terms:ir.ui.view,arch_db:product_info_screen.view_product_information_read_only_form_button msgid "Back to product list" msgstr "" -#. module: beesdoo_product_info_screen -#: model:res.groups,name:beesdoo_product_info_screen.group_product_info_user +#. module: product_info_screen +#: model:res.groups,name:product_info_screen.group_product_info_user msgid "Product Info User" msgstr "" -#. module: beesdoo_product_info_screen -#: model:ir.actions.act_window,name:beesdoo_product_info_screen.action_product_information +#. module: product_info_screen +#: model:ir.actions.act_window,name:product_info_screen.action_product_information msgid "Product Information" msgstr "" -#. module: beesdoo_product_info_screen -#: model_terms:ir.ui.view,arch_db:beesdoo_product_info_screen.view_product_information_read_only_form +#. module: product_info_screen +#: model_terms:ir.ui.view,arch_db:product_info_screen.view_product_information_read_only_form msgid "Product Name" msgstr "" -#. module: beesdoo_product_info_screen -#: model:ir.ui.menu,name:beesdoo_product_info_screen.menu_product_info +#. module: product_info_screen +#: model:ir.ui.menu,name:product_info_screen.menu_product_info msgid "Product info" msgstr "" -#. module: beesdoo_product_info_screen -#: model:ir.ui.menu,name:beesdoo_product_info_screen.menu_main_product -#: model_terms:ir.ui.view,arch_db:beesdoo_product_info_screen.view_product_information_read_only_form -#: model_terms:ir.ui.view,arch_db:beesdoo_product_info_screen.view_product_information_read_only_tree +#. module: product_info_screen +#: model:ir.ui.menu,name:product_info_screen.menu_main_product +#: model_terms:ir.ui.view,arch_db:product_info_screen.view_product_information_read_only_form +#: model_terms:ir.ui.view,arch_db:product_info_screen.view_product_information_read_only_tree msgid "Products" msgstr "" diff --git a/product_info_screen/static/description/index.html b/product_info_screen/static/description/index.html index c1d759e19..4328df741 100644 --- a/product_info_screen/static/description/index.html +++ b/product_info_screen/static/description/index.html @@ -367,7 +367,7 @@

Product Information Screen

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Beta License: AGPL-3 beescoop/obeesdoo

+

Beta License: AGPL-3 beescoop/obeesdoo

Adds a read-only screen to display product information.

Table of contents

@@ -395,7 +395,7 @@

Bug Tracker

Bugs are tracked on GitHub Issues. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us smashing it by providing a detailed and welcomed -feedback.

+feedback.

Do not contact contributors directly about support or help with technical issues.

@@ -415,7 +415,7 @@

Contributors

Maintainers

-

This module is part of the beescoop/obeesdoo project on GitHub.

+

This module is part of the beescoop/obeesdoo project on GitHub.

You are welcome to contribute.

diff --git a/product_info_screen/views/menus.xml b/product_info_screen/views/menus.xml index ec8652bf3..02c05cb3e 100644 --- a/product_info_screen/views/menus.xml +++ b/product_info_screen/views/menus.xml @@ -10,7 +10,7 @@ id="menu_main_product" sequence="40" groups="group_product_info_user" - web_icon="beesdoo_product_info_screen,static/description/icon.png" + web_icon="product_info_screen,static/description/icon.png" /> Date: Fri, 23 Dec 2022 12:27:39 +0100 Subject: [PATCH 4/4] [IMP] product_info_screen: Pre-init hook Signed-off-by: Carmen Bianca BAKKER --- product_info_screen/__init__.py | 1 + product_info_screen/__manifest__.py | 1 + product_info_screen/rename_beesdoo.py | 45 +++++++++++++++++++++++++++ 3 files changed, 47 insertions(+) create mode 100644 product_info_screen/rename_beesdoo.py diff --git a/product_info_screen/__init__.py b/product_info_screen/__init__.py index e69de29bb..5e19cc19a 100644 --- a/product_info_screen/__init__.py +++ b/product_info_screen/__init__.py @@ -0,0 +1 @@ +from .rename_beesdoo import rename_beesdoo diff --git a/product_info_screen/__manifest__.py b/product_info_screen/__manifest__.py index 54ea74eb7..db50b28c8 100644 --- a/product_info_screen/__manifest__.py +++ b/product_info_screen/__manifest__.py @@ -20,4 +20,5 @@ ], "installable": True, "application": False, + "pre_init_hook": "rename_beesdoo", } diff --git a/product_info_screen/rename_beesdoo.py b/product_info_screen/rename_beesdoo.py new file mode 100644 index 000000000..d84335fd1 --- /dev/null +++ b/product_info_screen/rename_beesdoo.py @@ -0,0 +1,45 @@ +# Copyright 2022 Coop IT Easy SC +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +"""This module was previously beesdoo_product_info_screen before it was moved to +the OCA. beesdoo_product_info_screen is presently an empty module that depends +on this module. When this module is installed, it should convert all data from +the beesdoo_product_info_screen module to be useable by this module. +""" + +import logging + +_logger = logging.getLogger(__name__) + +OLD_MODULE_NAME = "beesdoo_product_info_screen" +NEW_MODULE_NAME = "product_info_screen" + + +def model_to_table(name): + return name.replace(".", "_") + + +def rename_beesdoo(cr): + cr.execute( + "SELECT id FROM ir_module_module " + "WHERE name=%s and state IN ('installed', 'to upgrade')", + (OLD_MODULE_NAME,), + ) + if not cr.fetchone(): + return + + from openupgradelib import openupgrade + + _logger.info( + "transferring ir_model_data from {} to {}".format( + OLD_MODULE_NAME, NEW_MODULE_NAME + ) + ) + openupgrade.logged_query( + cr, + """ + UPDATE ir_model_data SET module = %s + WHERE module = %s AND name NOT IN + (SELECT name FROM ir_model_data WHERE module = %s)""", + (NEW_MODULE_NAME, OLD_MODULE_NAME, NEW_MODULE_NAME), + )