Merge branch 'master' into hostingwebsite

master/bt5/vifib_payzen/SkinTemplateItem/portal_skins/vifib_payzen.xml

@@ -6,12 +6,33 @@
     </pickle>
     <pickle>
       <dictionary>
+        <item>
+            <key> <string>_local_properties</string> </key>
+            <value>
+              <tuple>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>business_template_skin_layer_priority</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>float</string> </value>
+                  </item>
+                </dictionary>
+              </tuple>
+            </value>
+        </item>
         <item>
             <key> <string>_objects</string> </key>
             <value>
               <tuple/>
             </value>
         </item>
+        <item>
+            <key> <string>business_template_skin_layer_priority</string> </key>
+            <value> <float>60.0</float> </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>vifib_payzen</string> </value>

master/bt5/vifib_payzen/bt/revision

-42
+43
\ No newline at end of file

master/product/Vifib/tests/testVifibSkinSelection.py

@@ -110,6 +110,7 @@ vifib_invoicing
 vifib_jauks_theme
 vifib_jauks_widget_library
 vifib_open_trade
+vifib_payzen
 vifib_slap
 vifib_software_pdm
 vifib_test
@@ -198,6 +199,7 @@ vifib_invoicing
 vifib_jauks_theme
 vifib_jauks_widget_library
 vifib_open_trade
+vifib_payzen
 vifib_slap
 vifib_software_pdm
 vifib_test
@@ -288,6 +290,7 @@ vifib_invoicing
 vifib_jauks_theme
 vifib_jauks_widget_library
 vifib_open_trade
+vifib_payzen
 vifib_slap
 vifib_software_pdm
 vifib_test
@@ -373,6 +376,7 @@ vifib_crm
 vifib_forge_release
 vifib_invoicing
 vifib_open_trade
+vifib_payzen
 vifib_slap
 vifib_software_pdm
 vifib_test
@@ -455,6 +459,7 @@ vifib_crm
 vifib_forge_release
 vifib_invoicing
 vifib_open_trade
+vifib_payzen
 vifib_slap
 vifib_software_pdm
 vifib_test
@@ -537,6 +542,7 @@ vifib_crm
 vifib_forge_release
 vifib_invoicing
 vifib_open_trade
+vifib_payzen
 vifib_slap
 vifib_software_pdm
 vifib_test
@@ -623,6 +629,7 @@ vifib_crm
 vifib_forge_release
 vifib_invoicing
 vifib_open_trade
+vifib_payzen
 vifib_slap
 vifib_software_pdm
 vifib_test
@@ -709,6 +716,7 @@ vifib_crm
 vifib_forge_release
 vifib_invoicing
 vifib_open_trade
+vifib_payzen
 vifib_slap
 vifib_software_pdm
 vifib_test
@@ -791,6 +799,7 @@ vifib_crm
 vifib_forge_release
 vifib_invoicing
 vifib_open_trade
+vifib_payzen
 vifib_slap
 vifib_software_pdm
 vifib_test