[freeside-commits] branch master updated. 55c92229a23d43673db6a9f521c6da1c10b99781

Mark Wells mark at 420.am
Tue Apr 8 00:44:30 PDT 2014


The branch, master has been updated
       via  55c92229a23d43673db6a9f521c6da1c10b99781 (commit)
      from  9931b2eeff85811118d0b495dd4e460bc939b744 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 55c92229a23d43673db6a9f521c6da1c10b99781
Author: Mark Wells <mark at freeside.biz>
Date:   Tue Apr 8 00:44:07 2014 -0700

    fix date line on plain text invoices, #28271

diff --git a/FS/FS/Template_Mixin.pm b/FS/FS/Template_Mixin.pm
index 131a236..426386b 100644
--- a/FS/FS/Template_Mixin.pm
+++ b/FS/FS/Template_Mixin.pm
@@ -485,9 +485,14 @@ sub print_generic {
     'quotationnum'    => $self->quotationnum,
     'no_date'         => $params{'no_date'},
     '_date'           => ( $params{'no_date'} ? '' : $self->_date ),
+      # workaround for inconsistent behavior in the early plain text 
+      # templates; see RT#28271
     'date'            => ( $params{'no_date'}
                              ? ''
-                             : $self->time2str_local('long', $self->_date, $format)
+                             : ($format eq 'template'
+                               ? $self->_date
+                               : $self->time2str_local('long', $self->_date, $format)
+                               )
                          ),
     'today'           => $self->time2str_local('long', $today, $format),
     'terms'           => $self->terms,

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/Template_Mixin.pm |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)




More information about the freeside-commits mailing list