Skip to content

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

Merge branch 'master' into hostingwebsite 

Conflicts:
	master/product/Vifib/tests/testVifibSkinSelection.py
parents 444a4321 767ee613
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 39334 additions and 1064 deletions
master/bt5/erp5_configurator_vifib/SkinTemplateItem/portal_skins/erp5_configurator_vifib/BusinessCondiguration_additionalConfiguration.xml
View file @ 93109994
...@@ -58,7 +58,7 @@ portal = context.getPortalObject() \n ...@@ -58,7 +58,7 @@ portal = context.getPortalObject() \n
\n \n
## Create new portal tool for Vifib\n ## Create new portal tool for Vifib\n
if getattr(portal, "portal_certificate_authority", None ) is None:\n if getattr(portal, "portal_certificate_authority", None ) is None:\n
portal.manage_addProduct[\'Vifib\'].manage_addTool(\'ERP5 Certificate Authority Tool\', None)\n portal.manage_addProduct[\'ERP5\'].manage_addTool(\'ERP5 Certificate Authority Tool\', None)\n
print "Created portal_certificate_authority"\n print "Created portal_certificate_authority"\n
else:\n else:\n
print "portal_certificate_authority already exists."\n print "portal_certificate_authority already exists."\n
......
master/bt5/erp5_configurator_vifib/SkinTemplateItem/portal_skins/erp5_configurator_vifib/BusinessConfiguration_setupVifibStandardBT5.xml
View file @ 93109994
...@@ -108,9 +108,9 @@ bt5_installation_list = (\n ...@@ -108,9 +108,9 @@ bt5_installation_list = (\n
\'vifib_data_web\',\n \'vifib_data_web\',\n
\'vifib_payzen\',\n \'vifib_payzen\',\n
\'vifib_data_payzen\',\n \'vifib_data_payzen\',\n
\'vifib_data_simulation\',\n
\'vifib_erp5\',\n \'vifib_erp5\',\n
\'vifib_test\',\n \'vifib_test\',\n
\'vifib_invoicing\',\n
)\n )\n
\n \n
bt5_update_catalog = (\'erp5_ingestion_mysql_innodb_catalog\',\n bt5_update_catalog = (\'erp5_ingestion_mysql_innodb_catalog\',\n
......
master/bt5/erp5_configurator_vifib/bt/revision
View file @ 93109994
19 22
\ No newline at end of file \ No newline at end of file
master/bt5/vifib_data/LocalRolesTemplateItem/currency_module/EUR.xml
View file @ 93109994
<local_roles_item> <local_roles_item>
<local_roles> <local_roles>
<role id='G-COMPANY'>
<item>Assignor</item>
</role>
<role id='R-MEMBER'> <role id='R-MEMBER'>
<item>Auditor</item> <item>Auditor</item>
</role> </role>
......
master/bt5/vifib_data/LocalRolesTemplateItem/service_module/cpu_consumption.xml
View file @ 93109994
...@@ -3,6 +3,9 @@ ...@@ -3,6 +3,9 @@
<role id='ERP5TypeTestCase'> <role id='ERP5TypeTestCase'>
<item>Owner</item> <item>Owner</item>
</role> </role>
<role id='G-COMPANY'>
<item>Assignor</item>
</role>
<role id='R-COMPUTER'> <role id='R-COMPUTER'>
<item>Auditor</item> <item>Auditor</item>
</role> </role>
......
master/bt5/vifib_data/LocalRolesTemplateItem/service_module/memory_consumption.xml
View file @ 93109994
...@@ -3,6 +3,9 @@ ...@@ -3,6 +3,9 @@
<role id='ERP5TypeTestCase'> <role id='ERP5TypeTestCase'>
<item>Owner</item> <item>Owner</item>
</role> </role>
<role id='G-COMPANY'>
<item>Assignor</item>
</role>
<role id='R-COMPUTER'> <role id='R-COMPUTER'>
<item>Auditor</item> <item>Auditor</item>
</role> </role>
......
master/bt5/vifib_data/LocalRolesTemplateItem/service_module/vifib_instance_cleanup.xml
View file @ 93109994
<local_roles_item> <local_roles_item>
<local_roles> <local_roles>
<role id='G-COMPANY'>
<item>Assignor</item>
</role>
<role id='R-COMPUTER'> <role id='R-COMPUTER'>
<item>Auditor</item> <item>Auditor</item>
</role> </role>
......
master/bt5/vifib_data/LocalRolesTemplateItem/service_module/vifib_instance_hosting.xml
View file @ 93109994
<local_roles_item> <local_roles_item>
<local_roles> <local_roles>
<role id='G-COMPANY'>
<item>Assignor</item>
</role>
<role id='R-COMPUTER'> <role id='R-COMPUTER'>
<item>Auditor</item> <item>Auditor</item>
</role> </role>
......
master/bt5/vifib_data/LocalRolesTemplateItem/service_module/vifib_instance_setup.xml
View file @ 93109994
<local_roles_item> <local_roles_item>
<local_roles> <local_roles>
<role id='G-COMPANY'>
<item>Assignor</item>
</role>
<role id='R-COMPUTER'> <role id='R-COMPUTER'>
<item>Auditor</item> <item>Auditor</item>
</role> </role>
......
master/bt5/vifib_data/LocalRolesTemplateItem/service_module/vifib_instance_subscription.xml 0 → 100644
View file @ 93109994
<local_roles_item>
<local_roles>
<role id='G-COMPANY'>
<item>Assignor</item>
</role>
<role id='R-COMPUTER'>
<item>Auditor</item>
</role>
<role id='R-INSTANCE'>
<item>Auditor</item>
</role>
<role id='R-MEMBER'>
<item>Auditor</item>
</role>
<role id='zope'>
<item>Owner</item>
</role>
</local_roles>
</local_roles_item>
\ No newline at end of file
master/bt5/vifib_data/LocalRolesTemplateItem/service_module/vifib_instance_update.xml
View file @ 93109994
...@@ -3,6 +3,9 @@ ...@@ -3,6 +3,9 @@
<role id='ERP5TypeTestCase'> <role id='ERP5TypeTestCase'>
<item>Owner</item> <item>Owner</item>
</role> </role>
<role id='G-COMPANY'>
<item>Assignor</item>
</role>
<role id='R-COMPUTER'> <role id='R-COMPUTER'>
<item>Auditor</item> <item>Auditor</item>
</role> </role>
......
master/bt5/vifib_data/LocalRolesTemplateItem/service_module/vifib_software_setup.xml
View file @ 93109994
<local_roles_item> <local_roles_item>
<local_roles> <local_roles>
<role id='G-COMPANY'>
<item>Assignor</item>
</role>
<role id='R-COMPUTER'> <role id='R-COMPUTER'>
<item>Auditor</item> <item>Auditor</item>
</role> </role>
......
master/bt5/vifib_data/LocalRolesTemplateItem/service_module/vifib_usage_report.xml
View file @ 93109994
<local_roles_item> <local_roles_item>
<local_roles> <local_roles>
<role id='G-COMPANY'>
<item>Assignor</item>
</role>
<role id='R-COMPUTER'> <role id='R-COMPUTER'>
<item>Auditor</item> <item>Auditor</item>
</role> </role>
......
master/bt5/vifib_data/PathTemplateItem/service_module/vifib_instance_subscription.xml 0 → 100644
View file @ 93109994
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Service" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_Access_contents_information_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Auditor</string>
<string>Author</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Add_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Author</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Modify_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Author</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>_View_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Auditor</string>
<string>Author</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>aggregated_portal_type</string> </key>
<value>
<tuple>
<string>Computer Partition</string>
<string>Software Instance</string>
<string>Software Release</string>
<string>Subscription Item</string>
</tuple>
</value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>quantity_unit/unit/piece</string>
</tuple>
</value>
</item>
<item>
<key> <string>comment</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>default_reference</string> </key>
<value> <string>instance_subscription</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>vifib_instance_subscription</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Service</string> </value>
</item>
<item>
<key> <string>required_aggregated_portal_type</string> </key>
<value>
<tuple>
<string>Computer Partition</string>
<string>Software Instance</string>
<string>Software Release</string>
<string>Subscription Item</string>
</tuple>
</value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Instance Subscription</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_data/PreferenceTemplateItem/portal_preferences/vifib_default_system_preference.xml
View file @ 93109994
...@@ -105,6 +105,10 @@ ...@@ -105,6 +105,10 @@
<key> <string>preferred_instance_setup_resource</string> </key> <key> <string>preferred_instance_setup_resource</string> </key>
<value> <string>service_module/vifib_instance_setup</string> </value> <value> <string>service_module/vifib_instance_setup</string> </value>
</item> </item>
<item>
<key> <string>preferred_instance_subscription_resource</string> </key>
<value> <string>service_module/vifib_instance_subscription</string> </value>
</item>
<item> <item>
<key> <string>preferred_instance_update_resource</string> </key> <key> <string>preferred_instance_update_resource</string> </key>
<value> <string>service_module/vifib_instance_update</string> </value> <value> <string>service_module/vifib_instance_update</string> </value>
...@@ -117,6 +121,16 @@ ...@@ -117,6 +121,16 @@
<key> <string>preferred_ooodoc_server_port_number</string> </key> <key> <string>preferred_ooodoc_server_port_number</string> </key>
<value> <int>23000</int> </value> <value> <int>23000</int> </value>
</item> </item>
<item>
<key> <string>preferred_organisation_credential_update_automatic_approval</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>preferred_payzen_integration_site</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>preferred_software_setup_resource</string> </key> <key> <string>preferred_software_setup_resource</string> </key>
<value> <string>service_module/vifib_software_setup</string> </value> <value> <string>service_module/vifib_software_setup</string> </value>
...@@ -125,7 +139,7 @@ ...@@ -125,7 +139,7 @@
<key> <string>preferred_subscription_assignment_category</string> </key> <key> <string>preferred_subscription_assignment_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>function/customer</string> <string>role/member</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
master/bt5/vifib_data/bt/revision
View file @ 93109994
84 87
\ No newline at end of file \ No newline at end of file
master/bt5/vifib_data/bt/template_local_role_list
View file @ 93109994
...@@ -4,6 +4,7 @@ service_module/memory_consumption ...@@ -4,6 +4,7 @@ service_module/memory_consumption
service_module/vifib_instance_cleanup service_module/vifib_instance_cleanup
service_module/vifib_instance_hosting service_module/vifib_instance_hosting
service_module/vifib_instance_setup service_module/vifib_instance_setup
service_module/vifib_instance_subscription
service_module/vifib_instance_update service_module/vifib_instance_update
service_module/vifib_software_setup service_module/vifib_software_setup
service_module/vifib_usage_report service_module/vifib_usage_report
\ No newline at end of file
master/bt5/vifib_data/bt/template_local_roles_list
View file @ 93109994
...@@ -2,8 +2,9 @@ currency_module/EUR ...@@ -2,8 +2,9 @@ currency_module/EUR
service_module/cpu_consumption service_module/cpu_consumption
service_module/memory_consumption service_module/memory_consumption
service_module/vifib_instance_cleanup service_module/vifib_instance_cleanup
service_module/vifib_instance_subscription
service_module/vifib_instance_hosting service_module/vifib_instance_hosting
service_module/vifib_instance_setup service_module/vifib_instance_setup
service_module/vifib_instance_update
service_module/vifib_software_setup service_module/vifib_software_setup
service_module/vifib_usage_report service_module/vifib_usage_report
service_module/vifib_instance_update \ No newline at end of file
\ No newline at end of file
master/bt5/vifib_data/bt/template_path_list
View file @ 93109994
...@@ -6,6 +6,7 @@ service_module/memory_consumption ...@@ -6,6 +6,7 @@ service_module/memory_consumption
service_module/vifib_instance_cleanup service_module/vifib_instance_cleanup
service_module/vifib_instance_hosting service_module/vifib_instance_hosting
service_module/vifib_instance_setup service_module/vifib_instance_setup
service_module/vifib_instance_subscription
service_module/vifib_instance_update service_module/vifib_instance_update
service_module/vifib_software_setup service_module/vifib_software_setup
service_module/vifib_usage_report service_module/vifib_usage_report
\ No newline at end of file
master/bt5/vifib_data_payzen/PathTemplateItem/sale_trade_condition_module/payzen_sale_trade_condition.xml
View file @ 93109994
...@@ -75,9 +75,7 @@ ...@@ -75,9 +75,7 @@
<item> <item>
<key> <string>categories</string> </key> <key> <string>categories</string> </key>
<value> <value>
<tuple> <tuple/>
<string>specialise/sale_trade_condition_module/vifib_trade_condition</string>
</tuple>
</value> </value>
</item> </item>
<item> <item>
......
master/bt5/vifib_data_payzen/bt/revision
View file @ 93109994
7 8
\ No newline at end of file \ No newline at end of file
master/bt5/vifib_open_trade/PathTemplateItem/portal_rules/default_subscription_item_rule.xml → master/bt5/vifib_data_simulation/PathTemplateItem/business_process_module/vifib_purchase_business_process.xml
View file @ 93109994
...@@ -2,23 +2,34 @@ ...@@ -2,23 +2,34 @@
<ZopeData> <ZopeData>
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<global name="Subscription Item Root Simulation Rule" module="erp5.portal_type"/> <global name="Business Process" module="erp5.portal_type"/>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
<item> <item>
<key> <string>_Add_portal_content_Permission</string> </key> <key> <string>_Access_contents_information_Permission</string> </key>
<value> <value>
<tuple> <tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Auditor</string>
<string>Author</string>
<string>Manager</string> <string>Manager</string>
<string>Owner</string>
</tuple> </tuple>
</value> </value>
</item> </item>
<item> <item>
<key> <string>_Delete_objects_Permission</string> </key> <key> <string>_Add_portal_content_Permission</string> </key>
<value> <value>
<tuple> <tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Author</string>
<string>Manager</string> <string>Manager</string>
<string>Owner</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -26,7 +37,26 @@ ...@@ -26,7 +37,26 @@
<key> <string>_Modify_portal_content_Permission</string> </key> <key> <string>_Modify_portal_content_Permission</string> </key>
<value> <value>
<tuple> <tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Author</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>_View_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Auditor</string>
<string>Author</string>
<string>Manager</string> <string>Manager</string>
<string>Owner</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -39,16 +69,7 @@ ...@@ -39,16 +69,7 @@
<item> <item>
<key> <string>_identity_criterion</string> </key> <key> <string>_identity_criterion</string> </key>
<value> <value>
<dictionary> <dictionary/>
<item>
<key> <string>portal_type</string> </key>
<value>
<list>
<string>Subscription Item</string>
</list>
</value>
</item>
</dictionary>
</value> </value>
</item> </item>
<item> <item>
...@@ -69,71 +90,33 @@ ...@@ -69,71 +90,33 @@
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value> </value>
</item> </item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>trade_phase/default/delivery</string>
</tuple>
</value>
</item>
<item>
<key> <string>criterion_property</string> </key>
<value>
<tuple>
<string>portal_type</string>
</tuple>
</value>
</item>
<item> <item>
<key> <string>default_reference</string> </key> <key> <string>default_reference</string> </key>
<value> <string>default_subscription_item_rule</string> </value> <value> <string>vifib_purchase_business_process</string> </value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <value> <string>Vifib Business Process for sales.</string> </value>
<none/>
</value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>default_subscription_item_rule</string> </value> <value> <string>vifib_purchase_business_process</string> </value>
</item>
<item>
<key> <string>int_index</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>membership_criterion_category</string> </key>
<value>
<tuple/>
</value>
</item> </item>
<item> <item>
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
<value> <string>Subscription Item Root Simulation Rule</string> </value> <value> <string>Business Process</string> </value>
</item> </item>
<item> <item>
<key> <string>string_index</string> </key> <key> <string>referential_date</string> </key>
<value> <value> <string>start_date</string> </value>
<none/>
</value>
</item>
<item>
<key> <string>test_method_id</string> </key>
<value>
<tuple/>
</value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Open Order Subscription Item Rule</string> </value> <value> <string>Vifib Purchase Business Process</string> </value>
</item> </item>
<item> <item>
<key> <string>version</string> </key> <key> <string>version</string> </key>
<value> <string>001</string> </value> <value> <string>1</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
master/bt5/vifib_data_simulation/PathTemplateItem/business_process_module/vifib_purchase_business_process/deliver.xml 0 → 100644
View file @ 93109994
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Business Link" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_Access_contents_information_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Auditor</string>
<string>Author</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Add_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Author</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Modify_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Author</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>_View_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Auditor</string>
<string>Author</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>_identity_criterion</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>modification_date</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>date</string> </value>
</item>
</dictionary>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>creation_date</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>date</string> </value>
</item>
</dictionary>
</tuple>
</value>
</item>
<item>
<key> <string>_range_criterion</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>trade_phase/vifib/delivery</string>
<string>predecessor/trade_state/ordered</string>
<string>successor/trade_state/delivered</string>
<string>delivery_builder/portal_deliveries/vifib_purchase_packing_list_builder</string>
</tuple>
</value>
</item>
<item>
<key> <string>completed_state</string> </key>
<value>
<tuple>
<string>confirmed</string>
<string>delivered</string>
<string>started</string>
<string>stopped</string>
</tuple>
</value>
</item>
<item>
<key> <string>creation_date</string> </key>
<value>
<object>
<klass>
<global id="1.1" name="DateTime" module="DateTime.DateTime"/>
</klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1324249200.0</float>
<string>GMT+1</string>
</tuple>
</state>
</object>
</value>
</item>
<item>
<key> <string>deliverable</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>frozen_state</string> </key>
<value>
<tuple>
<string>delivered</string>
<string>stopped</string>
</tuple>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>deliver</string> </value>
</item>
<item>
<key> <string>int_index</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>language</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>lead_time</string> </key>
<value> <float>10.0</float> </value>
</item>
<item>
<key> <string>modification_date</string> </key>
<value>
<object>
<klass> <reference id="1.1"/> </klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1324249200.0</float>
<string>GMT+1</string>
</tuple>
</state>
</object>
</value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Business Link</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>deliver</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="PersistentMapping" module="Persistence.mapping"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
<global name="PersistentMapping" module="Persistence.mapping"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_open_trade/PathTemplateItem/business_process_module/erp5_default_business_process/delivery_path.xml → master/bt5/vifib_data_simulation/PathTemplateItem/business_process_module/vifib_purchase_business_process/delivery_path.xml
View file @ 93109994
...@@ -69,8 +69,8 @@ ...@@ -69,8 +69,8 @@
<key> <string>categories</string> </key> <key> <string>categories</string> </key>
<value> <value>
<tuple> <tuple>
<string>trade_phase/default/delivery</string> <string>trade_phase/vifib/delivery</string>
<string>trade_date/trade_phase/default/order</string> <string>trade_date/trade_phase/vifib/order</string>
<string>end_of/day</string> <string>end_of/day</string>
</tuple> </tuple>
</value> </value>
...@@ -87,8 +87,8 @@ ...@@ -87,8 +87,8 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1280440800.0</float> <float>1324249200.0</float>
<string>GMT+2</string> <string>GMT+1</string>
</tuple> </tuple>
</state> </state>
</object> </object>
...@@ -112,6 +112,12 @@ ...@@ -112,6 +112,12 @@
<key> <string>int_index</string> </key> <key> <string>int_index</string> </key>
<value> <int>2</int> </value> <value> <int>2</int> </value>
</item> </item>
<item>
<key> <string>language</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>lead_time</string> </key> <key> <string>lead_time</string> </key>
<value> <float>2.0</float> </value> <value> <float>2.0</float> </value>
...@@ -126,8 +132,8 @@ ...@@ -126,8 +132,8 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1280440800.0</float> <float>1324249200.0</float>
<string>GMT+2</string> <string>GMT+1</string>
</tuple> </tuple>
</state> </state>
</object> </object>
...@@ -135,7 +141,9 @@ ...@@ -135,7 +141,9 @@
</item> </item>
<item> <item>
<key> <string>payment_additional_term</string> </key> <key> <string>payment_additional_term</string> </key>
<value> <int>0</int> </value> <value>
<none/>
</value>
</item> </item>
<item> <item>
<key> <string>payment_end_of_month</string> </key> <key> <string>payment_end_of_month</string> </key>
...@@ -143,7 +151,9 @@ ...@@ -143,7 +151,9 @@
</item> </item>
<item> <item>
<key> <string>payment_term</string> </key> <key> <string>payment_term</string> </key>
<value> <int>0</int> </value> <value>
<none/>
</value>
</item> </item>
<item> <item>
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
...@@ -162,7 +172,10 @@ ...@@ -162,7 +172,10 @@
</record> </record>
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle> <pickle>
<global name="PersistentMapping" module="Persistence.mapping"/> <tuple>
<global name="PersistentMapping" module="Persistence.mapping"/>
<tuple/>
</tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
...@@ -177,7 +190,10 @@ ...@@ -177,7 +190,10 @@
</record> </record>
<record id="3" aka="AAAAAAAAAAM="> <record id="3" aka="AAAAAAAAAAM=">
<pickle> <pickle>
<global name="PersistentMapping" module="Persistence.mapping"/> <tuple>
<global name="PersistentMapping" module="Persistence.mapping"/>
<tuple/>
</tuple>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
......
master/bt5/vifib_invoicing/PathTemplateItem/portal_deliveries/vifib_sale_invoice_builder.xml → master/bt5/vifib_data_simulation/PathTemplateItem/portal_deliveries/vifib_sale_invoice_builder.xml
View file @ 93109994
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
</item> </item>
<item> <item>
<key> <string>delivery_after_generation_script_id</string> </key> <key> <string>delivery_after_generation_script_id</string> </key>
<value> <string>InvoiceTransaction_postGeneration</string> </value> <value> <string>VifibInvoiceTransaction_postGeneration</string> </value>
</item> </item>
<item> <item>
<key> <string>delivery_cell_collect_order</string> </key> <key> <string>delivery_cell_collect_order</string> </key>
...@@ -126,20 +126,16 @@ ...@@ -126,20 +126,16 @@
</item> </item>
<item> <item>
<key> <string>delivery_select_method_id</string> </key> <key> <string>delivery_select_method_id</string> </key>
<value> <string>InvoiceBuilder_selectPlannedSaleInvoiceList</string> </value> <value> <string>VifibInvoiceBuilder_selectPlannedSaleInvoiceList</string> </value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string>Builds Sale Invoices from Packing list related simulation movements</string> </value> <value> <string>Builds Vifib Sale Invoices from Packing list related simulation movements</string> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>vifib_sale_invoice_builder</string> </value> <value> <string>vifib_sale_invoice_builder</string> </value>
</item> </item>
<item>
<key> <string>last_id</string> </key>
<value> <string>4</string> </value>
</item>
<item> <item>
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
<value> <string>Delivery Builder</string> </value> <value> <string>Delivery Builder</string> </value>
......
master/bt5/vifib_data_simulation/bt/dependency_list 0 → 100644
View file @ 93109994
This diff is collapsed.
master/bt5/vifib_data_simulation/bt/revision 0 → 100644
View file @ 93109994
This diff is collapsed.
master/bt5/vifib_data_simulation/bt/template_keep_path_list 0 → 100644
View file @ 93109994
This diff is collapsed.
master/bt5/vifib_data_simulation/bt/template_path_list 0 → 100644
View file @ 93109994
This diff is collapsed.
master/bt5/vifib_data_simulation/bt/template_skin_id_list 0 → 100644
View file @ 93109994
This diff is collapsed.
master/bt5/vifib_data_simulation/bt/title 0 → 100644
View file @ 93109994
This diff is collapsed.
master/bt5/vifib_data_simulation/bt/version 0 → 100644
View file @ 93109994
This diff is collapsed.
master/bt5/vifib_erp5/bt/dependency_list 0 → 100644
View file @ 93109994
This diff is collapsed.
master/bt5/vifib_erp5/bt/revision
View file @ 93109994
This diff is collapsed.
master/bt5/vifib_invoicing/bt/change_log deleted 100644 → 0
View file @ 444a4321
This diff is collapsed.
master/bt5/vifib_invoicing/bt/copyright_list deleted 100644 → 0
View file @ 444a4321
This diff is collapsed.
master/bt5/vifib_invoicing/bt/dependency_list deleted 100644 → 0
View file @ 444a4321
This diff is collapsed.
master/bt5/vifib_invoicing/bt/description deleted 100644 → 0
View file @ 444a4321
This diff is collapsed.
master/bt5/vifib_invoicing/bt/license deleted 100644 → 0
View file @ 444a4321
This diff is collapsed.
master/bt5/vifib_invoicing/bt/maintainer_list deleted 100644 → 0
View file @ 444a4321
This diff is collapsed.
master/bt5/vifib_invoicing/bt/revision deleted 100644 → 0
View file @ 444a4321
This diff is collapsed.
master/bt5/vifib_invoicing/bt/template_path_list deleted 100644 → 0
View file @ 444a4321
This diff is collapsed.
master/bt5/vifib_invoicing/bt/template_skin_id_list deleted 100644 → 0
View file @ 444a4321
This diff is collapsed.
master/bt5/vifib_invoicing/bt/title deleted 100644 → 0
View file @ 444a4321
This diff is collapsed.
master/bt5/vifib_invoicing/bt/version deleted 100644 → 0
View file @ 444a4321
This diff is collapsed.
master/bt5/vifib_open_trade/bt/revision
View file @ 93109994
This diff is collapsed.
master/bt5/vifib_payzen/bt/revision
View file @ 93109994
This diff is collapsed.
master/bt5/vifib_slap/bt/revision
View file @ 93109994
This diff is collapsed.
master/bt5/vifib_slap/bt/template_path_list
View file @ 93109994
This diff is collapsed.
master/product/Vifib/Tool/CertificateAuthorityTool.py deleted 100644 → 0
View file @ 444a4321
This diff is collapsed.
master/product/Vifib/__init__.py
View file @ 93109994
This diff is collapsed.
master/product/Vifib/tests/VifibMixin.py
View file @ 93109994
This diff is collapsed.
master/product/Vifib/tests/testVifibOpenOrderSimulation.py 0 → 100644
View file @ 93109994
This diff is collapsed.
master/tests/__init__.py
View file @ 93109994
This diff is collapsed.
slapos/grid/slapgrid.py
View file @ 93109994
This diff is collapsed.
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