Commit 2357b698 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

* for safety, do not skip calculate even if simulation state is 'draft'.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@18804 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 35bdd5c5
...@@ -68,10 +68,8 @@ ...@@ -68,10 +68,8 @@
<value> <string>delivery = state_change[\'object\']\n <value> <string>delivery = state_change[\'object\']\n
\n \n
getCausalityState = getattr(delivery, \'getCausalityState\', None)\n getCausalityState = getattr(delivery, \'getCausalityState\', None)\n
getSimulationState = getattr(delivery, \'getSimulationState\', None)\n
\n \n
if getCausalityState is not None and getCausalityState() != \'draft\' and \\\n if getCausalityState is not None and getCausalityState() != \'draft\':\n
getSimulationState is not None and getSimulationState() != \'draft\':\n
delivery.calculate()\n delivery.calculate()\n
</string> </value> </string> </value>
</item> </item>
......
...@@ -79,10 +79,8 @@ delivery = delivery_movement.getExplanationValue()\n ...@@ -79,10 +79,8 @@ delivery = delivery_movement.getExplanationValue()\n
# in the Accounting Transaction Module\n # in the Accounting Transaction Module\n
\n \n
getCausalityState = getattr(delivery, \'getCausalityState\', None)\n getCausalityState = getattr(delivery, \'getCausalityState\', None)\n
getSimulationState = getattr(delivery, \'getSimulationState\', None)\n
\n \n
if getCausalityState is not None and getCausalityState() != \'draft\' and \\\n if getCausalityState is not None and getCausalityState() != \'draft\':\n
getSimulationState is not None and getSimulationState() != \'draft\':\n
delivery.calculate()\n delivery.calculate()\n
</string> </value> </string> </value>
</item> </item>
......
...@@ -75,10 +75,8 @@ if delivery_movement is not None:\n ...@@ -75,10 +75,8 @@ if delivery_movement is not None:\n
# getCausalityState will always be present. This getattr test needs to be removed once\n # getCausalityState will always be present. This getattr test needs to be removed once\n
# Payment Transaction is linked to a correct causality workflow.\n # Payment Transaction is linked to a correct causality workflow.\n
getCausalityState = getattr(delivery, \'getCausalityState\', None)\n getCausalityState = getattr(delivery, \'getCausalityState\', None)\n
getSimulationState = getattr(delivery, \'getSimulationState\', None)\n
\n \n
if getCausalityState is not None and getCausalityState() != \'draft\' and \\\n if getCausalityState is not None and getCausalityState() != \'draft\':\n
getSimulationState is not None and getSimulationState() != \'draft\':\n
delivery.activate(\n delivery.activate(\n
after_path_and_method_id=(delivery_movement.getPath(),\n after_path_and_method_id=(delivery_movement.getPath(),\n
(\'recursiveImmediateReindexObject\', \'immediateReindexObject\'))).calculate()\n (\'recursiveImmediateReindexObject\', \'immediateReindexObject\'))).calculate()\n
...@@ -151,7 +149,6 @@ if delivery_movement is not None:\n ...@@ -151,7 +149,6 @@ if delivery_movement is not None:\n
<string>delivery</string> <string>delivery</string>
<string>getattr</string> <string>getattr</string>
<string>getCausalityState</string> <string>getCausalityState</string>
<string>getSimulationState</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
676 677
\ No newline at end of file \ No newline at end of file
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