Rebrand alarm.

Also move invoice directly to delivered state.

master/bt5/vifib_slap/PathTemplateItem/portal_alarms/stop_confirmed_sale_invoice_transaction.xml → master/bt5/slapos_accounting/PathTemplateItem/portal_alarms/slapos_deliver_confirmed_sale_invoice_transaction.xml

@@ -8,7 +8,7 @@
       <dictionary>
         <item>
             <key> <string>active_sense_method_id</string> </key>
-            <value> <string>Alarm_stopConfirmedSaleInvoiceTransaction</string> </value>
+            <value> <string>Alarm_deliverConfirmedSaleInvoiceTransaction</string> </value>
         </item>
         <item>
             <key> <string>description</string> </key>
@@ -22,7 +22,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>stop_confirmed_sale_invoice_transaction</string> </value>
+            <value> <string>slapos_deliver_confirmed_sale_invoice_transaction</string> </value>
         </item>
         <item>
             <key> <string>periodicity_day_frequency</string> </key>
@@ -89,7 +89,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Stop confirmed Sale Invoices</string> </value>
+            <value> <string>Deliver confirmed Sale Invoices</string> </value>
         </item>
       </dictionary>
     </pickle>

master/bt5/slapos_accounting/PathTemplateItem/portal_deliveries/slapos_payment_transaction_builder/property_movement_group_on_delivery.xml

@@ -43,7 +43,9 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>1</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>update_always</string> </key>

master/bt5/slapos_accounting/PathTemplateItem/portal_deliveries/slapos_sale_invoice_transaction_builder/category_movement_group_on_cell.xml

@@ -43,7 +43,13 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>category_movement_group_on_cell</string> </value>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>update_always</string> </key>
+            <value> <int>0</int> </value>
         </item>
       </dictionary>
     </pickle>

master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/Alarm_stopConfirmedSaleInvoiceTransaction.xml → master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/Alarm_deliverConfirmedSaleInvoiceTransaction.xml

@@ -58,7 +58,7 @@ portal.portal_catalog.searchAndActivate(\n
   portal_type=\'Sale Invoice Transaction\',\n
   simulation_state=\'confirmed\',\n
   causality_state=\'solved\',\n
-  method_id=\'SaleInvoiceTransaction_stopConfirmed\',\n
+  method_id=\'SaleInvoiceTransaction_deliverConfirmed\',\n
   activate_kw={\'tag\': tag}\n
 )\n
 context.activate(after_tag=tag).getId()\n
@@ -70,7 +70,7 @@ context.activate(after_tag=tag).getId()\n
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>Alarm_stopConfirmedSaleInvoiceTransaction</string> </value>
+            <value> <string>Alarm_deliverConfirmedSaleInvoiceTransaction</string> </value>
         </item>
       </dictionary>
     </pickle>

master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/SaleInvoiceTransaction_stopConfirmed.xml → master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/SaleInvoiceTransaction_deliverConfirmed.xml

@@ -52,11 +52,13 @@
             <key> <string>_body</string> </key>
             <value> <string>isTransitionPossible = context.getPortalObject().portal_workflow.isTransitionPossible\n
 if context.getSimulationState() == \'confirmed\' and len(context.checkConsistency()) == 0 and context.getCausalityState() == \'solved\':\n
-  comment = \'Stopped by alarm as all actions in confirmed state are ready.\'\n
+  comment = \'Delivered by alarm as all actions in confirmed state are ready.\'\n
   if isTransitionPossible(context, \'start\'):\n
     context.start(comment=comment)\n
   if isTransitionPossible(context, \'stop\'):\n
     context.stop(comment=comment)\n
+  if isTransitionPossible(context, \'deliver\'):\n
+    context.deliver(comment=comment)\n
 </string> </value>
         </item>
         <item>
@@ -65,7 +67,7 @@ if context.getSimulationState() == \'confirmed\' and len(context.checkConsistenc
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>SaleInvoiceTransaction_stopConfirmed</string> </value>
+            <value> <string>SaleInvoiceTransaction_deliverConfirmed</string> </value>
         </item>
       </dictionary>
     </pickle>

master/bt5/slapos_accounting/bt/revision

-83
+84
\ No newline at end of file

master/bt5/slapos_accounting/bt/template_path_list

@@ -18,6 +18,7 @@ open_sale_order_module/slapos_accounting_open_sale_order_template
 open_sale_order_module/template_open_sale_order
 organisation_module/slapos
 organisation_module/slapos/bank_account
+portal_alarms/slapos_deliver_confirmed_sale_invoice_transaction
 portal_alarms/slapos_instance_invoicing
 portal_alarms/slapos_manage_building_calculating_delivery
 portal_alarms/slapos_remove_bogus_delivery_link

master/bt5/vifib_slap/bt/revision

-879
+880
\ No newline at end of file

master/bt5/vifib_slap/bt/template_path_list

 portal_alarms/cleanup_active_process
-portal_alarms/stop_confirmed_sale_invoice_transaction
 portal_alarms/vifib_bang_selenium_tester_instance
 portal_alarms/vifib_check_consistency
 portal_alarms/vifib_lock_person