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

bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_applyPurchaseTradeCondition.xml

@@ -126,9 +126,15 @@ context.REQUEST[ \'RESPONSE\' ].redirect( redirect_url.replace(\' \', \'+\') )\n
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>_owner</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <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>
             <key> <string>errors</string> </key>
@@ -186,7 +192,7 @@ context.REQUEST[ \'RESPONSE\' ].redirect( redirect_url.replace(\' \', \'+\') )\n
             <value>
               <tuple>
                 <int>0</int>
-                <int>1</int>
+                <int>0</int>
               </tuple>
             </value>
         </item>

bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_applySaleTradeCondition.xml

@@ -129,9 +129,15 @@ context.REQUEST[ \'RESPONSE\' ].redirect( redirect_url.replace(\' \', \'+\') )\n
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>_owner</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <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>
             <key> <string>errors</string> </key>
@@ -190,7 +196,7 @@ context.REQUEST[ \'RESPONSE\' ].redirect( redirect_url.replace(\' \', \'+\') )\n
             <value>
               <tuple>
                 <int>0</int>
-                <int>1</int>
+                <int>0</int>
               </tuple>
             </value>
         </item>

bt5/erp5_trade/bt/revision

-368
+369
\ No newline at end of file