15.0

.tx/config

@@ -1,204 +1,138 @@
 [main]
 host = https://www.transifex.com
-type = PO
 
-[odoo-12-theme.theme_anelusia]
+[o:odoo:p:odoo-15-theme:r:theme_anelusia]
 file_filter = theme_anelusia/i18n/<lang>.po
 source_file = theme_anelusia/i18n/theme_anelusia.pot
 source_lang = en
 
-[odoo-12-theme.theme_anelusia_sale]
-file_filter = theme_anelusia_sale/i18n/<lang>.po
-source_file = theme_anelusia_sale/i18n/theme_anelusia_sale.pot
-source_lang = en
-
-[odoo-12-theme.theme_artists]
+[o:odoo:p:odoo-15-theme:r:theme_artists]
 file_filter = theme_artists/i18n/<lang>.po
 source_file = theme_artists/i18n/theme_artists.pot
 source_lang = en
 
-[odoo-12-theme.theme_artists_sale]
-file_filter = theme_artists_sale/i18n/<lang>.po
-source_file = theme_artists_sale/i18n/theme_artists_sale.pot
-source_lang = en
-
-[odoo-12-theme.theme_avantgarde]
+[o:odoo:p:odoo-15-theme:r:theme_avantgarde]
 file_filter = theme_avantgarde/i18n/<lang>.po
 source_file = theme_avantgarde/i18n/theme_avantgarde.pot
 source_lang = en
 
-[odoo-12-theme.theme_beauty]
-file_filter = theme_beauty/i18n/<lang>.po
-source_file = theme_beauty/i18n/theme_beauty.pot
+[o:odoo:p:odoo-15-theme:r:theme_aviato]
+file_filter = theme_aviato/i18n/<lang>.po
+source_file = theme_aviato/i18n/theme_aviato.pot
 source_lang = en
 
-[odoo-12-theme.theme_beauty_sale]
-file_filter = theme_beauty_sale/i18n/<lang>.po
-source_file = theme_beauty_sale/i18n/theme_beauty_sale.pot
+[o:odoo:p:odoo-15-theme:r:theme_beauty]
+file_filter = theme_beauty/i18n/<lang>.po
+source_file = theme_beauty/i18n/theme_beauty.pot
 source_lang = en
 
-[odoo-12-theme.theme_bewise]
+[o:odoo:p:odoo-15-theme:r:theme_bewise]
 file_filter = theme_bewise/i18n/<lang>.po
 source_file = theme_bewise/i18n/theme_bewise.pot
 source_lang = en
 
-[odoo-12-theme.theme_bistro]
+[o:odoo:p:odoo-15-theme:r:theme_bistro]
 file_filter = theme_bistro/i18n/<lang>.po
 source_file = theme_bistro/i18n/theme_bistro.pot
 source_lang = en
 
-[odoo-12-theme.theme_bookstore]
+[o:odoo:p:odoo-15-theme:r:theme_bookstore]
 file_filter = theme_bookstore/i18n/<lang>.po
 source_file = theme_bookstore/i18n/theme_bookstore.pot
 source_lang = en
 
-[odoo-12-theme.theme_bookstore_sale]
-file_filter = theme_bookstore_sale/i18n/<lang>.po
-source_file = theme_bookstore_sale/i18n/theme_bookstore_sale.pot
+[o:odoo:p:odoo-15-theme:r:theme_buzzy]
+file_filter = theme_buzzy/i18n/<lang>.po
+source_file = theme_buzzy/i18n/theme_buzzy.pot
 source_lang = en
 
-[odoo-12-theme.theme_clean]
+[o:odoo:p:odoo-15-theme:r:theme_clean]
 file_filter = theme_clean/i18n/<lang>.po
 source_file = theme_clean/i18n/theme_clean.pot
 source_lang = en
 
-[odoo-12-theme.theme_common]
-file_filter = theme_common/i18n/<lang>.po
-source_file = theme_common/i18n/theme_common.pot
+[o:odoo:p:odoo-15-theme:r:theme_cobalt]
+file_filter = theme_cobalt/i18n/<lang>.po
+source_file = theme_cobalt/i18n/theme_cobalt.pot
 source_lang = en
 
-[odoo-12-theme.theme_enark]
+[o:odoo:p:odoo-15-theme:r:theme_enark]
 file_filter = theme_enark/i18n/<lang>.po
 source_file = theme_enark/i18n/theme_enark.pot
 source_lang = en
 
-[odoo-12-theme.theme_graphene]
+[o:odoo:p:odoo-15-theme:r:theme_graphene]
 file_filter = theme_graphene/i18n/<lang>.po
 source_file = theme_graphene/i18n/theme_graphene.pot
 source_lang = en
 
-[odoo-12-theme.theme_graphene_blog]
-file_filter = theme_graphene_blog/i18n/<lang>.po
-source_file = theme_graphene_blog/i18n/theme_graphene_blog.pot
-source_lang = en
-
-[odoo-12-theme.theme_kea]
+[o:odoo:p:odoo-15-theme:r:theme_kea]
 file_filter = theme_kea/i18n/<lang>.po
 source_file = theme_kea/i18n/theme_kea.pot
 source_lang = en
 
-[odoo-12-theme.theme_kea_sale]
-file_filter = theme_kea_sale/i18n/<lang>.po
-source_file = theme_kea_sale/i18n/theme_kea_sale.pot
-source_lang = en
-
-[odoo-12-theme.theme_kiddo]
+[o:odoo:p:odoo-15-theme:r:theme_kiddo]
 file_filter = theme_kiddo/i18n/<lang>.po
 source_file = theme_kiddo/i18n/theme_kiddo.pot
 source_lang = en
 
-[odoo-12-theme.theme_kiddo_sale]
-file_filter = theme_kiddo_sale/i18n/<lang>.po
-source_file = theme_kiddo_sale/i18n/theme_kiddo_sale.pot
-source_lang = en
-
-[odoo-12-theme.theme_loftspace]
+[o:odoo:p:odoo-15-theme:r:theme_loftspace]
 file_filter = theme_loftspace/i18n/<lang>.po
 source_file = theme_loftspace/i18n/theme_loftspace.pot
 source_lang = en
 
-[odoo-12-theme.theme_loftspace_sale]
-file_filter = theme_loftspace_sale/i18n/<lang>.po
-source_file = theme_loftspace_sale/i18n/theme_loftspace_sale.pot
-source_lang = en
-
-[odoo-12-theme.theme_monglia]
+[o:odoo:p:odoo-15-theme:r:theme_monglia]
 file_filter = theme_monglia/i18n/<lang>.po
 source_file = theme_monglia/i18n/theme_monglia.pot
 source_lang = en
 
-[odoo-12-theme.theme_monglia_sale]
-file_filter = theme_monglia_sale/i18n/<lang>.po
-source_file = theme_monglia_sale/i18n/theme_monglia_sale.pot
-source_lang = en
-
-[odoo-12-theme.theme_nano]
+[o:odoo:p:odoo-15-theme:r:theme_nano]
 file_filter = theme_nano/i18n/<lang>.po
 source_file = theme_nano/i18n/theme_nano.pot
 source_lang = en
 
-[odoo-12-theme.theme_notes]
+[o:odoo:p:odoo-15-theme:r:theme_notes]
 file_filter = theme_notes/i18n/<lang>.po
 source_file = theme_notes/i18n/theme_notes.pot
 source_lang = en
 
-[odoo-12-theme.theme_notes_sale]
-file_filter = theme_notes_sale/i18n/<lang>.po
-source_file = theme_notes_sale/i18n/theme_notes_sale.pot
-source_lang = en
-
-[odoo-12-theme.theme_odoo_experts]
+[o:odoo:p:odoo-15-theme:r:theme_odoo_experts]
 file_filter = theme_odoo_experts/i18n/<lang>.po
 source_file = theme_odoo_experts/i18n/theme_odoo_experts.pot
 source_lang = en
 
-[odoo-12-theme.theme_odoo_experts_sale]
-file_filter = theme_odoo_experts_sale/i18n/<lang>.po
-source_file = theme_odoo_experts_sale/i18n/theme_odoo_experts_sale.pot
-source_lang = en
-
-[odoo-12-theme.theme_orchid]
+[o:odoo:p:odoo-15-theme:r:theme_orchid]
 file_filter = theme_orchid/i18n/<lang>.po
 source_file = theme_orchid/i18n/theme_orchid.pot
 source_lang = en
 
-[odoo-12-theme.theme_orchid_sale]
-file_filter = theme_orchid_sale/i18n/<lang>.po
-source_file = theme_orchid_sale/i18n/theme_orchid_sale.pot
+[o:odoo:p:odoo-15-theme:r:theme_paptic]
+file_filter = theme_paptic/i18n/<lang>.po
+source_file = theme_paptic/i18n/theme_paptic.pot
 source_lang = en
 
-[odoo-12-theme.theme_real_estate]
+[o:odoo:p:odoo-15-theme:r:theme_real_estate]
 file_filter = theme_real_estate/i18n/<lang>.po
 source_file = theme_real_estate/i18n/theme_real_estate.pot
 source_lang = en
 
-[odoo-12-theme.theme_real_estate_sale]
-file_filter = theme_real_estate_sale/i18n/<lang>.po
-source_file = theme_real_estate_sale/i18n/theme_real_estate_sale.pot
-source_lang = en
-
-[odoo-12-theme.theme_treehouse]
+[o:odoo:p:odoo-15-theme:r:theme_treehouse]
 file_filter = theme_treehouse/i18n/<lang>.po
 source_file = theme_treehouse/i18n/theme_treehouse.pot
 source_lang = en
 
-[odoo-12-theme.theme_vehicle]
+[o:odoo:p:odoo-15-theme:r:theme_vehicle]
 file_filter = theme_vehicle/i18n/<lang>.po
 source_file = theme_vehicle/i18n/theme_vehicle.pot
 source_lang = en
 
-[odoo-12-theme.theme_vehicle_sale]
-file_filter = theme_vehicle_sale/i18n/<lang>.po
-source_file = theme_vehicle_sale/i18n/theme_vehicle_sale.pot
-source_lang = en
-
-[odoo-12-theme.theme_yes]
+[o:odoo:p:odoo-15-theme:r:theme_yes]
 file_filter = theme_yes/i18n/<lang>.po
 source_file = theme_yes/i18n/theme_yes.pot
 source_lang = en
 
-[odoo-12-theme.theme_yes_sale]
-file_filter = theme_yes_sale/i18n/<lang>.po
-source_file = theme_yes_sale/i18n/theme_yes_sale.pot
-source_lang = en
-
-[odoo-12-theme.theme_zap]
+[o:odoo:p:odoo-15-theme:r:theme_zap]
 file_filter = theme_zap/i18n/<lang>.po
 source_file = theme_zap/i18n/theme_zap.pot
 source_lang = en
 
-[odoo-12-theme.website_animate]
-file_filter = website_animate/i18n/<lang>.po
-source_file = website_animate/i18n/website_animate.pot
-source_lang = en
-

test_themes/__init__.py

@@ -29,5 +29,5 @@ def post_init_hook(cr, registry):
             'record': website,
             'noupdate': True,  # Avoid unlink on -u
         })
-        theme._theme_get_stream_themes()._theme_load(website)
+        theme.with_context(apply_new_theme=True)._theme_get_stream_themes()._theme_load(website)
     env['ir.model.data']._update_xmlids(xmlids)

test_themes/__manifest__.py

@@ -16,10 +16,12 @@
         'theme_anelusia',
         'theme_artists',
         'theme_avantgarde',
+        'theme_aviato',
         'theme_beauty',
         'theme_bewise',
         'theme_bistro',
         'theme_bookstore',
+        'theme_buzzy',
         'theme_clean',
         'theme_cobalt',
         'theme_enark',

test_themes/tests/__init__.py

@@ -2,3 +2,4 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from . import test_crawl
+from . import test_theme_upgrade

test_themes/tests/test_crawl.py

@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-import unittest
-
 from odoo.tests import HttpCase, tagged
 
 
@@ -40,9 +38,16 @@ def test_crawling():
         self.authenticate('admin', 'admin')
         test_crawling()
 
-    # Does not work without editor fix but really useful to build the pages automatically with cr.commit()
-    @unittest.skip
+    # Note: this test is also really useful to build the default pages
+    # automatically by adding cr.commit() at the end of the tour
     def test_02_homepage_tour_every_theme(self):
+        # TODO All the theme tours that are runned during this test should be
+        # improved so that each step properly checks that the previous step
+        # actually had an effect (as those tours are normally made to display to
+        # the user and were not designed for testing). However, this is already
+        # really useful as only checking if *entering* edit mode in each theme
+        # does not crash is already covering most issues that can be created
+        # when designing a theme at the moment.
         Website = self.env['website']
         websites_themes = Website.get_test_themes_websites()
         for website in websites_themes:

test_themes/tests/test_theme_upgrade.py

@@ -0,0 +1,60 @@
+# -*- coding: utf-8 -*-
+
+from odoo.addons.website.tools import MockRequest
+from odoo.tests import standalone
+
+
+@standalone('theme_upgrade', 'website_standalone')
+def test_01_theme_upgrade_post_copy(env):
+    """ This test ensures the theme `_post_copy()` method is only called when a
+    theme is installed for the first time on a website and not when the theme is
+    updated on that website.
+    """
+    # 1. Setup
+    website = env['website'].search([], limit=1)
+    Website = env['website'].with_context(website_id=website.id)
+
+    # Get rid of as many website as we can, any website will drastically slows
+    # down the test as when updating Theme Nano, it will update Theme Common
+    # which is applied on every site having a theme. It will then update all
+    # those websites.
+    Website.get_test_themes_websites().unlink()
+    for w in Website.search([('theme_id', '!=', False), ('id', '!=', website.id)]):
+        try:
+            w.unlink()
+        except Exception:
+            pass
+
+    ofs_specific_view = Website.viewref('website.option_footer_scrolltop')
+    fls_specific_view = Website.viewref('portal.footer_language_selector')
+    theme_nano_module = env.ref('base.module_theme_nano')
+
+    def _simulate_user_manual_change():
+        # Change some website options that will be changed by Theme Nano
+        ofs_specific_view.active = False
+        fls_specific_view.active = True
+
+    # 2. Simulate some website option change made by the user
+    _simulate_user_manual_change()
+
+    # 3. Simulate user choosing a new theme for his website
+    with MockRequest(env, website=website):
+        theme_nano_module.with_context(website_id=website.id).button_choose_theme()
+
+    assert Website.viewref('website.option_footer_scrolltop').active is True, \
+        "Theme Nano custo should be applied"
+    assert Website.viewref('portal.footer_language_selector').active is False, \
+        "Theme Nano custo should be applied (2)"
+
+    # 4. Simulate some website option change made by the user, again
+    _simulate_user_manual_change()
+
+    # 5. Upgrade Theme Nano
+    theme_nano_module.button_immediate_upgrade()
+    env.reset()  # clear the set of environments
+    env = env()  # get an environment that refers to the new registry
+
+    assert Website.viewref('website.option_footer_scrolltop').active is False, \
+        "Theme Nano custo should NOT be applied"
+    assert Website.viewref('portal.footer_language_selector').active is True, \
+        "Theme Nano custo should NOT be applied (2)"