From 68f5db492aa7c3266832ff65af7ac63c59f2447f Mon Sep 17 00:00:00 2001 From: Tatuya Kamada <tatuya@nexedi.com> Date: Thu, 9 Jul 2009 09:11:02 +0000 Subject: [PATCH] 2009-07-09 tatuya * Fix when printing invoice and setting 'Custom' for payment-trade-date, payment condition returns the custom setting date git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@28036 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../portal_skins/erp5_base/Delivery_getODTDataDict.xml | 2 ++ bt5/erp5_base/bt/change_log | 3 +++ bt5/erp5_base/bt/revision | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getODTDataDict.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getODTDataDict.xml index 34861e8c89..95479a28fd 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getODTDataDict.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_getODTDataDict.xml @@ -115,6 +115,8 @@ def getOrderedDate(date):\n 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 diff --git a/bt5/erp5_base/bt/change_log b/bt5/erp5_base/bt/change_log index fdc36bbfbb..7365f64b3e 100644 --- a/bt5/erp5_base/bt/change_log +++ b/bt5/erp5_base/bt/change_log @@ -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 diff --git a/bt5/erp5_base/bt/revision b/bt5/erp5_base/bt/revision index a0d1ef1a02..e0c903f474 100644 --- a/bt5/erp5_base/bt/revision +++ b/bt5/erp5_base/bt/revision @@ -1 +1 @@ -620 \ No newline at end of file +625 \ No newline at end of file -- 2.30.9