Merge remote-tracking branch 'origin/master' into payzen-fixup

master/bt5/erp5_configurator_vifib/SkinTemplateItem/portal_skins/erp5_configurator_vifib/BusinessConfiguration_setupVifibStandardBT5.xml

@@ -98,7 +98,6 @@ bt5_installation_list = (\n
       \'vifib_core\',\n
       \'vifib_base\',\n
       \'vifib_slap\',\n
-      \'vifib_crm\',\n
       \'vifib_forge_release\',\n
       \'vifib_software_pdm\',\n
       \'vifib_web\',\n

master/bt5/erp5_configurator_vifib/TestTemplateItem/testVifibConfigurationWorkflow.py

@@ -77,7 +77,6 @@ class TestVifibConfiguratorWorkflow(TestLiveConfiguratorWorkflowMixin):
       'vifib_core', 
       'vifib_base', 
       'vifib_slap', 
-      'vifib_crm', 
       'vifib_forge_release', 
       'vifib_software_pdm', 
       'vifib_web', 

master/bt5/erp5_configurator_vifib/bt/revision

-24
+25
\ No newline at end of file

master/bt5/vifib_crm/SkinTemplateItem/portal_skins/vifib_crm.xml

-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="Folder" module="OFS.Folder"/>
-    </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_crm</string> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string></string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>

master/bt5/vifib_crm/SkinTemplateItem/portal_skins/vifib_crm/Base_viewCrmFieldLibrary.xml

-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="ERP5Form" module="Products.ERP5Form.Form"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>action</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>encoding</string> </key>
-            <value> <string>UTF-8</string> </value>
-        </item>
-        <item>
-            <key> <string>enctype</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>group_list</string> </key>
-            <value>
-              <list>
-                <string>left</string>
-                <string>right</string>
-                <string>center</string>
-                <string>bottom</string>
-                <string>hidden</string>
-              </list>
-            </value>
-        </item>
-        <item>
-            <key> <string>groups</string> </key>
-            <value>
-              <dictionary>
-                <item>
-                    <key> <string>bottom</string> </key>
-                    <value>
-                      <list/>
-                    </value>
-                </item>
-                <item>
-                    <key> <string>center</string> </key>
-                    <value>
-                      <list/>
-                    </value>
-                </item>
-                <item>
-                    <key> <string>hidden</string> </key>
-                    <value>
-                      <list/>
-                    </value>
-                </item>
-                <item>
-                    <key> <string>left</string> </key>
-                    <value>
-                      <list/>
-                    </value>
-                </item>
-                <item>
-                    <key> <string>right</string> </key>
-                    <value>
-                      <list/>
-                    </value>
-                </item>
-              </dictionary>
-            </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>Base_viewCrmFieldLibrary</string> </value>
-        </item>
-        <item>
-            <key> <string>method</string> </key>
-            <value> <string>POST</string> </value>
-        </item>
-        <item>
-            <key> <string>name</string> </key>
-            <value> <string>Base_viewCrmFieldLibrary</string> </value>
-        </item>
-        <item>
-            <key> <string>row_length</string> </key>
-            <value> <int>4</int> </value>
-        </item>
-        <item>
-            <key> <string>stored_encoding</string> </key>
-            <value> <string>UTF-8</string> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <string></string> </value>
-        </item>
-        <item>
-            <key> <string>unicode_mode</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>

master/bt5/vifib_crm/SkinTemplateItem/portal_skins/vifib_crm/Event_init.xml

-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>Script_magic</string> </key>
-            <value> <int>3</int> </value>
-        </item>
-        <item>
-            <key> <string>_bind_names</string> </key>
-            <value>
-              <object>
-                <klass>
-                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
-                </klass>
-                <tuple/>
-                <state>
-                  <dictionary>
-                    <item>
-                        <key> <string>_asgns</string> </key>
-                        <value>
-                          <dictionary>
-                            <item>
-                                <key> <string>name_container</string> </key>
-                                <value> <string>container</string> </value>
-                            </item>
-                            <item>
-                                <key> <string>name_context</string> </key>
-                                <value> <string>context</string> </value>
-                            </item>
-                            <item>
-                                <key> <string>name_m_self</string> </key>
-                                <value> <string>script</string> </value>
-                            </item>
-                            <item>
-                                <key> <string>name_subpath</string> </key>
-                                <value> <string>traverse_subpath</string> </value>
-                            </item>
-                          </dictionary>
-                        </value>
-                    </item>
-                  </dictionary>
-                </state>
-              </object>
-            </value>
-        </item>
-        <item>
-            <key> <string>_body</string> </key>
-            <value> <string>"""Copy of standard Event_init with proxy role"""\n
-# Set preferred text format\n
-context.edit(content_type=context.portal_preferences.getPreferredTextFormat())\n
-</string> </value>
-        </item>
-        <item>
-            <key> <string>_params</string> </key>
-            <value> <string>*args, **kw</string> </value>
-        </item>
-        <item>
-            <key> <string>_proxy_roles</string> </key>
-            <value>
-              <tuple>
-                <string>Assignee</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>Event_init</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>

master/bt5/vifib_crm/bt/copyright_list

-Nexedi SA
\ No newline at end of file

master/bt5/vifib_crm/bt/dependency_list

-erp5_crm
\ No newline at end of file

master/bt5/vifib_crm/bt/description

-Personalization of erp5_crm for ViFiB
\ No newline at end of file

master/bt5/vifib_crm/bt/license

-GPL
\ No newline at end of file

master/bt5/vifib_crm/bt/revision

-14
\ No newline at end of file

master/bt5/vifib_crm/bt/template_format_version

-1
\ No newline at end of file

master/bt5/vifib_crm/bt/template_skin_id_list

-vifib_crm
\ No newline at end of file

master/bt5/vifib_crm/bt/title

-vifib_crm
\ No newline at end of file

master/bt5/vifib_crm/bt/version

-Vifib 0.5
\ No newline at end of file

master/bt5/vifib_data/bt/revision

-100
+101
\ No newline at end of file

master/bt5/vifib_data/bt/template_preference_list

+vifib_default_site_preference
 vifib_default_system_preference
\ No newline at end of file

master/bt5/vifib_erp5/bt/dependency_list

 vifib_base
 vifib_core
-vifib_crm
 vifib_data
 vifib_data_category
 vifib_data_payzen

master/bt5/vifib_erp5/bt/revision

-415
+416
\ No newline at end of file

master/bt5/vifib_web/bt/dependency_list

@@ -4,6 +4,5 @@ erp5_dms
 erp5_jquery
 erp5_km
 erp5_web
-vifib_crm
 vifib_forge_release
 vifib_software_pdm

master/bt5/vifib_web/bt/revision

-360
+361
\ No newline at end of file

master/product/Vifib/tests/VifibMixin.py

@@ -99,7 +99,6 @@ class testVifibMixin(ERP5TypeTestCase):
       'vifib_base',
       'vifib_open_trade',
       'vifib_slap',
-      'vifib_crm',
       'vifib_forge_release',
       'vifib_software_pdm',
       'vifib_web',
@@ -202,16 +201,6 @@ class testVifibMixin(ERP5TypeTestCase):
       self.portal._p_changed = 1
       transaction.commit()
 
-  def setPreference(self):
-    # Enable default preference
-    preference = self.portal.portal_preferences.default_site_preference
-    # XXX-Luke: checking for preference state is no op (in such early state
-    # this preference is disabled anyway), but in my environment enable does
-    # not work, UNTIL getPreferenceState is called. Possibly cache/
-    # /configuration issue, to be checked later
-    if preference.getPreferenceState() == 'disabled':
-      preference.enable()
-
   def getDefaultSitePreferenceId(self):
     """Default id, usefull method to override
     """
@@ -312,7 +301,6 @@ class testVifibMixin(ERP5TypeTestCase):
     self.login()
     self.setupVifibMachineAuthenticationPlugin()
     self.setupVifibShadowAuthenticationPlugin()
-    self.setPreference()
     self.prepareTestUsers()
     self.prepareVifibAccountingPeriod()
     transaction.commit()

master/product/Vifib/tests/testVifibSkinSelection.py

@@ -115,7 +115,6 @@ vifib_agent
 vifib_base
 vifib_cash
 vifib_core
-vifib_crm
 vifib_forge_release
 vifib_jauks_theme
 vifib_jauks_widget_library
@@ -212,7 +211,6 @@ vifib_upgrader
 vifib_agent
 vifib_base
 vifib_core
-vifib_crm
 vifib_fiber_theme
 vifib_forge_release
 vifib_jauks_theme
@@ -312,7 +310,6 @@ vifib_hosting
 vifib_agent
 vifib_base
 vifib_core
-vifib_crm
 vifib_forge_release
 vifib_hosting_theme
 vifib_jauks_theme
@@ -410,7 +407,6 @@ vifib_upgrader
 vifib_agent
 vifib_base
 vifib_core
-vifib_crm
 vifib_forge_release
 vifib_open_trade
 vifib_payzen
@@ -502,7 +498,6 @@ vifib_upgrader
 vifib_agent
 vifib_base
 vifib_core
-vifib_crm
 vifib_forge_release
 vifib_open_trade
 vifib_payzen
@@ -594,7 +589,6 @@ vifib_upgrader
 vifib_agent
 vifib_base
 vifib_core
-vifib_crm
 vifib_forge_release
 vifib_open_trade
 vifib_payzen
@@ -690,7 +684,6 @@ vifib_upgrader
 vifib_agent
 vifib_base
 vifib_core
-vifib_crm
 vifib_forge_release
 vifib_open_trade
 vifib_payzen
@@ -785,7 +778,6 @@ vifib_upgrader
 vifib_agent
 vifib_base
 vifib_core
-vifib_crm
 vifib_forge_release
 vifib_open_trade
 vifib_payzen
@@ -877,7 +869,6 @@ vifib_upgrader
 vifib_agent
 vifib_base
 vifib_core
-vifib_crm
 vifib_forge_release
 vifib_open_trade
 vifib_payzen
@@ -968,7 +959,6 @@ vifib_upgrader
 vifib_agent
 vifib_base
 vifib_core
-vifib_crm
 vifib_forge_release
 vifib_open_trade
 vifib_payzen

master/tests/__init__.py

 from test_suite import SavedTestSuite, ProjectTestSuite
-class VIFIB(SavedTestSuite, ProjectTestSuite):
+
+class SLAPOS_MASTER(SavedTestSuite, ProjectTestSuite):
   _bt_list = [
+#     'vifib_slapos_core',
+#     'vifib_slapos_master',
+  ]
+  _product_list = ['Vifib']
+  _saved_test_id = 'Products.Vifib.tests.VifibMixin'
+
+class VIFIB(SLAPOS_MASTER):
+  _bt_list = SLAPOS_MASTER._bt_list + [
     'vifib_base',
     'vifib_core',
-    'vifib_crm',
     'vifib_data',
     'vifib_data_category',
     'vifib_data_web',
@@ -17,5 +25,3 @@ class VIFIB(SavedTestSuite, ProjectTestSuite):
     'vifib_upgrader',
     'vifib_web',
   ]
-  _product_list = ['Vifib']
-  _saved_test_id = 'Products.Vifib.tests.VifibMixin'