[Erp5-report] r28036 - in /erp5/trunk/bt5/erp5_base: SkinTemplateItem/portal_skins/erp5_bas...

[nobody at svn.erp5.org]

Author: tatuya
Date: Thu Jul  9 11:11:02 2009
New Revision: 28036

URL: http://svn.erp5.org?rev=28036&view=rev
Log:
2009-07-09 tatuya
* Fix when printing invoice and setting 'Custom' for payment-trade-date, payment condition returns the custom setting date

Modified:
    erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getODTDataDict.xml
    erp5/trunk/bt5/erp5_base/bt/change_log
    erp5/trunk/bt5/erp5_base/bt/revision

Modified: erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getODTDataDict.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getODTDataDict.xml?rev=28036&r1=28035&r2=28036&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getODTDataDict.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getODTDataDict.xml [utf8] Thu Jul  9 11:11:02 2009
@@ -115,6 +115,8 @@
   return date.strftime(pattern)\n
 \n
 def getPaymentConditionText(order):\n
+  if \'custom\' == order.getPaymentConditionTradeDate():\n
+    return order.getPaymentConditionPaymentDate()\n
   end_of_month = order.getPaymentConditionPaymentEndOfMonth()\n
   days = order.getPaymentConditionPaymentTerm()\n
   if days:\n

Modified: erp5/trunk/bt5/erp5_base/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/change_log?rev=28036&r1=28035&r2=28036&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/change_log [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/bt/change_log [utf8] Thu Jul  9 11:11:02 2009
@@ -1,3 +1,6 @@
+2009-07-09 tatuya
+* Fix when printing invoice and setting 'Custom' for payment-trade-date, payment condition returns the custom setting date
+
 2009-07-03 nicolas
 * add cache plugin and memcached plugin for Persistent Caching of document conversions.
 Flare should be installed and running

Modified: erp5/trunk/bt5/erp5_base/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/revision?rev=28036&r1=28035&r2=28036&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/bt/revision [utf8] Thu Jul  9 11:11:02 2009
@@ -1,1 +1,1 @@
-620
+625