From 683ce8936a3dde352404b116298c4007c8f8955e Mon Sep 17 00:00:00 2001 From: Tristan Cavelier <tristan.cavelier@tiolive.com> Date: Mon, 27 Jul 2015 13:35:33 +0000 Subject: [PATCH] erp5_trade: XML changes --- .../erp5_trade/Order_applyTradeCondition.xml | 8 ++------ .../erp5_trade/PackingList_copyOrderProperties.xml | 9 ++------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_applyTradeCondition.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_applyTradeCondition.xml index d8877d136b..b9f587f174 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_applyTradeCondition.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_applyTradeCondition.xml @@ -50,9 +50,7 @@ </item> <item> <key> <string>_body</string> </key> - <value> <string encoding="cdata"><![CDATA[ - -order = context\n + <value> <string>order = context\n \n # copy categories\n category_list = [\n @@ -137,9 +135,7 @@ else:\n new_category_dict[\'specialise\'] = trade_condition.getRelativeUrl()\n \n order.edit(**new_category_dict)\n - - -]]></string> </value> +</string> </value> </item> <item> <key> <string>_params</string> </key> diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_copyOrderProperties.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_copyOrderProperties.xml index 8fa3c07f99..d8bf3aa55c 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_copyOrderProperties.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_copyOrderProperties.xml @@ -50,9 +50,7 @@ </item> <item> <key> <string>_body</string> </key> - <value> <string encoding="cdata"><![CDATA[ - -packing_list = context\n + <value> <string>packing_list = context\n related_order = packing_list.getCausalityValue()\n \n if packing_list.getSimulationState() == \'draft\':\n @@ -60,10 +58,7 @@ if packing_list.getSimulationState() == \'draft\':\n comment = related_order.getComment(),\n title = related_order.getTitle()\n )\n -\n - - -]]></string> </value> +</string> </value> </item> <item> <key> <string>_params</string> </key> -- 2.30.9