[freeside-commits] branch FREESIDE_3_BRANCH updated. 16ad05fd89afe8edb0e1e66098595796cb646200

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


The branch, FREESIDE_3_BRANCH has been updated
       via  16ad05fd89afe8edb0e1e66098595796cb646200 (commit)
      from  ffe6bd1fdb564acf65202693c5fdb4535112da07 (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 16ad05fd89afe8edb0e1e66098595796cb646200
Author: Mark Wells <mark at freeside.biz>
Date:   Tue Apr 8 00:43:38 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