Replace vifib_open_trade with slapos_subscription.

master/bt5/slapos_erp5/bt/dependency_list

@@ -3,4 +3,5 @@ slapos_cloud
 slapos_slap_tool
 slapos_cache
 slapos_rest_api
-slapos_pdm
+slapos_pdm
\ No newline at end of file
+slapos_subscription
\ No newline at end of file

master/bt5/slapos_erp5/bt/revision

-28
+29
\ No newline at end of file

master/bt5/vifib_open_trade/LocalRolesTemplateItem/organisation_module/vifib_internet.xml → master/bt5/slapos_subscription/LocalRolesTemplateItem/organisation_module/vifib_internet.xml

 <local_roles_item>
  <local_roles>
-  <role id='F-PRODUCTION_G-COMPANY'>
+  <role id='G-COMPANY'>
    <item>Assignor</item>
   </role>
+  <role id='R-MEMBER'>
+   <item>Auditor</item>
+  </role>
   <role id='admin'>
    <item>Owner</item>
   </role>

master/bt5/vifib_open_trade/PathTemplateItem/organisation_module/vifib_internet.xml → master/bt5/slapos_subscription/PathTemplateItem/organisation_module/vifib_internet.xml

@@ -89,10 +89,6 @@
             <key> <string>id</string> </key>
             <value> <string>vifib_internet</string> </value>
         </item>
-        <item>
-            <key> <string>last_id</string> </key>
-            <value> <string>1</string> </value>
-        </item>
         <item>
             <key> <string>portal_type</string> </key>
             <value> <string>Organisation</string> </value>

master/bt5/vifib_open_trade/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml → master/bt5/slapos_subscription/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml

 <workflow_chain>
  <chain>
   <type>Purchase Packing List</type>
-  <workflow>vifib_open_order_interaction_workflow</workflow>
+  <workflow>slapos_open_order_interaction_workflow</workflow>
  </chain>
  <chain>
   <type>Subscription Item Root Simulation Rule</type>

master/bt5/vifib_open_trade/SkinTemplateItem/portal_skins/vifib_open_trade.xml → master/bt5/slapos_subscription/SkinTemplateItem/portal_skins/slapos_subscription.xml

@@ -35,7 +35,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>vifib_open_trade</string> </value>
+            <value> <string>slapos_subscription</string> </value>
         </item>
         <item>
             <key> <string>title</string> </key>

master/bt5/vifib_open_trade/WorkflowTemplateItem/portal_workflow/vifib_open_order_interaction_workflow.xml → master/bt5/slapos_subscription/WorkflowTemplateItem/portal_workflow/slapos_open_order_interaction_workflow.xml

@@ -30,7 +30,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>vifib_open_order_interaction_workflow</string> </value>
+            <value> <string>slapos_open_order_interaction_workflow</string> </value>
         </item>
         <item>
             <key> <string>manager_bypass</string> </key>
@@ -38,7 +38,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Vifib Open Order Interaction Workflow</string> </value>
+            <value> <string>SlapOS Open Order Interaction Workflow</string> </value>
         </item>
       </dictionary>
     </pickle>

master/bt5/slapos_subscription/bt/copyright_list

+2012 Nexedi SA
\ No newline at end of file

master/bt5/slapos_subscription/bt/description

+Subscription management for SlapOS.
\ No newline at end of file

master/bt5/slapos_subscription/bt/template_format_version

+1
\ No newline at end of file

master/bt5/vifib_open_trade/bt/template_portal_type_workflow_chain_list → master/bt5/slapos_subscription/bt/template_portal_type_workflow_chain_list

-Purchase Packing List | vifib_open_order_interaction_workflow
+Purchase Packing List | slapos_open_order_interaction_workflow
 Subscription Item Root Simulation Rule | edit_workflow
 Subscription Item Root Simulation Rule | rule_validation_workflow
\ No newline at end of file

master/bt5/slapos_subscription/bt/template_skin_id_list

+slapos_subscription
\ No newline at end of file

master/bt5/slapos_subscription/bt/template_workflow_id_list

+slapos_open_order_interaction_workflow
\ No newline at end of file

master/bt5/slapos_subscription/bt/title

+slapos_subscription
\ No newline at end of file

master/bt5/vifib_erp5/bt/dependency_list

@@ -17,7 +17,6 @@ slapos_category
 vifib_data_payzen
 vifib_data_simulation
 vifib_data_web
-vifib_open_trade
 vifib_payzen
 vifib_slap
 vifib_slapos_accounting

master/bt5/vifib_erp5/bt/revision

-536
+537
\ No newline at end of file

master/bt5/vifib_open_trade/PathTemplateItem/organisation_module/vifib_internet/default_address.xml

-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="Address" module="erp5.portal_type"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>categories</string> </key>
-            <value>
-              <tuple>
-                <string>region/europe/west/france</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>city</string> </key>
-            <value> <string>Paris</string> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>default_address</string> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Address</string> </value>
-        </item>
-        <item>
-            <key> <string>sid</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>street_address</string> </key>
-            <value> <string>59 rue Erlanger</string> </value>
-        </item>
-        <item>
-            <key> <string>zip_code</string> </key>
-            <value> <string>75016</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>

master/bt5/vifib_open_trade/PathTemplateItem/organisation_module/vifib_internet/default_email.xml

-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="Email" module="erp5.portal_type"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>default_email</string> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Email</string> </value>
-        </item>
-        <item>
-            <key> <string>sid</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>url_string</string> </key>
-            <value> <string>jp@nexedi.com</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>

master/bt5/vifib_open_trade/PathTemplateItem/organisation_module/vifib_internet/default_telephone.xml

-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="Telephone" module="erp5.portal_type"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>default_telephone</string> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Telephone</string> </value>
-        </item>
-        <item>
-            <key> <string>sid</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>telephone_area</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>telephone_city</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>telephone_country</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>telephone_extension</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>telephone_number</string> </key>
-            <value> <string>0629024425</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>

master/bt5/vifib_open_trade/bt/comment

-Still experimental.
\ No newline at end of file

master/bt5/vifib_open_trade/bt/copyright_list

-Nexedi SA
\ No newline at end of file

master/bt5/vifib_open_trade/bt/description

-This business template provides a framework for open orders in Vifib.
\ No newline at end of file

master/bt5/vifib_open_trade/bt/revision

-186
\ No newline at end of file

master/bt5/vifib_open_trade/bt/template_skin_id_list

-vifib_open_trade
\ No newline at end of file

master/bt5/vifib_open_trade/bt/template_workflow_id_list

-vifib_open_order_interaction_workflow
\ No newline at end of file

master/bt5/vifib_open_trade/bt/title

-vifib_open_trade
\ No newline at end of file

master/bt5/vifib_slap/bt/dependency_list

 vifib_base
-vifib_open_trade
+slapos_subscription
\ No newline at end of file

master/bt5/vifib_slap/bt/revision

-859
+860
\ No newline at end of file

master/bt5/vifib_upgrader/SkinTemplateItem/portal_skins/vifib_upgrader/ERP5Site_getUpgraderSignature.xml

@@ -122,6 +122,8 @@ REQUIRED_BT5_ID_LIST = (\n
   \'vifib_data\',\n
   \'vifib_data_web\',\n
   \'vifib_data_simulation\',\n
+  \'slapos_subscription\',\n
+  \'slapos_erp5\',\n
 )\n
 \n
 REINSTALLABLE_BT5_ID_LIST = ()\n

master/bt5/vifib_upgrader/bt/revision

-160
+161
\ No newline at end of file

master/product/SlapOS/tests/testSlapOSMixin.py

@@ -137,6 +137,7 @@ class testSlapOSMixin(Products.Vifib.tests.VifibMixin.testVifibMixin):
       'slapos_rest_api_tool_portal_type',
       'slapos_rest_api',
       'slapos_pdm',
+      'slapos_subscription',
       'slapos_erp5',
     ]
     return result

master/product/Vifib/tests/VifibMixin.py

@@ -93,7 +93,7 @@ class testVifibMixin(ERP5TypeTestCase):
       'erp5_accounting_l10n_fr',
       'erp5_web_shacache',
       'erp5_data_set',
-      'vifib_open_trade',
+      'slapos_subscription',
       'vifib_base',
       'erp5_workflow',
       'erp5_web_shadir',

master/product/Vifib/tests/testVifibSkinSelection.py

@@ -116,13 +116,13 @@ slapos_cloud
 slapos_core
 slapos_pdm
 slapos_rest_api
+slapos_subscription
 vifib_agent
 vifib_base
 vifib_cash
 vifib_core
 vifib_jauks_theme
 vifib_jauks_widget_library
-vifib_open_trade
 vifib_payzen
 vifib_promise
 vifib_simulation
@@ -223,13 +223,13 @@ slapos_cloud
 slapos_core
 slapos_pdm
 slapos_rest_api
+slapos_subscription
 vifib_agent
 vifib_base
 vifib_core
 vifib_hosting_theme
 vifib_jauks_theme
 vifib_jauks_widget_library
-vifib_open_trade
 vifib_payzen
 vifib_promise
 vifib_simulation
@@ -329,10 +329,10 @@ slapos_cloud
 slapos_core
 slapos_pdm
 slapos_rest_api
+slapos_subscription
 vifib_agent
 vifib_base
 vifib_core
-vifib_open_trade
 vifib_payzen
 vifib_promise
 vifib_simulation
@@ -429,10 +429,10 @@ slapos_cloud
 slapos_core
 slapos_pdm
 slapos_rest_api
+slapos_subscription
 vifib_agent
 vifib_base
 vifib_core
-vifib_open_trade
 vifib_payzen
 vifib_promise
 vifib_simulation
@@ -529,10 +529,10 @@ slapos_cloud
 slapos_core
 slapos_pdm
 slapos_rest_api
+slapos_subscription
 vifib_agent
 vifib_base
 vifib_core
-vifib_open_trade
 vifib_payzen
 vifib_promise
 vifib_simulation
@@ -632,10 +632,10 @@ slapos_cloud
 slapos_core
 slapos_pdm
 slapos_rest_api
+slapos_subscription
 vifib_agent
 vifib_base
 vifib_core
-vifib_open_trade
 vifib_payzen
 vifib_promise
 vifib_simulation
@@ -735,10 +735,10 @@ slapos_cloud
 slapos_core
 slapos_pdm
 slapos_rest_api
+slapos_subscription
 vifib_agent
 vifib_base
 vifib_core
-vifib_open_trade
 vifib_payzen
 vifib_promise
 vifib_simulation
@@ -835,10 +835,10 @@ slapos_cloud
 slapos_core
 slapos_pdm
 slapos_rest_api
+slapos_subscription
 vifib_agent
 vifib_base
 vifib_core
-vifib_open_trade
 vifib_payzen
 vifib_promise
 vifib_simulation
@@ -934,10 +934,10 @@ slapos_cloud
 slapos_core
 slapos_pdm
 slapos_rest_api
+slapos_subscription
 vifib_agent
 vifib_base
 vifib_core
-vifib_open_trade
 vifib_payzen
 vifib_promise
 vifib_simulation
@@ -1036,10 +1036,10 @@ slapos_cloud
 slapos_core
 slapos_pdm
 slapos_rest_api
+slapos_subscription
 vifib_agent
 vifib_base
 vifib_core
-vifib_open_trade
 vifib_payzen
 vifib_promise
 vifib_simulation

master/tests/__init__.py

@@ -12,7 +12,6 @@ class VIFIB(SavedTestSuite, ProjectTestSuite):
     'vifib_data_web',
     'slapos_erp5',
     'vifib_erp5',
-    'vifib_open_trade',
     'vifib_slap',
     'vifib_upgrader',
     'vifib_web',