Rebrand rest of builders.

master/bt5/slapos_accounting/PathTemplateItem/business_process_module/slapos_sale_business_process/account.xml

@@ -106,6 +106,7 @@
                 <string>trade_phase/slapos/accounting</string>
                 <string>predecessor/trade_state/invoiced</string>
                 <string>successor/trade_state/accounted</string>
+                <string>delivery_builder/portal_deliveries/slapos_sale_invoice_transaction_builder</string>
               </tuple>
             </value>
         </item>

master/bt5/slapos_accounting/PathTemplateItem/business_process_module/slapos_sale_business_process/discount.xml

@@ -25,6 +25,7 @@
                 <string>trade_phase/slapos/discount</string>
                 <string>predecessor/trade_state/invoiced</string>
                 <string>successor/trade_state/accounted</string>
+                <string>delivery_builder/portal_deliveries/slapos_sale_invoice_transaction_trade_model_builder</string>
               </tuple>
             </value>
         </item>

master/bt5/slapos_accounting/PathTemplateItem/business_process_module/slapos_sale_business_process/pay.xml

@@ -108,6 +108,7 @@
                 <string>successor/trade_state/paid</string>
                 <string>source/account_module/bank</string>
                 <string>destination/account_module/bank</string>
+                <string>delivery_builder/portal_deliveries/slapos_payment_transaction_builder</string>
               </tuple>
             </value>
         </item>

master/bt5/slapos_accounting/PathTemplateItem/business_process_module/slapos_sale_business_process/tax.xml

@@ -25,6 +25,7 @@
                 <string>predecessor/trade_state/invoiced</string>
                 <string>successor/trade_state/accounted</string>
                 <string>trade_phase/slapos/tax</string>
+                <string>delivery_builder/portal_deliveries/slapos_sale_invoice_transaction_trade_model_builder</string>
               </tuple>
             </value>
         </item>

master/bt5/vifib_data_simulation/PathTemplateItem/portal_deliveries/vifib_payment_transaction_builder.xml → master/bt5/slapos_accounting/PathTemplateItem/portal_deliveries/slapos_payment_transaction_builder.xml

@@ -32,7 +32,7 @@
         </item>
         <item>
             <key> <string>delivery_after_generation_script_id</string> </key>
-            <value> <string>VifibPaymentTransaction_postGeneration</string> </value>
+            <value> <string>SlapOSPaymentTransaction_postGeneration</string> </value>
         </item>
         <item>
             <key> <string>delivery_cell_collect_order</string> </key>
@@ -101,7 +101,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>vifib_payment_transaction_builder</string> </value>
+            <value> <string>slapos_payment_transaction_builder</string> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>
@@ -109,11 +109,11 @@
         </item>
         <item>
             <key> <string>simulation_select_method_id</string> </key>
-            <value> <string>VifibDeliveryBuilder_selectMovement</string> </value>
+            <value> <string>SlapOSDeliveryBuilder_selectMovement</string> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Vifib Payment Transaction Builder</string> </value>
+            <value> <string>SlapOS Payment Transaction Builder</string> </value>
         </item>
       </dictionary>
     </pickle>

master/bt5/vifib_data_simulation/PathTemplateItem/portal_deliveries/vifib_sale_invoice_transaction_builder.xml → master/bt5/slapos_accounting/PathTemplateItem/portal_deliveries/slapos_sale_invoice_transaction_builder.xml

@@ -65,7 +65,7 @@
         </item>
         <item>
             <key> <string>delivery_after_generation_script_id</string> </key>
-            <value> <string>VifibInvoiceTransaction_postTransactionLineGeneration</string> </value>
+            <value> <string>SlapOSInvoiceTransaction_postTransactionLineGeneration</string> </value>
         </item>
         <item>
             <key> <string>delivery_cell_collect_order</string> </key>
@@ -125,7 +125,7 @@
         </item>
         <item>
             <key> <string>delivery_select_method_id</string> </key>
-            <value> <string>VifibInvoiceTransaction_selectDelivery</string> </value>
+            <value> <string>SlapOSInvoiceTransaction_selectDelivery</string> </value>
         </item>
         <item>
             <key> <string>description</string> </key>
@@ -133,7 +133,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>vifib_sale_invoice_transaction_builder</string> </value>
+            <value> <string>slapos_sale_invoice_transaction_builder</string> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>
@@ -147,11 +147,11 @@
         </item>
         <item>
             <key> <string>simulation_select_method_id</string> </key>
-            <value> <string>VifibDeliveryBuilder_selectMovement</string> </value>
+            <value> <string>SlapOSDeliveryBuilder_selectMovement</string> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Vifib Sale Invoice Transaction Builder</string> </value>
+            <value> <string>SlapOS Sale Invoice Transaction Builder</string> </value>
         </item>
       </dictionary>
     </pickle>

master/bt5/vifib_data_simulation/PathTemplateItem/portal_deliveries/vifib_sale_invoice_transaction_trade_model_builder.xml → master/bt5/slapos_accounting/PathTemplateItem/portal_deliveries/slapos_sale_invoice_transaction_trade_model_builder.xml

@@ -126,7 +126,7 @@
         </item>
         <item>
             <key> <string>delivery_select_method_id</string> </key>
-            <value> <string>VifibInvoiceTransaction_selectDelivery</string> </value>
+            <value> <string>SlapOSInvoiceTransaction_selectDelivery</string> </value>
         </item>
         <item>
             <key> <string>description</string> </key>
@@ -134,7 +134,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>vifib_sale_invoice_transaction_trade_model_builder</string> </value>
+            <value> <string>slapos_sale_invoice_transaction_trade_model_builder</string> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>
@@ -148,11 +148,11 @@
         </item>
         <item>
             <key> <string>simulation_select_method_id</string> </key>
-            <value> <string>VifibDeliveryBuilder_selectMovement</string> </value>
+            <value> <string>SlapOSDeliveryBuilder_selectMovement</string> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Vifib Sale Invoice Transaction Trade Model Line Builder</string> </value>
+            <value> <string>SlapOS Sale Invoice Transaction Trade Model Line Builder</string> </value>
         </item>
       </dictionary>
     </pickle>

master/bt5/vifib_base/SkinTemplateItem/portal_skins/vifib_simulation/VifibInvoiceTransaction_postTransactionLineGeneration.xml → master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_simulation/SlapOSInvoiceTransaction_postTransactionLineGeneration.xml

@@ -89,7 +89,7 @@ context.AccountingTransaction_roundDebitCredit()\n
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>VifibInvoiceTransaction_postTransactionLineGeneration</string> </value>
+            <value> <string>SlapOSInvoiceTransaction_postTransactionLineGeneration</string> </value>
         </item>
       </dictionary>
     </pickle>

master/bt5/vifib_base/SkinTemplateItem/portal_skins/vifib_simulation/VifibInvoiceTransaction_selectDelivery.xml → master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_simulation/SlapOSInvoiceTransaction_selectDelivery.xml

@@ -93,7 +93,7 @@ return filter(lambda x : x is not None, deliveries_keys.keys())\n
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>VifibInvoiceTransaction_selectDelivery</string> </value>
+            <value> <string>SlapOSInvoiceTransaction_selectDelivery</string> </value>
         </item>
         <item>
             <key> <string>title</string> </key>

master/bt5/vifib_base/SkinTemplateItem/portal_skins/vifib_simulation/VifibPaymentTransaction_postGeneration.xml → master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_simulation/SlapOSPaymentTransaction_postGeneration.xml

@@ -54,33 +54,12 @@
 from DateTime import DateTime\n
 \n
 payment_transaction = context\n
-\n
-if payment_transaction.getStartDate() is None:\n
-  payment_transaction.setStartDate(DateTime())\n
-\n
-# initialize accounting_workflow to planned state\n
-if payment_transaction.getSimulationState() == "draft":\n
-  payment_transaction.plan(comment=translateString("Initialised by Delivery Builder."))\n
-if payment_transaction.getSimulationState() == "planned":\n
-  payment_transaction.confirm(comment=translateString("Initialised by Delivery Builder."))\n
-\n
-if payment_transaction.getCausalityState() == "draft":\n
-  # First set the payment transaction in the building state on the causality workflow\n
-  payment_transaction.startBuilding()\n
-\n
-# update casuality from movements\n
-causality_list = payment_transaction.getCausalityList()\n
-causality_list.sort()\n
-modified = 0\n
-for movement in payment_transaction.getMovementList():\n
-  movement_causality = movement.getCausality()\n
-  if movement_causality not in causality_list:\n
-    modified = 1\n
-    causality_list.append(movement_causality)\n
-\n
-if modified:\n
-  causality_list.sort()\n
-  payment_transaction.setCausalityList(causality_list)\n
+comment = translateString("Initialised by Delivery Builder.")\n
+payment_transaction.plan(comment=comment)\n
+payment_transaction.confirm(comment=comment)\n
+payment_transaction.start(comment=comment)\n
+payment_transaction.stop(comment=comment)\n
+payment_transaction.deliver(comment=comment)\n
 </string> </value>
         </item>
         <item>
@@ -89,7 +68,7 @@ if modified:\n
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>VifibPaymentTransaction_postGeneration</string> </value>
+            <value> <string>SlapOSPaymentTransaction_postGeneration</string> </value>
         </item>
       </dictionary>
     </pickle>

master/bt5/slapos_accounting/bt/revision

-75
+76
\ No newline at end of file

master/bt5/slapos_accounting/bt/template_path_list

@@ -24,8 +24,14 @@ portal_alarms/slapos_request_update_hosting_subscription_open_sale_order
 portal_alarms/slapos_trigger_build
 portal_categories/trade_phase/slapos
 portal_categories/trade_phase/slapos/**
+portal_deliveries/slapos_payment_transaction_builder
+portal_deliveries/slapos_payment_transaction_builder/**
 portal_deliveries/slapos_sale_invoice_builder
 portal_deliveries/slapos_sale_invoice_builder/**
+portal_deliveries/slapos_sale_invoice_transaction_builder
+portal_deliveries/slapos_sale_invoice_transaction_builder/**
+portal_deliveries/slapos_sale_invoice_transaction_trade_model_builder
+portal_deliveries/slapos_sale_invoice_transaction_trade_model_builder/**
 portal_deliveries/slapos_sale_packing_list_builder
 portal_deliveries/slapos_sale_packing_list_builder/**
 portal_rules/slapos_invoice_simulation_rule

master/bt5/vifib_base/bt/revision

-523
+524
\ No newline at end of file

master/bt5/vifib_data_simulation/bt/revision

-136
+137
\ No newline at end of file

master/bt5/vifib_data_simulation/bt/template_path_list

@@ -3,14 +3,8 @@ business_process_module/vifib_purchase_business_process/**
 business_process_module/vifib_simple_sale_business_process
 business_process_module/vifib_simple_sale_business_process/**
 portal_categories/trade_state/**
-portal_deliveries/vifib_payment_transaction_builder
-portal_deliveries/vifib_payment_transaction_builder/**
 portal_deliveries/vifib_purchase_packing_list_builder
 portal_deliveries/vifib_purchase_packing_list_builder/**
-portal_deliveries/vifib_sale_invoice_transaction_builder
-portal_deliveries/vifib_sale_invoice_transaction_builder/**
-portal_deliveries/vifib_sale_invoice_transaction_trade_model_builder
-portal_deliveries/vifib_sale_invoice_transaction_trade_model_builder/**
 portal_rules/vifib_accounting_transaction_root_simulation_rule
 portal_rules/vifib_accounting_transaction_root_simulation_rule/**
 portal_rules/vifib_delivery_root_simulation_rule