From 12c2832060c9000892cf551279bed2a9d37c945b Mon Sep 17 00:00:00 2001
From: Yusei Tahara <yusei@nexedi.com>
Date: Sat, 12 Nov 2011 17:25:35 +0900
Subject: [PATCH] source_trade and destination_trade must be copied from trade
 condition to order/delivery.

---
 .../portal_skins/erp5_trade/Order_applyTradeCondition.xml      | 2 ++
 bt5/erp5_trade/bt/change_log                                   | 3 +++
 bt5/erp5_trade/bt/revision                                     | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

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 9c43e741da..0ae261b505 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
@@ -59,9 +59,11 @@ category_list = [\n
   \'source\', \'source_section\', \'source_decision\',\n
   \'source_administration\', \'source_payment\', \'source_project\',\n
   \'source_carrier\', \'source_referral\', \'source_function\',\n
+  \'source_trade\',\n
   \'destination\', \'destination_section\', \'destination_decision\',\n
   \'destination_administration\', \'destination_payment\', \'destination_project\',\n
   \'destination_carrier\', \'destination_referral\', \'destination_function\',\n
+  \'destination_trade\',\n
   \'price_currency\', \'incoterm\', \'delivery_mode\',\n
 ]\n
 new_category_dict = {}\n
diff --git a/bt5/erp5_trade/bt/change_log b/bt5/erp5_trade/bt/change_log
index d768709ca6..06f08c469e 100644
--- a/bt5/erp5_trade/bt/change_log
+++ b/bt5/erp5_trade/bt/change_log
@@ -1,3 +1,6 @@
+2011-11-12 yusei
+* source_trade and destination_trade must be copied from trade condition to order/delivery.
+
 2011-09-28 yusei
 * Improve stock report and show stock also by group.
 
diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision
index c521d94f59..f6b318873b 100644
--- a/bt5/erp5_trade/bt/revision
+++ b/bt5/erp5_trade/bt/revision
@@ -1 +1 @@
-1143
\ No newline at end of file
+1144
\ No newline at end of file
-- 
2.30.9