From cacd3d2c0b8804342959e46e3b1c05d80544f5ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com>
Date: Mon, 12 Nov 2012 13:44:29 +0100
Subject: [PATCH] Rebrand Open Sale Order manipulation.
Switch to fully alarm based approach and drop Person.fixConsistency interaction,
which created Open Sale Order.
As Open Sale Order is optional and it is asserted by alarm drop
open_sale_order_related_constraint.
Rename script to follow naming conventions.
Rename slapos_subscription to slapos_accounting in order to follow modularity
if SlapOS Master.
---
.../Hosting%20Subscription/periodicity.xml | 0
.../unfiltered_tracking_list.xml | 0
.../view.xml | 0
.../SubscriptionItemRootSimulationRule.py | 0
.../organisation_module/vifib_internet.xml | 0
.../organisation_module/vifib_client_A.xml | 0
.../organisation_module/vifib_internet.xml | 0
.../organisation_module/vifib_internet/1.xml | 0
.../vifib_internet/bank_account.xml | 0
.../slapos_person_update_open_sale_order.xml} | 4 +-
.../vifib_purchase_trade_condition.xml | 0
.../vifib_trade_condition.xml | 0
.../vifib_trade_condition/1.xml | 0
.../test_software_product.xml | 0
.../test_software_release.xml | 0
.../allowed_content_types.xml | 0
...tion%20Item%20Root%20Simulation%20Rule.xml | 0
.../workflow_chain_type.xml | 0
.../portal_skins/slapos_accounting.xml} | 2 +-
.../Alarm_updatePersonOpenSaleOrder.xml} | 6 +-
.../Base_viewOpenTradeFieldLibrary.xml | 21 +++++
.../HostingSubscription_getRuleReference.xml | 0
...leOrderLine_getDefaultImageAbsoluteUrl.xml | 0
.../Person_getOpenSaleOrderDifference.xml} | 2 +-
.../Person_storeOpenSaleOrderJournal.xml} | 4 +-
.../Person_updateOpenSaleOrder.xml} | 8 +-
.../slapos_accounting}/Rule_testFalse.xml | 0
.../Rule_testMovementIsOrderRelated.xml | 0
.../Rule_testMovementIsPackingListRelated.xml | 0
...Service_getPriceCalculationOperandDict.xml | 0
...slapos_open_order_interaction_workflow.xml | 0
.../interactions.xml | 0
.../assert_purchase_trade_condition.xml | 0
.../scripts.xml | 0
...ery_assertCustomPurchaseTradeCondition.xml | 0
.../variables.xml | 0
.../worklists.xml | 0
.../bt/copyright_list | 0
.../bt/dependency_list | 0
master/bt5/slapos_accounting/bt/description | 1 +
.../bt/license | 0
master/bt5/slapos_accounting/bt/revision | 1 +
.../bt/template_action_path_list | 0
.../bt/template_document_id_list | 0
.../bt/template_format_version | 0
.../bt/template_keep_workflow_path_list | 0
.../bt/template_local_role_list | 0
.../bt/template_local_roles_list | 0
.../bt/template_path_list | 1 +
...late_portal_type_allowed_content_type_list | 0
.../bt/template_portal_type_id_list | 0
.../template_portal_type_workflow_chain_list | 0
.../bt/template_skin_id_list | 1 +
.../bt/template_workflow_id_list | 0
master/bt5/slapos_accounting/bt/title | 1 +
master/bt5/slapos_subscription/bt/description | 1 -
master/bt5/slapos_subscription/bt/revision | 1 -
.../bt/template_skin_id_list | 1 -
master/bt5/slapos_subscription/bt/title | 1 -
master/bt5/slapos_subscription/bt/version | 1 -
.../open_sale_order_related_constraint.xml | 92 -------------------
master/bt5/vifib_erp5/bt/revision | 2 +-
.../interactions/Person_fixConsistency.xml | 1 -
.../scripts/Person_createOpenOrder.xml | 68 --------------
master/bt5/vifib_slap/bt/dependency_list | 2 +-
master/bt5/vifib_slap/bt/revision | 2 +-
master/bt5/vifib_slap/bt/template_path_list | 1 -
.../ERP5Site_getUpgraderSignature.xml | 2 +-
master/bt5/vifib_upgrader/bt/revision | 2 +-
master/product/Vifib/tests/VifibMixin.py | 2 +-
master/tests/__init__.py | 2 +-
71 files changed, 46 insertions(+), 187 deletions(-)
rename master/bt5/{slapos_subscription => slapos_accounting}/ActionTemplateItem/portal_types/Hosting%20Subscription/periodicity.xml (100%)
rename master/bt5/{slapos_subscription => slapos_accounting}/ActionTemplateItem/portal_types/Hosting%20Subscription/unfiltered_tracking_list.xml (100%)
rename master/bt5/{slapos_subscription => slapos_accounting}/ActionTemplateItem/portal_types/Subscription%20Item%20Root%20Simulation%20Rule/view.xml (100%)
rename master/bt5/{slapos_subscription => slapos_accounting}/DocumentTemplateItem/SubscriptionItemRootSimulationRule.py (100%)
rename master/bt5/{slapos_subscription => slapos_accounting}/LocalRolesTemplateItem/organisation_module/vifib_internet.xml (100%)
rename master/bt5/{slapos_subscription => slapos_accounting}/PathTemplateItem/organisation_module/vifib_client_A.xml (100%)
rename master/bt5/{slapos_subscription => slapos_accounting}/PathTemplateItem/organisation_module/vifib_internet.xml (100%)
rename master/bt5/{slapos_subscription => slapos_accounting}/PathTemplateItem/organisation_module/vifib_internet/1.xml (100%)
rename master/bt5/{slapos_subscription => slapos_accounting}/PathTemplateItem/organisation_module/vifib_internet/bank_account.xml (100%)
rename master/bt5/{vifib_slap/PathTemplateItem/portal_alarms/vifib_person_update_open_order.xml => slapos_accounting/PathTemplateItem/portal_alarms/slapos_person_update_open_sale_order.xml} (93%)
rename master/bt5/{slapos_subscription => slapos_accounting}/PathTemplateItem/purchase_trade_condition_module/vifib_purchase_trade_condition.xml (100%)
rename master/bt5/{slapos_subscription => slapos_accounting}/PathTemplateItem/sale_trade_condition_module/vifib_trade_condition.xml (100%)
rename master/bt5/{slapos_subscription => slapos_accounting}/PathTemplateItem/sale_trade_condition_module/vifib_trade_condition/1.xml (100%)
rename master/bt5/{slapos_subscription => slapos_accounting}/PathTemplateItem/software_product_module/test_software_product.xml (100%)
rename master/bt5/{slapos_subscription => slapos_accounting}/PathTemplateItem/software_release_module/test_software_release.xml (100%)
rename master/bt5/{slapos_subscription => slapos_accounting}/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml (100%)
rename master/bt5/{slapos_subscription => slapos_accounting}/PortalTypeTemplateItem/portal_types/Subscription%20Item%20Root%20Simulation%20Rule.xml (100%)
rename master/bt5/{slapos_subscription => slapos_accounting}/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml (100%)
rename master/bt5/{slapos_subscription/SkinTemplateItem/portal_skins/slapos_subscription.xml => slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting.xml} (95%)
rename master/bt5/{vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/Alarm_updatePersonOpenOrder.xml => slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/Alarm_updatePersonOpenSaleOrder.xml} (94%)
rename master/bt5/{slapos_subscription/SkinTemplateItem/portal_skins/slapos_subscription => slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting}/Base_viewOpenTradeFieldLibrary.xml (82%)
rename master/bt5/{slapos_subscription/SkinTemplateItem/portal_skins/slapos_subscription => slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting}/HostingSubscription_getRuleReference.xml (100%)
rename master/bt5/{slapos_subscription/SkinTemplateItem/portal_skins/slapos_subscription => slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting}/OpenSaleOrderLine_getDefaultImageAbsoluteUrl.xml (100%)
rename master/bt5/{vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/Person_getOpenOrderDifference.xml => slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/Person_getOpenSaleOrderDifference.xml} (99%)
rename master/bt5/{vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/Person_storeOpenOrderJournal.xml => slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/Person_storeOpenSaleOrderJournal.xml} (94%)
rename master/bt5/{vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/Person_updateOpenOrder.xml => slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/Person_updateOpenSaleOrder.xml} (96%)
rename master/bt5/{slapos_subscription/SkinTemplateItem/portal_skins/slapos_subscription => slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting}/Rule_testFalse.xml (100%)
rename master/bt5/{slapos_subscription/SkinTemplateItem/portal_skins/slapos_subscription => slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting}/Rule_testMovementIsOrderRelated.xml (100%)
rename master/bt5/{slapos_subscription/SkinTemplateItem/portal_skins/slapos_subscription => slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting}/Rule_testMovementIsPackingListRelated.xml (100%)
rename master/bt5/{slapos_subscription/SkinTemplateItem/portal_skins/slapos_subscription => slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting}/Service_getPriceCalculationOperandDict.xml (100%)
rename master/bt5/{slapos_subscription => slapos_accounting}/WorkflowTemplateItem/portal_workflow/slapos_open_order_interaction_workflow.xml (100%)
rename master/bt5/{slapos_subscription => slapos_accounting}/WorkflowTemplateItem/portal_workflow/slapos_open_order_interaction_workflow/interactions.xml (100%)
rename master/bt5/{slapos_subscription => slapos_accounting}/WorkflowTemplateItem/portal_workflow/slapos_open_order_interaction_workflow/interactions/assert_purchase_trade_condition.xml (100%)
rename master/bt5/{slapos_subscription => slapos_accounting}/WorkflowTemplateItem/portal_workflow/slapos_open_order_interaction_workflow/scripts.xml (100%)
rename master/bt5/{slapos_subscription => slapos_accounting}/WorkflowTemplateItem/portal_workflow/slapos_open_order_interaction_workflow/scripts/Delivery_assertCustomPurchaseTradeCondition.xml (100%)
rename master/bt5/{slapos_subscription => slapos_accounting}/WorkflowTemplateItem/portal_workflow/slapos_open_order_interaction_workflow/variables.xml (100%)
rename master/bt5/{slapos_subscription => slapos_accounting}/WorkflowTemplateItem/portal_workflow/slapos_open_order_interaction_workflow/worklists.xml (100%)
rename master/bt5/{slapos_subscription => slapos_accounting}/bt/copyright_list (100%)
rename master/bt5/{slapos_subscription => slapos_accounting}/bt/dependency_list (100%)
create mode 100644 master/bt5/slapos_accounting/bt/description
rename master/bt5/{slapos_subscription => slapos_accounting}/bt/license (100%)
create mode 100644 master/bt5/slapos_accounting/bt/revision
rename master/bt5/{slapos_subscription => slapos_accounting}/bt/template_action_path_list (100%)
rename master/bt5/{slapos_subscription => slapos_accounting}/bt/template_document_id_list (100%)
rename master/bt5/{slapos_subscription => slapos_accounting}/bt/template_format_version (100%)
rename master/bt5/{slapos_subscription => slapos_accounting}/bt/template_keep_workflow_path_list (100%)
rename master/bt5/{slapos_subscription => slapos_accounting}/bt/template_local_role_list (100%)
rename master/bt5/{slapos_subscription => slapos_accounting}/bt/template_local_roles_list (100%)
rename master/bt5/{slapos_subscription => slapos_accounting}/bt/template_path_list (85%)
rename master/bt5/{slapos_subscription => slapos_accounting}/bt/template_portal_type_allowed_content_type_list (100%)
rename master/bt5/{slapos_subscription => slapos_accounting}/bt/template_portal_type_id_list (100%)
rename master/bt5/{slapos_subscription => slapos_accounting}/bt/template_portal_type_workflow_chain_list (100%)
create mode 100644 master/bt5/slapos_accounting/bt/template_skin_id_list
rename master/bt5/{slapos_subscription => slapos_accounting}/bt/template_workflow_id_list (100%)
create mode 100644 master/bt5/slapos_accounting/bt/title
delete mode 100644 master/bt5/slapos_subscription/bt/description
delete mode 100644 master/bt5/slapos_subscription/bt/revision
delete mode 100644 master/bt5/slapos_subscription/bt/template_skin_id_list
delete mode 100644 master/bt5/slapos_subscription/bt/title
delete mode 100644 master/bt5/slapos_subscription/bt/version
delete mode 100644 master/bt5/vifib_erp5/PropertySheetTemplateItem/portal_property_sheets/VifibPersonConstraint/open_sale_order_related_constraint.xml
delete mode 100644 master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/slap_interaction_workflow/scripts/Person_createOpenOrder.xml
diff --git a/master/bt5/slapos_subscription/ActionTemplateItem/portal_types/Hosting%20Subscription/periodicity.xml b/master/bt5/slapos_accounting/ActionTemplateItem/portal_types/Hosting%20Subscription/periodicity.xml
similarity index 100%
rename from master/bt5/slapos_subscription/ActionTemplateItem/portal_types/Hosting%20Subscription/periodicity.xml
rename to master/bt5/slapos_accounting/ActionTemplateItem/portal_types/Hosting%20Subscription/periodicity.xml
diff --git a/master/bt5/slapos_subscription/ActionTemplateItem/portal_types/Hosting%20Subscription/unfiltered_tracking_list.xml b/master/bt5/slapos_accounting/ActionTemplateItem/portal_types/Hosting%20Subscription/unfiltered_tracking_list.xml
similarity index 100%
rename from master/bt5/slapos_subscription/ActionTemplateItem/portal_types/Hosting%20Subscription/unfiltered_tracking_list.xml
rename to master/bt5/slapos_accounting/ActionTemplateItem/portal_types/Hosting%20Subscription/unfiltered_tracking_list.xml
diff --git a/master/bt5/slapos_subscription/ActionTemplateItem/portal_types/Subscription%20Item%20Root%20Simulation%20Rule/view.xml b/master/bt5/slapos_accounting/ActionTemplateItem/portal_types/Subscription%20Item%20Root%20Simulation%20Rule/view.xml
similarity index 100%
rename from master/bt5/slapos_subscription/ActionTemplateItem/portal_types/Subscription%20Item%20Root%20Simulation%20Rule/view.xml
rename to master/bt5/slapos_accounting/ActionTemplateItem/portal_types/Subscription%20Item%20Root%20Simulation%20Rule/view.xml
diff --git a/master/bt5/slapos_subscription/DocumentTemplateItem/SubscriptionItemRootSimulationRule.py b/master/bt5/slapos_accounting/DocumentTemplateItem/SubscriptionItemRootSimulationRule.py
similarity index 100%
rename from master/bt5/slapos_subscription/DocumentTemplateItem/SubscriptionItemRootSimulationRule.py
rename to master/bt5/slapos_accounting/DocumentTemplateItem/SubscriptionItemRootSimulationRule.py
diff --git a/master/bt5/slapos_subscription/LocalRolesTemplateItem/organisation_module/vifib_internet.xml b/master/bt5/slapos_accounting/LocalRolesTemplateItem/organisation_module/vifib_internet.xml
similarity index 100%
rename from master/bt5/slapos_subscription/LocalRolesTemplateItem/organisation_module/vifib_internet.xml
rename to master/bt5/slapos_accounting/LocalRolesTemplateItem/organisation_module/vifib_internet.xml
diff --git a/master/bt5/slapos_subscription/PathTemplateItem/organisation_module/vifib_client_A.xml b/master/bt5/slapos_accounting/PathTemplateItem/organisation_module/vifib_client_A.xml
similarity index 100%
rename from master/bt5/slapos_subscription/PathTemplateItem/organisation_module/vifib_client_A.xml
rename to master/bt5/slapos_accounting/PathTemplateItem/organisation_module/vifib_client_A.xml
diff --git a/master/bt5/slapos_subscription/PathTemplateItem/organisation_module/vifib_internet.xml b/master/bt5/slapos_accounting/PathTemplateItem/organisation_module/vifib_internet.xml
similarity index 100%
rename from master/bt5/slapos_subscription/PathTemplateItem/organisation_module/vifib_internet.xml
rename to master/bt5/slapos_accounting/PathTemplateItem/organisation_module/vifib_internet.xml
diff --git a/master/bt5/slapos_subscription/PathTemplateItem/organisation_module/vifib_internet/1.xml b/master/bt5/slapos_accounting/PathTemplateItem/organisation_module/vifib_internet/1.xml
similarity index 100%
rename from master/bt5/slapos_subscription/PathTemplateItem/organisation_module/vifib_internet/1.xml
rename to master/bt5/slapos_accounting/PathTemplateItem/organisation_module/vifib_internet/1.xml
diff --git a/master/bt5/slapos_subscription/PathTemplateItem/organisation_module/vifib_internet/bank_account.xml b/master/bt5/slapos_accounting/PathTemplateItem/organisation_module/vifib_internet/bank_account.xml
similarity index 100%
rename from master/bt5/slapos_subscription/PathTemplateItem/organisation_module/vifib_internet/bank_account.xml
rename to master/bt5/slapos_accounting/PathTemplateItem/organisation_module/vifib_internet/bank_account.xml
diff --git a/master/bt5/vifib_slap/PathTemplateItem/portal_alarms/vifib_person_update_open_order.xml b/master/bt5/slapos_accounting/PathTemplateItem/portal_alarms/slapos_person_update_open_sale_order.xml
similarity index 93%
rename from master/bt5/vifib_slap/PathTemplateItem/portal_alarms/vifib_person_update_open_order.xml
rename to master/bt5/slapos_accounting/PathTemplateItem/portal_alarms/slapos_person_update_open_sale_order.xml
index b20cf2cb5..02a4041a9 100644
--- a/master/bt5/vifib_slap/PathTemplateItem/portal_alarms/vifib_person_update_open_order.xml
+++ b/master/bt5/slapos_accounting/PathTemplateItem/portal_alarms/slapos_person_update_open_sale_order.xml
@@ -8,7 +8,7 @@
<dictionary>
<item>
<key> <string>active_sense_method_id</string> </key>
- <value> <string>Alarm_updatePersonOpenOrder</string> </value>
+ <value> <string>Alarm_updatePersonOpenSaleOrder</string> </value>
</item>
<item>
<key> <string>description</string> </key>
@@ -22,7 +22,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>vifib_person_update_open_order</string> </value>
+ <value> <string>slapos_person_update_open_sale_order</string> </value>
</item>
<item>
<key> <string>periodicity_hour</string> </key>
diff --git a/master/bt5/slapos_subscription/PathTemplateItem/purchase_trade_condition_module/vifib_purchase_trade_condition.xml b/master/bt5/slapos_accounting/PathTemplateItem/purchase_trade_condition_module/vifib_purchase_trade_condition.xml
similarity index 100%
rename from master/bt5/slapos_subscription/PathTemplateItem/purchase_trade_condition_module/vifib_purchase_trade_condition.xml
rename to master/bt5/slapos_accounting/PathTemplateItem/purchase_trade_condition_module/vifib_purchase_trade_condition.xml
diff --git a/master/bt5/slapos_subscription/PathTemplateItem/sale_trade_condition_module/vifib_trade_condition.xml b/master/bt5/slapos_accounting/PathTemplateItem/sale_trade_condition_module/vifib_trade_condition.xml
similarity index 100%
rename from master/bt5/slapos_subscription/PathTemplateItem/sale_trade_condition_module/vifib_trade_condition.xml
rename to master/bt5/slapos_accounting/PathTemplateItem/sale_trade_condition_module/vifib_trade_condition.xml
diff --git a/master/bt5/slapos_subscription/PathTemplateItem/sale_trade_condition_module/vifib_trade_condition/1.xml b/master/bt5/slapos_accounting/PathTemplateItem/sale_trade_condition_module/vifib_trade_condition/1.xml
similarity index 100%
rename from master/bt5/slapos_subscription/PathTemplateItem/sale_trade_condition_module/vifib_trade_condition/1.xml
rename to master/bt5/slapos_accounting/PathTemplateItem/sale_trade_condition_module/vifib_trade_condition/1.xml
diff --git a/master/bt5/slapos_subscription/PathTemplateItem/software_product_module/test_software_product.xml b/master/bt5/slapos_accounting/PathTemplateItem/software_product_module/test_software_product.xml
similarity index 100%
rename from master/bt5/slapos_subscription/PathTemplateItem/software_product_module/test_software_product.xml
rename to master/bt5/slapos_accounting/PathTemplateItem/software_product_module/test_software_product.xml
diff --git a/master/bt5/slapos_subscription/PathTemplateItem/software_release_module/test_software_release.xml b/master/bt5/slapos_accounting/PathTemplateItem/software_release_module/test_software_release.xml
similarity index 100%
rename from master/bt5/slapos_subscription/PathTemplateItem/software_release_module/test_software_release.xml
rename to master/bt5/slapos_accounting/PathTemplateItem/software_release_module/test_software_release.xml
diff --git a/master/bt5/slapos_subscription/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml b/master/bt5/slapos_accounting/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
similarity index 100%
rename from master/bt5/slapos_subscription/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
rename to master/bt5/slapos_accounting/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
diff --git a/master/bt5/slapos_subscription/PortalTypeTemplateItem/portal_types/Subscription%20Item%20Root%20Simulation%20Rule.xml b/master/bt5/slapos_accounting/PortalTypeTemplateItem/portal_types/Subscription%20Item%20Root%20Simulation%20Rule.xml
similarity index 100%
rename from master/bt5/slapos_subscription/PortalTypeTemplateItem/portal_types/Subscription%20Item%20Root%20Simulation%20Rule.xml
rename to master/bt5/slapos_accounting/PortalTypeTemplateItem/portal_types/Subscription%20Item%20Root%20Simulation%20Rule.xml
diff --git a/master/bt5/slapos_subscription/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml b/master/bt5/slapos_accounting/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
similarity index 100%
rename from master/bt5/slapos_subscription/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
rename to master/bt5/slapos_accounting/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
diff --git a/master/bt5/slapos_subscription/SkinTemplateItem/portal_skins/slapos_subscription.xml b/master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting.xml
similarity index 95%
rename from master/bt5/slapos_subscription/SkinTemplateItem/portal_skins/slapos_subscription.xml
rename to master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting.xml
index a88a9f72e..3b1588dfc 100644
--- a/master/bt5/slapos_subscription/SkinTemplateItem/portal_skins/slapos_subscription.xml
+++ b/master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting.xml
@@ -35,7 +35,7 @@
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>slapos_subscription</string> </value>
+ <value> <string>slapos_accounting</string> </value>
</item>
<item>
<key> <string>title</string> </key>
diff --git a/master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/Alarm_updatePersonOpenOrder.xml b/master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/Alarm_updatePersonOpenSaleOrder.xml
similarity index 94%
rename from master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/Alarm_updatePersonOpenOrder.xml
rename to master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/Alarm_updatePersonOpenSaleOrder.xml
index 657b8c030..a9590ac64 100644
--- a/master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/Alarm_updatePersonOpenOrder.xml
+++ b/master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/Alarm_updatePersonOpenSaleOrder.xml
@@ -67,10 +67,10 @@ if last_active_process is not None and not(params.get(\'full\', False)):\n
context.newActiveProcess()\n
\n
context.getPortalObject().portal_catalog.searchAndActivate(\n
- method_id=\'Person_storeOpenOrderJournal\',\n
+ method_id=\'Person_storeOpenSaleOrderJournal\',\n
method_kw={\'modification_date\': kw.get(\'modification_date\'), \'tag\': tag, \'stop_date\': params.get(\'stop_date\')},\n
activate_kw={\'tag\': tag},\n
- packet_size=1, # Person_storeOpenOrderJournal generates big transactions\n
+ packet_size=1, # Person_storeOpenSaleOrderJournal generates big transactions\n
portal_type=\'Person\',\n
**search_kw\n
)\n
@@ -84,7 +84,7 @@ context.activate(after_tag=tag).getId()\n
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>Alarm_updatePersonOpenOrder</string> </value>
+ <value> <string>Alarm_updatePersonOpenSaleOrder</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/master/bt5/slapos_subscription/SkinTemplateItem/portal_skins/slapos_subscription/Base_viewOpenTradeFieldLibrary.xml b/master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/Base_viewOpenTradeFieldLibrary.xml
similarity index 82%
rename from master/bt5/slapos_subscription/SkinTemplateItem/portal_skins/slapos_subscription/Base_viewOpenTradeFieldLibrary.xml
rename to master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/Base_viewOpenTradeFieldLibrary.xml
index f21135983..e61ecc6ee 100644
--- a/master/bt5/slapos_subscription/SkinTemplateItem/portal_skins/slapos_subscription/Base_viewOpenTradeFieldLibrary.xml
+++ b/master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/Base_viewOpenTradeFieldLibrary.xml
@@ -6,6 +6,27 @@
</pickle>
<pickle>
<dictionary>
+ <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/>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
<item>
<key> <string>action</string> </key>
<value> <string></string> </value>
diff --git a/master/bt5/slapos_subscription/SkinTemplateItem/portal_skins/slapos_subscription/HostingSubscription_getRuleReference.xml b/master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/HostingSubscription_getRuleReference.xml
similarity index 100%
rename from master/bt5/slapos_subscription/SkinTemplateItem/portal_skins/slapos_subscription/HostingSubscription_getRuleReference.xml
rename to master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/HostingSubscription_getRuleReference.xml
diff --git a/master/bt5/slapos_subscription/SkinTemplateItem/portal_skins/slapos_subscription/OpenSaleOrderLine_getDefaultImageAbsoluteUrl.xml b/master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/OpenSaleOrderLine_getDefaultImageAbsoluteUrl.xml
similarity index 100%
rename from master/bt5/slapos_subscription/SkinTemplateItem/portal_skins/slapos_subscription/OpenSaleOrderLine_getDefaultImageAbsoluteUrl.xml
rename to master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/OpenSaleOrderLine_getDefaultImageAbsoluteUrl.xml
diff --git a/master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/Person_getOpenOrderDifference.xml b/master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/Person_getOpenSaleOrderDifference.xml
similarity index 99%
rename from master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/Person_getOpenOrderDifference.xml
rename to master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/Person_getOpenSaleOrderDifference.xml
index 97183baeb..c70fa90c1 100644
--- a/master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/Person_getOpenOrderDifference.xml
+++ b/master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/Person_getOpenSaleOrderDifference.xml
@@ -179,7 +179,7 @@ return add_kw_kw, modify_kw_kw, list(remove_id_list)\n
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>Person_getOpenOrderDifference</string> </value>
+ <value> <string>Person_getOpenSaleOrderDifference</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/Person_storeOpenOrderJournal.xml b/master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/Person_storeOpenSaleOrderJournal.xml
similarity index 94%
rename from master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/Person_storeOpenOrderJournal.xml
rename to master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/Person_storeOpenSaleOrderJournal.xml
index 77a179744..fed6b04d7 100644
--- a/master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/Person_storeOpenOrderJournal.xml
+++ b/master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/Person_storeOpenSaleOrderJournal.xml
@@ -102,7 +102,7 @@ for hosting_subscription in portal.portal_catalog(\n
start_date_tuple_list.append((hosting_subscription.getRelativeUrl(), start_date, hosting_subscription.getPath()))\n
\n
\n
-result = context.Person_updateOpenOrder(src__=src__, remove_hosting_list=remove_hosting_list, add_kw_list=add_kw_list, start_date_tuple_list=start_date_tuple_list, stop_date=stop_date)\n
+result = context.Person_updateOpenSaleOrder(src__=src__, remove_hosting_list=remove_hosting_list, add_kw_list=add_kw_list, start_date_tuple_list=start_date_tuple_list, stop_date=stop_date)\n
from pprint import pformat\n
return pformat(result)\n
</string> </value>
@@ -113,7 +113,7 @@ return pformat(result)\n
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>Person_storeOpenOrderJournal</string> </value>
+ <value> <string>Person_storeOpenSaleOrderJournal</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/Person_updateOpenOrder.xml b/master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/Person_updateOpenSaleOrder.xml
similarity index 96%
rename from master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/Person_updateOpenOrder.xml
rename to master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/Person_updateOpenSaleOrder.xml
index 6fbb9ee56..f8ecf5ccb 100644
--- a/master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/Person_updateOpenOrder.xml
+++ b/master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/Person_updateOpenSaleOrder.xml
@@ -56,7 +56,7 @@ from DateTime import DateTime\n
\n
person = context\n
portal = person.getPortalObject()\n
-tag = \'%s_updateOpenOrder\' % person.getUid()\n
+tag = \'%s_updateOpenSaleOrder\' % person.getUid()\n
activate_kw = {\'tag\': tag}\n
if portal.portal_activities.countMessageWithTag(tag) > 0:\n
# nothing to do\n
@@ -65,7 +65,7 @@ if portal.portal_activities.countMessageWithTag(tag) > 0:\n
def storeWorkflowComment(document, comment):\n
portal.portal_workflow.doActionFor(document, \'edit_action\', comment=comment)\n
\n
-add_kw_kw, modify_kw_kw, remove_id_list = context.Person_getOpenOrderDifference(\n
+add_kw_kw, modify_kw_kw, remove_id_list = context.Person_getOpenSaleOrderDifference(\n
remove_hosting_list=remove_hosting_list, add_kw_list=add_kw_list,\n
stop_date=stop_date, start_date_tuple_list=start_date_tuple_list)\n
\n
@@ -87,7 +87,7 @@ if previous_open_sale_order is None:\n
destination=person.getRelativeUrl(),\n
price_currency=\'currency_module/EUR\',\n
specialise=\'sale_trade_condition_module/vifib_trade_condition\',\n
- title="ViFiB Open Order",\n
+ title="SlapOS Subscription Open Sale Order",\n
effective_date=now,\n
activate_kw=activate_kw)\n
open_sale_order.order(activate_kw=activate_kw)\n
@@ -133,7 +133,7 @@ return add_kw_kw, modify_kw_kw, remove_id_list\n
</item>
<item>
<key> <string>id</string> </key>
- <value> <string>Person_updateOpenOrder</string> </value>
+ <value> <string>Person_updateOpenSaleOrder</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/master/bt5/slapos_subscription/SkinTemplateItem/portal_skins/slapos_subscription/Rule_testFalse.xml b/master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/Rule_testFalse.xml
similarity index 100%
rename from master/bt5/slapos_subscription/SkinTemplateItem/portal_skins/slapos_subscription/Rule_testFalse.xml
rename to master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/Rule_testFalse.xml
diff --git a/master/bt5/slapos_subscription/SkinTemplateItem/portal_skins/slapos_subscription/Rule_testMovementIsOrderRelated.xml b/master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/Rule_testMovementIsOrderRelated.xml
similarity index 100%
rename from master/bt5/slapos_subscription/SkinTemplateItem/portal_skins/slapos_subscription/Rule_testMovementIsOrderRelated.xml
rename to master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/Rule_testMovementIsOrderRelated.xml
diff --git a/master/bt5/slapos_subscription/SkinTemplateItem/portal_skins/slapos_subscription/Rule_testMovementIsPackingListRelated.xml b/master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/Rule_testMovementIsPackingListRelated.xml
similarity index 100%
rename from master/bt5/slapos_subscription/SkinTemplateItem/portal_skins/slapos_subscription/Rule_testMovementIsPackingListRelated.xml
rename to master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/Rule_testMovementIsPackingListRelated.xml
diff --git a/master/bt5/slapos_subscription/SkinTemplateItem/portal_skins/slapos_subscription/Service_getPriceCalculationOperandDict.xml b/master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/Service_getPriceCalculationOperandDict.xml
similarity index 100%
rename from master/bt5/slapos_subscription/SkinTemplateItem/portal_skins/slapos_subscription/Service_getPriceCalculationOperandDict.xml
rename to master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/Service_getPriceCalculationOperandDict.xml
diff --git a/master/bt5/slapos_subscription/WorkflowTemplateItem/portal_workflow/slapos_open_order_interaction_workflow.xml b/master/bt5/slapos_accounting/WorkflowTemplateItem/portal_workflow/slapos_open_order_interaction_workflow.xml
similarity index 100%
rename from master/bt5/slapos_subscription/WorkflowTemplateItem/portal_workflow/slapos_open_order_interaction_workflow.xml
rename to master/bt5/slapos_accounting/WorkflowTemplateItem/portal_workflow/slapos_open_order_interaction_workflow.xml
diff --git a/master/bt5/slapos_subscription/WorkflowTemplateItem/portal_workflow/slapos_open_order_interaction_workflow/interactions.xml b/master/bt5/slapos_accounting/WorkflowTemplateItem/portal_workflow/slapos_open_order_interaction_workflow/interactions.xml
similarity index 100%
rename from master/bt5/slapos_subscription/WorkflowTemplateItem/portal_workflow/slapos_open_order_interaction_workflow/interactions.xml
rename to master/bt5/slapos_accounting/WorkflowTemplateItem/portal_workflow/slapos_open_order_interaction_workflow/interactions.xml
diff --git a/master/bt5/slapos_subscription/WorkflowTemplateItem/portal_workflow/slapos_open_order_interaction_workflow/interactions/assert_purchase_trade_condition.xml b/master/bt5/slapos_accounting/WorkflowTemplateItem/portal_workflow/slapos_open_order_interaction_workflow/interactions/assert_purchase_trade_condition.xml
similarity index 100%
rename from master/bt5/slapos_subscription/WorkflowTemplateItem/portal_workflow/slapos_open_order_interaction_workflow/interactions/assert_purchase_trade_condition.xml
rename to master/bt5/slapos_accounting/WorkflowTemplateItem/portal_workflow/slapos_open_order_interaction_workflow/interactions/assert_purchase_trade_condition.xml
diff --git a/master/bt5/slapos_subscription/WorkflowTemplateItem/portal_workflow/slapos_open_order_interaction_workflow/scripts.xml b/master/bt5/slapos_accounting/WorkflowTemplateItem/portal_workflow/slapos_open_order_interaction_workflow/scripts.xml
similarity index 100%
rename from master/bt5/slapos_subscription/WorkflowTemplateItem/portal_workflow/slapos_open_order_interaction_workflow/scripts.xml
rename to master/bt5/slapos_accounting/WorkflowTemplateItem/portal_workflow/slapos_open_order_interaction_workflow/scripts.xml
diff --git a/master/bt5/slapos_subscription/WorkflowTemplateItem/portal_workflow/slapos_open_order_interaction_workflow/scripts/Delivery_assertCustomPurchaseTradeCondition.xml b/master/bt5/slapos_accounting/WorkflowTemplateItem/portal_workflow/slapos_open_order_interaction_workflow/scripts/Delivery_assertCustomPurchaseTradeCondition.xml
similarity index 100%
rename from master/bt5/slapos_subscription/WorkflowTemplateItem/portal_workflow/slapos_open_order_interaction_workflow/scripts/Delivery_assertCustomPurchaseTradeCondition.xml
rename to master/bt5/slapos_accounting/WorkflowTemplateItem/portal_workflow/slapos_open_order_interaction_workflow/scripts/Delivery_assertCustomPurchaseTradeCondition.xml
diff --git a/master/bt5/slapos_subscription/WorkflowTemplateItem/portal_workflow/slapos_open_order_interaction_workflow/variables.xml b/master/bt5/slapos_accounting/WorkflowTemplateItem/portal_workflow/slapos_open_order_interaction_workflow/variables.xml
similarity index 100%
rename from master/bt5/slapos_subscription/WorkflowTemplateItem/portal_workflow/slapos_open_order_interaction_workflow/variables.xml
rename to master/bt5/slapos_accounting/WorkflowTemplateItem/portal_workflow/slapos_open_order_interaction_workflow/variables.xml
diff --git a/master/bt5/slapos_subscription/WorkflowTemplateItem/portal_workflow/slapos_open_order_interaction_workflow/worklists.xml b/master/bt5/slapos_accounting/WorkflowTemplateItem/portal_workflow/slapos_open_order_interaction_workflow/worklists.xml
similarity index 100%
rename from master/bt5/slapos_subscription/WorkflowTemplateItem/portal_workflow/slapos_open_order_interaction_workflow/worklists.xml
rename to master/bt5/slapos_accounting/WorkflowTemplateItem/portal_workflow/slapos_open_order_interaction_workflow/worklists.xml
diff --git a/master/bt5/slapos_subscription/bt/copyright_list b/master/bt5/slapos_accounting/bt/copyright_list
similarity index 100%
rename from master/bt5/slapos_subscription/bt/copyright_list
rename to master/bt5/slapos_accounting/bt/copyright_list
diff --git a/master/bt5/slapos_subscription/bt/dependency_list b/master/bt5/slapos_accounting/bt/dependency_list
similarity index 100%
rename from master/bt5/slapos_subscription/bt/dependency_list
rename to master/bt5/slapos_accounting/bt/dependency_list
diff --git a/master/bt5/slapos_accounting/bt/description b/master/bt5/slapos_accounting/bt/description
new file mode 100644
index 000000000..67e37c694
--- /dev/null
+++ b/master/bt5/slapos_accounting/bt/description
@@ -0,0 +1 @@
+Accounting for SlapOS Master.
\ No newline at end of file
diff --git a/master/bt5/slapos_subscription/bt/license b/master/bt5/slapos_accounting/bt/license
similarity index 100%
rename from master/bt5/slapos_subscription/bt/license
rename to master/bt5/slapos_accounting/bt/license
diff --git a/master/bt5/slapos_accounting/bt/revision b/master/bt5/slapos_accounting/bt/revision
new file mode 100644
index 000000000..d8263ee98
--- /dev/null
+++ b/master/bt5/slapos_accounting/bt/revision
@@ -0,0 +1 @@
+2
\ No newline at end of file
diff --git a/master/bt5/slapos_subscription/bt/template_action_path_list b/master/bt5/slapos_accounting/bt/template_action_path_list
similarity index 100%
rename from master/bt5/slapos_subscription/bt/template_action_path_list
rename to master/bt5/slapos_accounting/bt/template_action_path_list
diff --git a/master/bt5/slapos_subscription/bt/template_document_id_list b/master/bt5/slapos_accounting/bt/template_document_id_list
similarity index 100%
rename from master/bt5/slapos_subscription/bt/template_document_id_list
rename to master/bt5/slapos_accounting/bt/template_document_id_list
diff --git a/master/bt5/slapos_subscription/bt/template_format_version b/master/bt5/slapos_accounting/bt/template_format_version
similarity index 100%
rename from master/bt5/slapos_subscription/bt/template_format_version
rename to master/bt5/slapos_accounting/bt/template_format_version
diff --git a/master/bt5/slapos_subscription/bt/template_keep_workflow_path_list b/master/bt5/slapos_accounting/bt/template_keep_workflow_path_list
similarity index 100%
rename from master/bt5/slapos_subscription/bt/template_keep_workflow_path_list
rename to master/bt5/slapos_accounting/bt/template_keep_workflow_path_list
diff --git a/master/bt5/slapos_subscription/bt/template_local_role_list b/master/bt5/slapos_accounting/bt/template_local_role_list
similarity index 100%
rename from master/bt5/slapos_subscription/bt/template_local_role_list
rename to master/bt5/slapos_accounting/bt/template_local_role_list
diff --git a/master/bt5/slapos_subscription/bt/template_local_roles_list b/master/bt5/slapos_accounting/bt/template_local_roles_list
similarity index 100%
rename from master/bt5/slapos_subscription/bt/template_local_roles_list
rename to master/bt5/slapos_accounting/bt/template_local_roles_list
diff --git a/master/bt5/slapos_subscription/bt/template_path_list b/master/bt5/slapos_accounting/bt/template_path_list
similarity index 85%
rename from master/bt5/slapos_subscription/bt/template_path_list
rename to master/bt5/slapos_accounting/bt/template_path_list
index ff41d2321..da852b39e 100644
--- a/master/bt5/slapos_subscription/bt/template_path_list
+++ b/master/bt5/slapos_accounting/bt/template_path_list
@@ -3,6 +3,7 @@ organisation_module/vifib_client_A/**
organisation_module/vifib_internet
organisation_module/vifib_internet/1
organisation_module/vifib_internet/bank_account
+portal_alarms/slapos_person_update_open_sale_order
purchase_trade_condition_module/vifib_purchase_trade_condition
purchase_trade_condition_module/vifib_purchase_trade_condition/**
sale_trade_condition_module/vifib_trade_condition
diff --git a/master/bt5/slapos_subscription/bt/template_portal_type_allowed_content_type_list b/master/bt5/slapos_accounting/bt/template_portal_type_allowed_content_type_list
similarity index 100%
rename from master/bt5/slapos_subscription/bt/template_portal_type_allowed_content_type_list
rename to master/bt5/slapos_accounting/bt/template_portal_type_allowed_content_type_list
diff --git a/master/bt5/slapos_subscription/bt/template_portal_type_id_list b/master/bt5/slapos_accounting/bt/template_portal_type_id_list
similarity index 100%
rename from master/bt5/slapos_subscription/bt/template_portal_type_id_list
rename to master/bt5/slapos_accounting/bt/template_portal_type_id_list
diff --git a/master/bt5/slapos_subscription/bt/template_portal_type_workflow_chain_list b/master/bt5/slapos_accounting/bt/template_portal_type_workflow_chain_list
similarity index 100%
rename from master/bt5/slapos_subscription/bt/template_portal_type_workflow_chain_list
rename to master/bt5/slapos_accounting/bt/template_portal_type_workflow_chain_list
diff --git a/master/bt5/slapos_accounting/bt/template_skin_id_list b/master/bt5/slapos_accounting/bt/template_skin_id_list
new file mode 100644
index 000000000..f817726fd
--- /dev/null
+++ b/master/bt5/slapos_accounting/bt/template_skin_id_list
@@ -0,0 +1 @@
+slapos_accounting
\ No newline at end of file
diff --git a/master/bt5/slapos_subscription/bt/template_workflow_id_list b/master/bt5/slapos_accounting/bt/template_workflow_id_list
similarity index 100%
rename from master/bt5/slapos_subscription/bt/template_workflow_id_list
rename to master/bt5/slapos_accounting/bt/template_workflow_id_list
diff --git a/master/bt5/slapos_accounting/bt/title b/master/bt5/slapos_accounting/bt/title
new file mode 100644
index 000000000..f817726fd
--- /dev/null
+++ b/master/bt5/slapos_accounting/bt/title
@@ -0,0 +1 @@
+slapos_accounting
\ No newline at end of file
diff --git a/master/bt5/slapos_subscription/bt/description b/master/bt5/slapos_subscription/bt/description
deleted file mode 100644
index a4fc74592..000000000
--- a/master/bt5/slapos_subscription/bt/description
+++ /dev/null
@@ -1 +0,0 @@
-Subscription management for SlapOS.
\ No newline at end of file
diff --git a/master/bt5/slapos_subscription/bt/revision b/master/bt5/slapos_subscription/bt/revision
deleted file mode 100644
index e440e5c84..000000000
--- a/master/bt5/slapos_subscription/bt/revision
+++ /dev/null
@@ -1 +0,0 @@
-3
\ No newline at end of file
diff --git a/master/bt5/slapos_subscription/bt/template_skin_id_list b/master/bt5/slapos_subscription/bt/template_skin_id_list
deleted file mode 100644
index 5a73aaaae..000000000
--- a/master/bt5/slapos_subscription/bt/template_skin_id_list
+++ /dev/null
@@ -1 +0,0 @@
-slapos_subscription
\ No newline at end of file
diff --git a/master/bt5/slapos_subscription/bt/title b/master/bt5/slapos_subscription/bt/title
deleted file mode 100644
index 5a73aaaae..000000000
--- a/master/bt5/slapos_subscription/bt/title
+++ /dev/null
@@ -1 +0,0 @@
-slapos_subscription
\ No newline at end of file
diff --git a/master/bt5/slapos_subscription/bt/version b/master/bt5/slapos_subscription/bt/version
deleted file mode 100644
index 184351be8..000000000
--- a/master/bt5/slapos_subscription/bt/version
+++ /dev/null
@@ -1 +0,0 @@
-Vifib 0.5
\ No newline at end of file
diff --git a/master/bt5/vifib_erp5/PropertySheetTemplateItem/portal_property_sheets/VifibPersonConstraint/open_sale_order_related_constraint.xml b/master/bt5/vifib_erp5/PropertySheetTemplateItem/portal_property_sheets/VifibPersonConstraint/open_sale_order_related_constraint.xml
deleted file mode 100644
index d003515a2..000000000
--- a/master/bt5/vifib_erp5/PropertySheetTemplateItem/portal_property_sheets/VifibPersonConstraint/open_sale_order_related_constraint.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <global name="Category Related Membership Arity Constraint" module="erp5.portal_type"/>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_identity_criterion</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>_range_criterion</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>constraint_base_category</string> </key>
- <value>
- <tuple>
- <string>default_destination_section</string>
- </tuple>
- </value>
- </item>
- <item>
- <key> <string>constraint_portal_type</string> </key>
- <value> <string>python: (\'Open Sale Order\',)</string> </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
- <key> <string>filter_parameter</string> </key>
- <value> <string>python: {\'validation_state\': \'validated\'}</string> </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>open_sale_order_related_constraint</string> </value>
- </item>
- <item>
- <key> <string>max_arity</string> </key>
- <value> <int>1</int> </value>
- </item>
- <item>
- <key> <string>min_arity</string> </key>
- <value> <int>1</int> </value>
- </item>
- <item>
- <key> <string>portal_type</string> </key>
- <value> <string>Category Related Membership Arity Constraint</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
- <record id="2" aka="AAAAAAAAAAI=">
- <pickle>
- <global name="PersistentMapping" module="Persistence.mapping"/>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </pickle>
- </record>
- <record id="3" aka="AAAAAAAAAAM=">
- <pickle>
- <global name="PersistentMapping" module="Persistence.mapping"/>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>data</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
diff --git a/master/bt5/vifib_erp5/bt/revision b/master/bt5/vifib_erp5/bt/revision
index 4a722e9c7..4c7798cef 100644
--- a/master/bt5/vifib_erp5/bt/revision
+++ b/master/bt5/vifib_erp5/bt/revision
@@ -1 +1 @@
-552
\ No newline at end of file
+553
\ No newline at end of file
diff --git a/master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/slap_interaction_workflow/interactions/Person_fixConsistency.xml b/master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/slap_interaction_workflow/interactions/Person_fixConsistency.xml
index cc13c3f99..f00c8dbcb 100644
--- a/master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/slap_interaction_workflow/interactions/Person_fixConsistency.xml
+++ b/master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/slap_interaction_workflow/interactions/Person_fixConsistency.xml
@@ -35,7 +35,6 @@
<value>
<list>
<string>Person_createOngoingInvoice</string>
- <string>Person_createOpenOrder</string>
<string>Person_createRegistrationInvoice</string>
</list>
</value>
diff --git a/master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/slap_interaction_workflow/scripts/Person_createOpenOrder.xml b/master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/slap_interaction_workflow/scripts/Person_createOpenOrder.xml
deleted file mode 100644
index 956496e0e..000000000
--- a/master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/slap_interaction_workflow/scripts/Person_createOpenOrder.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?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>person = state_change[\'object\']\n
-person.Person_updateOpenOrder()\n
-</string> </value>
- </item>
- <item>
- <key> <string>_params</string> </key>
- <value> <string>state_change</string> </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>Person_createOpenOrder</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
diff --git a/master/bt5/vifib_slap/bt/dependency_list b/master/bt5/vifib_slap/bt/dependency_list
index bbb86559f..9396aecd0 100644
--- a/master/bt5/vifib_slap/bt/dependency_list
+++ b/master/bt5/vifib_slap/bt/dependency_list
@@ -1,2 +1,2 @@
vifib_base
-slapos_subscription
\ No newline at end of file
+slapos_accounting
\ No newline at end of file
diff --git a/master/bt5/vifib_slap/bt/revision b/master/bt5/vifib_slap/bt/revision
index e39afc8dd..354d30ba6 100644
--- a/master/bt5/vifib_slap/bt/revision
+++ b/master/bt5/vifib_slap/bt/revision
@@ -1 +1 @@
-868
\ No newline at end of file
+869
\ No newline at end of file
diff --git a/master/bt5/vifib_slap/bt/template_path_list b/master/bt5/vifib_slap/bt/template_path_list
index 527161a1a..b6621ed44 100644
--- a/master/bt5/vifib_slap/bt/template_path_list
+++ b/master/bt5/vifib_slap/bt/template_path_list
@@ -9,7 +9,6 @@ portal_alarms/vifib_check_consistency
portal_alarms/vifib_clone_destroy_partition
portal_alarms/vifib_lock_person
portal_alarms/vifib_lock_software_instance
-portal_alarms/vifib_person_update_open_order
portal_alarms/vifib_request_destruction_selenium_tester_instance
portal_alarms/vifib_set_priority_one_message_table
portal_alarms/vifib_trigger_build
diff --git a/master/bt5/vifib_upgrader/SkinTemplateItem/portal_skins/vifib_upgrader/ERP5Site_getUpgraderSignature.xml b/master/bt5/vifib_upgrader/SkinTemplateItem/portal_skins/vifib_upgrader/ERP5Site_getUpgraderSignature.xml
index 9c812432d..adc91e981 100644
--- a/master/bt5/vifib_upgrader/SkinTemplateItem/portal_skins/vifib_upgrader/ERP5Site_getUpgraderSignature.xml
+++ b/master/bt5/vifib_upgrader/SkinTemplateItem/portal_skins/vifib_upgrader/ERP5Site_getUpgraderSignature.xml
@@ -122,7 +122,7 @@ REQUIRED_BT5_ID_LIST = (\n
\'vifib_data\',\n
\'vifib_data_web\',\n
\'vifib_data_simulation\',\n
- \'slapos_subscription\',\n
+ \'slapos_accounting\',\n
\'slapos_erp5\',\n
)\n
\n
diff --git a/master/bt5/vifib_upgrader/bt/revision b/master/bt5/vifib_upgrader/bt/revision
index 05b9b66ff..575565962 100644
--- a/master/bt5/vifib_upgrader/bt/revision
+++ b/master/bt5/vifib_upgrader/bt/revision
@@ -1 +1 @@
-162
\ No newline at end of file
+163
\ No newline at end of file
diff --git a/master/product/Vifib/tests/VifibMixin.py b/master/product/Vifib/tests/VifibMixin.py
index cf0c31c8b..79390487a 100644
--- a/master/product/Vifib/tests/VifibMixin.py
+++ b/master/product/Vifib/tests/VifibMixin.py
@@ -93,7 +93,7 @@ class testVifibMixin(ERP5TypeTestCase):
'erp5_accounting_l10n_fr',
'erp5_web_shacache',
'erp5_data_set',
- 'slapos_subscription',
+ 'slapos_accounting',
'vifib_base',
'erp5_workflow',
'erp5_web_shadir',
diff --git a/master/tests/__init__.py b/master/tests/__init__.py
index 2e427fba6..9df22cce3 100644
--- a/master/tests/__init__.py
+++ b/master/tests/__init__.py
@@ -24,7 +24,7 @@ class SlapOSCloud(SavedTestSuite, ProjectTestSuite):
'slapos_cache',
'slapos_erp5',
'slapos_pdm',
- 'slapos_subscription',
+ 'slapos_accounting',
'slapos_slap_tool',
'slapos_rest_api',
'slapos_web',
--
2.30.9