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

[nobody at svn.erp5.org]

Author: jerome
Date: Thu May 28 10:58:39 2009
New Revision: 27230

URL: http://svn.erp5.org?rev=27230&view=rev
Log:
support ${days} Days End of Month in delivery printouts

Modified:
    erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getODTDataDict.xml
    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=27230&r1=27229&r2=27230&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 May 28 10:58:39 2009
@@ -115,11 +115,14 @@
   return date.strftime(pattern)\n
 \n
 def getPaymentConditionText(order):\n
-  if order.getPaymentConditionPaymentEndOfMonth():\n
-    return translateString("End of Month")\n
+  end_of_month = order.getPaymentConditionPaymentEndOfMonth()\n
   days = order.getPaymentConditionPaymentTerm()\n
   if days:\n
-    return \'%s %s\' % (days, translateString(\'Days\'))\n
+    if end_of_month:\n
+      return translateString("${days} Days End of Month", mapping=dict(days=days))\n
+    return translateString("${days} Days", mapping=dict(days=days))\n
+  elif end_of_month:\n
+    return translateString("End of Month") \n
   return \'\'\n
 \n
 def getTaxLineList(order):\n

Modified: erp5/trunk/bt5/erp5_base/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/revision?rev=27230&r1=27229&r2=27230&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/bt/revision [utf8] Thu May 28 10:58:39 2009
@@ -1,1 +1,1 @@
-596
+597