Skip to content

S
slapos.core
Commit 8ff22d0f authored by Łukasz Nowak's avatar Łukasz Nowak
Browse files
Options

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

parents fc0e4e18 d8b0a4d3
Hide whitespace changes
Inline Side-by-side
Showing with 460 additions and 270 deletions
master/bt5/erp5_configurator_vifib/SkinTemplateItem/portal_skins/erp5_configurator_vifib/BusinessConfiguration_setupVifibStandardBT5.xml
View file @ 8ff22d0f
......@@ -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
View file @ 8ff22d0f
......@@ -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/vifib_crm/SkinTemplateItem/portal_skins/vifib_crm.xml deleted 100644 → 0
View file @ fc0e4e18
<?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 deleted 100644 → 0
View file @ fc0e4e18
<?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 deleted 100644 → 0
View file @ fc0e4e18
<?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 deleted 100644 → 0
View file @ fc0e4e18
Nexedi SA
\ No newline at end of file
master/bt5/vifib_crm/bt/dependency_list deleted 100644 → 0
View file @ fc0e4e18
erp5_crm
\ No newline at end of file
master/bt5/vifib_crm/bt/description deleted 100644 → 0
View file @ fc0e4e18
Personalization of erp5_crm for ViFiB
\ No newline at end of file
master/bt5/vifib_crm/bt/license deleted 100644 → 0
View file @ fc0e4e18
GPL
\ No newline at end of file
master/bt5/vifib_crm/bt/revision deleted 100644 → 0
View file @ fc0e4e18
14
\ No newline at end of file
master/bt5/vifib_crm/bt/template_skin_id_list deleted 100644 → 0
View file @ fc0e4e18
vifib_crm
\ No newline at end of file
master/bt5/vifib_crm/bt/title deleted 100644 → 0
View file @ fc0e4e18
vifib_crm
\ No newline at end of file
master/bt5/vifib_crm/bt/version deleted 100644 → 0
View file @ fc0e4e18
Vifib 0.5
\ No newline at end of file
master/bt5/vifib_data/PreferenceTemplateItem/portal_preferences/vifib_default_site_preference.xml 0 → 100644
View file @ 8ff22d0f
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Preference" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_Access_contents_information_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Auditor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Add_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Delete_objects_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Modify_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>_View_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Auditor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>_count</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>_local_properties</string> </key>
<value>
<tuple>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>preferred_accounting_transaction_gap_root</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>string</string> </value>
</item>
</dictionary>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>preferred_quantity_field_width</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>string</string> </value>
</item>
</dictionary>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>preferred_money_quantity_field_width</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>string</string> </value>
</item>
</dictionary>
</tuple>
</value>
</item>
<item>
<key> <string>_mt_index</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>_tree</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>contributors</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>The default parameters for the site are set on this preference.\n
It\'s the lowest priority one; ie. managers can create higher priority preference for a group of users and users can create individals (per user) preferences that will be top level priority.</string> </value>
</item>
<item>
<key> <string>effective_date</string> </key>
<value>
<object>
<klass>
<global id="1.1" name="DateTime" module="DateTime.DateTime"/>
</klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>978325200.0</float>
<string>US/Eastern</string>
</tuple>
</state>
</object>
</value>
</item>
<item>
<key> <string>expiration_date</string> </key>
<value>
<object>
<klass> <reference id="1.1"/> </klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>253402146000.0</float>
<string>US/Eastern</string>
</tuple>
</state>
</object>
</value>
</item>
<item>
<key> <string>format</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>vifib_default_site_preference</string> </value>
</item>
<item>
<key> <string>id_group</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>language</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Preference</string> </value>
</item>
<item>
<key> <string>preferred_accounting_transaction_at_date</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>preferred_accounting_transaction_currency</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>preferred_accounting_transaction_from_date</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>preferred_accounting_transaction_gap</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>preferred_accounting_transaction_gap_root</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>preferred_accounting_transaction_section_category</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>preferred_accounting_transaction_simulation_state</string> </key>
<value>
<tuple>
<string>stopped</string>
<string>delivered</string>
</tuple>
</value>
</item>
<item>
<key> <string>preferred_accounting_transaction_source_section</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>preferred_campaign_resource</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>preferred_category_child_item_list_method_id</string> </key>
<value> <string>getCategoryChildTranslatedLogicalPathItemList</string> </value>
</item>
<item>
<key> <string>preferred_date_order</string> </key>
<value> <string>ymd</string> </value>
</item>
<item>
<key> <string>preferred_document_file_name_regular_expression</string> </key>
<value> <string encoding="cdata"><![CDATA[
(?P<reference>[A-Z&é@{]{3,7})-(?P<language>[a-z]{2})-(?P<version>[0-9]{3})
]]></string> </value>
</item>
<item>
<key> <string>preferred_document_reference_regular_expression</string> </key>
<value> <string encoding="cdata"><![CDATA[
(?P<reference>[A-Z&é@{]{3,7})(-(?P<language>[a-z]{2}))?(-(?P<version>[0-9]{3}))?
]]></string> </value>
</item>
<item>
<key> <string>preferred_event_assessment_form_id</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>preferred_event_resource</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>preferred_html_style_access_tab</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>preferred_html_style_acknowledgeable_message</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>preferred_html_style_contextual_help</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>preferred_html_style_developper_mode</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>preferred_html_style_translator_mode</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>preferred_listbox_list_mode_line_count</string> </key>
<value> <int>40</int> </value>
</item>
<item>
<key> <string>preferred_listbox_view_mode_line_count</string> </key>
<value> <int>15</int> </value>
</item>
<item>
<key> <string>preferred_medium_image_height</string> </key>
<value> <int>480</int> </value>
</item>
<item>
<key> <string>preferred_meeting_resource</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>preferred_money_quantity_field_width</string> </key>
<value> <int>10</int> </value>
</item>
<item>
<key> <string>preferred_ooodoc_server_address</string> </key>
<value> <string>localhost</string> </value>
</item>
<item>
<key> <string>preferred_ooodoc_server_port_number</string> </key>
<value> <int>8008</int> </value>
</item>
<item>
<key> <string>preferred_quantity_field_width</string> </key>
<value> <int>5</int> </value>
</item>
<item>
<key> <string>preferred_report_format</string> </key>
<value> <string>pdf</string> </value>
</item>
<item>
<key> <string>preferred_report_style</string> </key>
<value> <string>ODT</string> </value>
</item>
<item>
<key> <string>preferred_sale_opportunity_resource</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>preferred_section_category</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>preferred_string_field_width</string> </key>
<value> <int>30</int> </value>
</item>
<item>
<key> <string>preferred_subversion_user_name</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>preferred_subversion_working_copy</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>preferred_support_request_resource</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>preferred_textarea_height</string> </key>
<value> <int>4</int> </value>
</item>
<item>
<key> <string>preferred_textarea_width</string> </key>
<value> <int>80</int> </value>
</item>
<item>
<key> <string>preferred_visible_module</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>priority</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>rights</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>subject</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>title</string> </key>
<value>
<none/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="Length" module="BTrees.Length"/>
</pickle>
<pickle> <int>0</int> </pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="OOBTree" module="BTrees.OOBTree"/>
</pickle>
<pickle>
<none/>
</pickle>
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<global name="OOBTree" module="BTrees.OOBTree"/>
</pickle>
<pickle>
<none/>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_data/bt/revision
View file @ 8ff22d0f
100
\ No newline at end of file
101
\ No newline at end of file
master/bt5/vifib_data/bt/template_preference_list
View file @ 8ff22d0f
vifib_default_site_preference
vifib_default_system_preference
\ No newline at end of file
master/bt5/vifib_erp5/bt/dependency_list
View file @ 8ff22d0f
vifib_base
vifib_core
vifib_crm
vifib_data
vifib_data_category
vifib_data_payzen
......@@ -13,4 +12,4 @@ vifib_open_trade
vifib_payzen
vifib_slap
vifib_software_pdm
vifib_web
\ No newline at end of file
vifib_web
master/bt5/vifib_web/bt/dependency_list
View file @ 8ff22d0f
......@@ -4,6 +4,5 @@ erp5_dms
erp5_jquery
erp5_km
erp5_web
vifib_crm
vifib_forge_release
vifib_software_pdm
\ No newline at end of file
vifib_software_pdm
master/product/Vifib/tests/VifibMixin.py
View file @ 8ff22d0f
......@@ -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
View file @ 8ff22d0f
......@@ -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
View file @ 8ff22d0f
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'
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7