From c9f53f211971dc68e3f67cd94df6138a88436bc4 Mon Sep 17 00:00:00 2001
From: Jonathan Prykop <jonathan@freeside.biz>
Date: Tue, 19 Apr 2016 15:27:53 -0500
Subject: RT#41501: OBH: Separate credit additional info into separate field on
 reports

---
 httemplate/search/cust_credit.html                 | 11 ++++++++---
 httemplate/search/cust_credit_bill_pkg.html        | 10 ++++++++--
 httemplate/search/cust_credit_source_bill_pkg.html |  2 +-
 httemplate/search/cust_credit_void.html            | 10 ++++++++--
 4 files changed, 25 insertions(+), 8 deletions(-)

(limited to 'httemplate/search')

diff --git a/httemplate/search/cust_credit.html b/httemplate/search/cust_credit.html
index 2241f02e3..dbf0ff333 100755
--- a/httemplate/search/cust_credit.html
+++ b/httemplate/search/cust_credit.html
@@ -56,22 +56,27 @@ if ($unapplied) {
 push @header, emt('Date'), 
               emt('By'),
               emt('Reason'),
+              emt('Info'),
               ;
 push @fields, sub { time2str('%b %d %Y', shift->_date ) },
               'otaker',
-              'reason',
+              'reason_only',
+              'addlinfo',
               ;
-push @sort_fields, '_date', 'otaker', 'reason';
-$align .= 'rll';
+push @sort_fields, '_date', 'otaker', 'reasonnum', 'addlinfo';
+$align .= 'rlll';
 push @links,  '',
+              '',
               '',
               '',
               ;
 push @color,  '',
+              '',
               '',
               '',
               ;
 push @style,  '',
+              '',
               '',
               '',
               ;
diff --git a/httemplate/search/cust_credit_bill_pkg.html b/httemplate/search/cust_credit_bill_pkg.html
index b9bbc4dbb..0cdd8defd 100644
--- a/httemplate/search/cust_credit_bill_pkg.html
+++ b/httemplate/search/cust_credit_bill_pkg.html
@@ -14,6 +14,7 @@
                    'Date',
                    'By',
                    'Reason',
+                   'Info',
 
                    # line item
                    'Description',
@@ -33,7 +34,8 @@
 
                    sub { time2str('%b %d %Y', shift->get('cust_credit_date') ) },
                    sub { shift->cust_credit_bill->cust_credit->otaker },
-                   sub { shift->cust_credit_bill->cust_credit->reason },
+                   sub { shift->cust_credit_bill->cust_credit->reason_only },
+                   sub { shift->cust_credit_bill->cust_credit->addlinfo },
 
                    sub { $_[0]->pkgnum > 0
                            ? $_[0]->get('pkg')      # possibly use override.pkg
@@ -51,6 +53,7 @@
                    'cust_credit_date',
                    '', #'otaker',
                    '', #reason
+                   '', #addlinfo
                    '', #line item description
                    '', #location
                    @post_desc_null,
@@ -59,6 +62,7 @@
                    #cust fields
                ],
                'links' => [
+                   '',
                    '',
                    '',
                    '',
@@ -73,11 +77,12 @@
                          FS::UI::Web::cust_header()
                    ),
                ],
-               'align' => 'rrrllll'.
+               'align' => 'rrrlllll'.
                           $post_desc_align.
                           'rr'.
                           FS::UI::Web::cust_aligns(),
                'color' => [
+                              '',
                               '',
                               '',
                               '',
@@ -91,6 +96,7 @@
                               FS::UI::Web::cust_colors(),
                             ],
                'style' => [ 
+                              '',
                               '',
                               '',
                               '',
diff --git a/httemplate/search/cust_credit_source_bill_pkg.html b/httemplate/search/cust_credit_source_bill_pkg.html
index 3ef88bdf9..1d5f8d2a0 100644
--- a/httemplate/search/cust_credit_source_bill_pkg.html
+++ b/httemplate/search/cust_credit_source_bill_pkg.html
@@ -28,7 +28,7 @@
 
                    sub { time2str('%b %d %Y', shift->get('cust_credit_date') ) },
                    sub { shift->cust_credit->otaker },
-                   sub { shift->cust_credit->reason },
+                   sub { shift->cust_credit->reason }, # split into reason_only/addlinfo if addlinfo ever gets used here
 
                    sub { $_[0]->pkgnum > 0
                            ? $_[0]->get('pkg')      # possibly use override.pkg
diff --git a/httemplate/search/cust_credit_void.html b/httemplate/search/cust_credit_void.html
index 18731d144..8a8b4133e 100755
--- a/httemplate/search/cust_credit_void.html
+++ b/httemplate/search/cust_credit_void.html
@@ -47,6 +47,7 @@ push @header, emt('Void Date'),
               emt('Date'), 
               emt('By'),
               emt('Reason'),
+              emt('Info'),
               FS::UI::Web::cust_header(),
               ;
 push @fields, sub { time2str('%b %d %Y', shift->void_date ) },
@@ -54,7 +55,8 @@ push @fields, sub { time2str('%b %d %Y', shift->void_date ) },
               'void_reason',
               sub { time2str('%b %d %Y', shift->_date ) },
               'otaker',
-              'reason',
+              'reason_only',
+              'addlinfo',
               \&FS::UI::Web::cust_fields,
               ;
 push @sort_fields, 'void_date',
@@ -63,9 +65,11 @@ push @sort_fields, 'void_date',
                    '_date',
                    'usernum',                     #ditto
                    'reasonnum, reason',           #ditto 
+                   'addlinfo',
                    FS::UI::Web::cust_sort_fields();
-$align .= 'rllrll'.FS::UI::Web::cust_aligns();
+$align .= 'rllrlll'.FS::UI::Web::cust_aligns();
 push @links,  '',
+              '',
               '',
               '',
               '',
@@ -76,6 +80,7 @@ push @links,  '',
                    ),
               ;
 push @color,  '',
+              '',
               '',
               '',
               '',
@@ -84,6 +89,7 @@ push @color,  '',
               FS::UI::Web::cust_colors(),
               ;
 push @style,  '',
+              '',
               '',
               '',
               '',
-- 
cgit v1.2.1