Commit e50ad871 authored by Łukasz Nowak's avatar Łukasz Nowak

Rebrand default_trade_model_rule.

parent 171a135f
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <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>
<item> <item>
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <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>
<item> <item>
<key> <string>version</string> </key> <key> <string>version</string> </key>
...@@ -428,6 +428,51 @@ ...@@ -428,6 +428,51 @@
</value> </value>
</item> </item>
</dictionary> </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> </list>
</tuple> </tuple>
</pickle> </pickle>
......
...@@ -52,7 +52,9 @@ ...@@ -52,7 +52,9 @@
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>movement = context\n <value> <string>movement = context\n
\n \n
script.log(\'on %s\' % movement.getPath())\n
if not movement.SimulationMovement_testCommonRule(rule):\n if not movement.SimulationMovement_testCommonRule(rule):\n
script.log(\'on %s does not apply\' % movement.getPath())\n
return False\n return False\n
\n \n
parent = movement.getParentValue()\n parent = movement.getParentValue()\n
...@@ -60,6 +62,7 @@ if parent.getPortalType() != \'Applied Rule\':\n ...@@ -60,6 +62,7 @@ if parent.getPortalType() != \'Applied Rule\':\n
return False\n return False\n
\n \n
parent_rule = parent.getSpecialiseValue()\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 if parent_rule.getPortalType() not in (\'Invoice Root Simulation Rule\',\n
\'Invoice Simulation Rule\'):\n \'Invoice Simulation Rule\'):\n
return False\n return False\n
......
69 70
\ No newline at end of file \ No newline at end of file
...@@ -16,3 +16,4 @@ service_module/slapos_discount ...@@ -16,3 +16,4 @@ service_module/slapos_discount
portal_rules/slapos_subscription_item_rule portal_rules/slapos_subscription_item_rule
portal_rules/slapos_invoice_simulation_rule portal_rules/slapos_invoice_simulation_rule
portal_rules/slapos_invoice_transaction_simulation_rule portal_rules/slapos_invoice_transaction_simulation_rule
portal_rules/slapos_trade_model_simulation_rule
\ No newline at end of file
...@@ -34,6 +34,8 @@ portal_rules/slapos_invoice_transaction_simulation_rule ...@@ -34,6 +34,8 @@ portal_rules/slapos_invoice_transaction_simulation_rule
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_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_line_template/** sale_packing_list_module/slapos_accounting_instance_delivery_line_template/**
sale_packing_list_module/slapos_accounting_instance_delivery_template sale_packing_list_module/slapos_accounting_instance_delivery_template
......
521 522
\ No newline at end of file \ No newline at end of file
134 135
\ No newline at end of file \ No newline at end of file
...@@ -3,4 +3,3 @@ portal_rules/vifib_delivery_root_simulation_rule ...@@ -3,4 +3,3 @@ portal_rules/vifib_delivery_root_simulation_rule
portal_rules/vifib_invoice_root_simulation_rule portal_rules/vifib_invoice_root_simulation_rule
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
\ No newline at end of file
...@@ -23,8 +23,6 @@ portal_rules/vifib_order_root_simulation_rule ...@@ -23,8 +23,6 @@ portal_rules/vifib_order_root_simulation_rule
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_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/Accept Solver/* portal_solvers/Accept Solver/*
portal_solvers/Adopt Solver portal_solvers/Adopt Solver
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment