From 87c1ce11a5aab02eb5b75ebac117505eca5463f4 Mon Sep 17 00:00:00 2001 From: Yoshinori Okuji <yo@nexedi.com> Date: Tue, 16 Mar 2010 07:04:21 +0000 Subject: [PATCH] 2010-03-16 yo * Returned Sale Packing List should generate a root applied rule using default_delivery_rule by default. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@33743 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../erp5_trade/ReturnedSalePackingList_getRuleReference.xml | 6 ++---- bt5/erp5_trade/bt/change_log | 3 +++ bt5/erp5_trade/bt/revision | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ReturnedSalePackingList_getRuleReference.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ReturnedSalePackingList_getRuleReference.xml index 731b841659..47280c5445 100644 --- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ReturnedSalePackingList_getRuleReference.xml +++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ReturnedSalePackingList_getRuleReference.xml @@ -53,7 +53,7 @@ </item> <item> <key> <string>_body</string> </key> - <value> <string>return None\n + <value> <string>return \'default_delivery_rule\'\n </string> </value> </item> <item> @@ -89,9 +89,7 @@ <item> <key> <string>co_varnames</string> </key> <value> - <tuple> - <string>None</string> - </tuple> + <tuple/> </value> </item> </dictionary> diff --git a/bt5/erp5_trade/bt/change_log b/bt5/erp5_trade/bt/change_log index 08ae7bf1dd..b16de1c8c1 100644 --- a/bt5/erp5_trade/bt/change_log +++ b/bt5/erp5_trade/bt/change_log @@ -1,3 +1,6 @@ +2010-03-16 yo +* Returned Sale Packing List should generate a root applied rule using default_delivery_rule by default. + 2010-03-16 yo * Update the workflow chain of returned sale packing list line for base contribution. diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision index 666afef17f..abb531abb7 100644 --- a/bt5/erp5_trade/bt/revision +++ b/bt5/erp5_trade/bt/revision @@ -1 +1 @@ -875 \ No newline at end of file +876 \ No newline at end of file -- 2.30.9