[Erp5-report] r20668 - in /erp5/trunk/bt5/erp5_trade: SkinTemplateItem/portal_skins/erp5_tr...

[nobody at svn.erp5.org]

Author: jerome
Date: Fri Apr 18 15:31:05 2008
New Revision: 20668

URL: http://svn.erp5.org?rev=20668&view=rev
Log:
SaleOrder_applySaleTradeCondition: Don't try to set a received date if the accessor is not present
bump to version 5.0

Modified:
    erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_applySaleTradeCondition.xml
    erp5/trunk/bt5/erp5_trade/bt/change_log
    erp5/trunk/bt5/erp5_trade/bt/revision
    erp5/trunk/bt5/erp5_trade/bt/version

Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_applySaleTradeCondition.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_applySaleTradeCondition.xml?rev=20668&r1=20667&r2=20668&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_applySaleTradeCondition.xml (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_applySaleTradeCondition.xml Fri Apr 18 15:31:05 2008
@@ -104,7 +104,7 @@
 \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 @@
                             <string>_inplacevar_</string>
                             <string>redirect_url</string>
                             <string>trade_condition</string>
+                            <string>hasattr</string>
                           </tuple>
                         </value>
                     </item>

Modified: erp5/trunk/bt5/erp5_trade/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/change_log?rev=20668&r1=20667&r2=20668&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/change_log (original)
+++ erp5/trunk/bt5/erp5_trade/bt/change_log Fri Apr 18 15:31:05 2008
@@ -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.
 

Modified: erp5/trunk/bt5/erp5_trade/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/revision?rev=20668&r1=20667&r2=20668&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/revision (original)
+++ erp5/trunk/bt5/erp5_trade/bt/revision Fri Apr 18 15:31:05 2008
@@ -1,1 +1,1 @@
-323
+325

Modified: erp5/trunk/bt5/erp5_trade/bt/version
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/version?rev=20668&r1=20667&r2=20668&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/version (original)
+++ erp5/trunk/bt5/erp5_trade/bt/version Fri Apr 18 15:31:05 2008
@@ -1,1 +1,1 @@
-1.0rc17
+5.0