Commit b47b6eec authored by Jérome Perrin's avatar Jérome Perrin

in r19803, the behaviour of "apply trade condition" changed to erase...

in r19803, the behaviour of "apply trade condition" changed to erase properties set on the order with properties from the trade condition. Restore the older behaviour by setting force= default value to false.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@21267 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 2181e3af
...@@ -126,9 +126,15 @@ context.REQUEST[ \'RESPONSE\' ].redirect( redirect_url.replace(\' \', \'+\') )\n ...@@ -126,9 +126,15 @@ context.REQUEST[ \'RESPONSE\' ].redirect( redirect_url.replace(\' \', \'+\') )\n
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>form_id, batch_mode=0, force=1</string> </value> <value> <string>form_id, batch_mode=0, force=0</string> </value>
</item> </item>
<item> <item>
<key> <string>errors</string> </key> <key> <string>errors</string> </key>
...@@ -186,7 +192,7 @@ context.REQUEST[ \'RESPONSE\' ].redirect( redirect_url.replace(\' \', \'+\') )\n ...@@ -186,7 +192,7 @@ context.REQUEST[ \'RESPONSE\' ].redirect( redirect_url.replace(\' \', \'+\') )\n
<value> <value>
<tuple> <tuple>
<int>0</int> <int>0</int>
<int>1</int> <int>0</int>
</tuple> </tuple>
</value> </value>
</item> </item>
......
...@@ -129,9 +129,15 @@ context.REQUEST[ \'RESPONSE\' ].redirect( redirect_url.replace(\' \', \'+\') )\n ...@@ -129,9 +129,15 @@ context.REQUEST[ \'RESPONSE\' ].redirect( redirect_url.replace(\' \', \'+\') )\n
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>_owner</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>form_id, batch_mode=0, force=1</string> </value> <value> <string>form_id, batch_mode=0, force=0</string> </value>
</item> </item>
<item> <item>
<key> <string>errors</string> </key> <key> <string>errors</string> </key>
...@@ -190,7 +196,7 @@ context.REQUEST[ \'RESPONSE\' ].redirect( redirect_url.replace(\' \', \'+\') )\n ...@@ -190,7 +196,7 @@ context.REQUEST[ \'RESPONSE\' ].redirect( redirect_url.replace(\' \', \'+\') )\n
<value> <value>
<tuple> <tuple>
<int>0</int> <int>0</int>
<int>1</int> <int>0</int>
</tuple> </tuple>
</value> </value>
</item> </item>
......
368 369
\ 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