diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_applySaleTradeCondition.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_applySaleTradeCondition.xml
index 7a982d3275fb8b0acd92e64f8e9910655ad27f32..8425c9665bbf11a2885876e88f1e163d3acfd071 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_applySaleTradeCondition.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_applySaleTradeCondition.xml
@@ -104,7 +104,7 @@ else :\n
 \n
   order.Order_applyTradeCondition(trade_condition, force=force)\n
   # set date\n
-  if order.getReceivedDate() is None:\n
+  if hasattr(order, \'getReceivedDate\') and order.getReceivedDate() is None:\n
     context.setReceivedDate(DateTime())\n
 \n
   redirect_url = \'%s/%s?%s\' % (context.absolute_url(), form_id,\n
@@ -176,6 +176,7 @@ context.REQUEST[ \'RESPONSE\' ].redirect( redirect_url.replace(\' \', \'+\') )\n
                             <string>_inplacevar_</string>
                             <string>redirect_url</string>
                             <string>trade_condition</string>
+                            <string>hasattr</string>
                           </tuple>
                         </value>
                     </item>
diff --git a/bt5/erp5_trade/bt/change_log b/bt5/erp5_trade/bt/change_log
index f9a58514eb647c8b427443774449b6ded54bb9db..d0b50c86d95d760f02ec09a36ac7622dce6b6412 100644
--- a/bt5/erp5_trade/bt/change_log
+++ b/bt5/erp5_trade/bt/change_log
@@ -1,3 +1,6 @@
+2008-04-18 jerome
+* Bump to version 5.0
+
 2008-04-17 jerome
 * Add new discount system, similar to new tax system.
 
diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision
index 871cae9aa662ba186a3a1da42301a2cfbbaea7e0..f9c94c8318066ba562fd1ce1e14753071396ea54 100644
--- a/bt5/erp5_trade/bt/revision
+++ b/bt5/erp5_trade/bt/revision
@@ -1 +1 @@
-323
\ No newline at end of file
+325
\ No newline at end of file
diff --git a/bt5/erp5_trade/bt/version b/bt5/erp5_trade/bt/version
index 0d5d4bc79772e02437e52e4437f65fbf446e9fe2..6e6366051638f977cca4368393347c872a05baa1 100644
--- a/bt5/erp5_trade/bt/version
+++ b/bt5/erp5_trade/bt/version
@@ -1 +1 @@
-1.0rc17
\ No newline at end of file
+5.0
\ No newline at end of file