Rebrand default_trade_model_rule.

master/bt5/vifib_data_simulation/PathTemplateItem/portal_rules/vifib_trade_model_simulation_rule.xml → master/bt5/slapos_accounting/PathTemplateItem/portal_rules/slapos_trade_model_simulation_rule.xml

@@ -78,7 +78,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>vifib_trade_model_simulation_rule</string> </value>
+            <value> <string>slapos_trade_model_simulation_rule</string> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>
@@ -94,7 +94,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Vifib Default Trade Model Simulation Rule</string> </value>
+            <value> <string>SlapOS Default Trade Model Simulation Rule</string> </value>
         </item>
         <item>
             <key> <string>version</string> </key>
@@ -428,6 +428,51 @@
                 </value>
             </item>
           </dictionary>
+          <dictionary>
+            <item>
+                <key> <string>action</string> </key>
+                <value> <string>edit</string> </value>
+            </item>
+            <item>
+                <key> <string>actor</string> </key>
+                <value> <string>zope</string> </value>
+            </item>
+            <item>
+                <key> <string>comment</string> </key>
+                <value>
+                  <none/>
+                </value>
+            </item>
+            <item>
+                <key> <string>error_message</string> </key>
+                <value> <string></string> </value>
+            </item>
+            <item>
+                <key> <string>serial</string> </key>
+                <value> <string>922.34932.8758.2764</string> </value>
+            </item>
+            <item>
+                <key> <string>state</string> </key>
+                <value> <string>current</string> </value>
+            </item>
+            <item>
+                <key> <string>time</string> </key>
+                <value>
+                  <object>
+                    <klass> <reference id="8.1"/> </klass>
+                    <tuple>
+                      <none/>
+                    </tuple>
+                    <state>
+                      <tuple>
+                        <float>1353328836.62</float>
+                        <string>GMT+1</string>
+                      </tuple>
+                    </state>
+                  </object>
+                </value>
+            </item>
+          </dictionary>
         </list>
       </tuple>
     </pickle>

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

@@ -52,7 +52,9 @@
             <key> <string>_body</string> </key>
             <value> <string>movement = context\n
 \n
+script.log(\'on %s\' % movement.getPath())\n
 if not movement.SimulationMovement_testCommonRule(rule):\n
+  script.log(\'on %s does not apply\' % movement.getPath())\n
   return False\n
 \n
 parent = movement.getParentValue()\n
@@ -60,6 +62,7 @@ if parent.getPortalType() != \'Applied Rule\':\n
   return False\n
 \n
 parent_rule = parent.getSpecialiseValue()\n
+script.log(\'on %s %s\' % (movement.getPath(), parent_rule.getPortalType()))\n
 if parent_rule.getPortalType() not in (\'Invoice Root Simulation Rule\',\n
                                        \'Invoice Simulation Rule\'):\n
   return False\n

master/bt5/slapos_accounting/bt/revision

-69
+70
\ No newline at end of file

master/bt5/slapos_accounting/bt/template_keep_workflow_path_list

@@ -15,4 +15,5 @@ service_module/slapos_tax
 service_module/slapos_discount
 portal_rules/slapos_subscription_item_rule
 portal_rules/slapos_invoice_simulation_rule
-portal_rules/slapos_invoice_transaction_simulation_rule
+portal_rules/slapos_invoice_transaction_simulation_rule
\ No newline at end of file
+portal_rules/slapos_trade_model_simulation_rule
\ No newline at end of file

master/bt5/slapos_accounting/bt/template_path_list

@@ -34,6 +34,8 @@ portal_rules/slapos_invoice_transaction_simulation_rule
 portal_rules/slapos_invoice_transaction_simulation_rule/**
 portal_rules/slapos_subscription_item_rule
 portal_rules/slapos_subscription_item_rule/**
+portal_rules/slapos_trade_model_simulation_rule
+portal_rules/slapos_trade_model_simulation_rule/**
 sale_packing_list_module/slapos_accounting_instance_delivery_line_template
 sale_packing_list_module/slapos_accounting_instance_delivery_line_template/**
 sale_packing_list_module/slapos_accounting_instance_delivery_template

master/bt5/vifib_base/bt/revision

-521
+522
\ No newline at end of file

master/bt5/vifib_data_simulation/bt/revision

-134
+135
\ No newline at end of file

master/bt5/vifib_data_simulation/bt/template_keep_workflow_path_list

@@ -2,5 +2,4 @@ portal_rules/vifib_delivery_simulation_rule
 portal_rules/vifib_delivery_root_simulation_rule
 portal_rules/vifib_invoice_root_simulation_rule
 portal_rules/vifib_order_root_simulation_rule
-portal_rules/vifib_payment_simulation_rule
-portal_rules/vifib_trade_model_simulation_rule
+portal_rules/vifib_payment_simulation_rule
\ No newline at end of file
\ No newline at end of file

master/bt5/vifib_data_simulation/bt/template_path_list

@@ -23,8 +23,6 @@ portal_rules/vifib_order_root_simulation_rule
 portal_rules/vifib_order_root_simulation_rule/**
 portal_rules/vifib_payment_simulation_rule
 portal_rules/vifib_payment_simulation_rule/**
-portal_rules/vifib_trade_model_simulation_rule
-portal_rules/vifib_trade_model_simulation_rule/**
 portal_solvers/Accept Solver
 portal_solvers/Accept Solver/*
 portal_solvers/Adopt Solver