[freeside-commits] branch master updated. 271785973c230748a2575ba925d03f49668405bc

[Carl J. Adams-Collier]

The branch, master has been updated
       via  271785973c230748a2575ba925d03f49668405bc (commit)
      from  81d6b6bc794de95911a7e3f85a89def8be1dc496 (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 271785973c230748a2575ba925d03f49668405bc
Author: C.J. Adams-Collier <cjac at colliertech.org>
Date:   Tue Sep 9 13:16:21 2014 -0700

    have expanded the AR aging summary to include other fields.  Have not yet populated the fields.  FS RT #27208

diff --git a/FS/FS/ConfDefaults.pm b/FS/FS/ConfDefaults.pm
index 191ff85..df8024a 100644
--- a/FS/FS/ConfDefaults.pm
+++ b/FS/FS/ConfDefaults.pm
@@ -33,6 +33,9 @@ sub cust_fields_avail { (
   'Cust# | Cust. Status | Customer' =>
     'custnum | Status | Last, First or Company (Last, First)',
 
+  'Cust# | Day phone | Night phone | Fax number' =>
+    'custnum | (all phones)',
+
   'Cust. Status | Name | Company' =>
     'Status | Last, First | Company',
   'Cust# | Cust. Status | Name | Company' =>
diff --git a/httemplate/elements/select-cust-fields.html b/httemplate/elements/select-cust-fields.html
index 98feaf8..5e30638 100644
--- a/httemplate/elements/select-cust-fields.html
+++ b/httemplate/elements/select-cust-fields.html
@@ -1,22 +1,18 @@
-%
-%  my( $cust_fields, %opt ) = @_;
-%
-%  use FS::ConfDefaults;
-%  $opt{'avail_fields'} ||= [ FS::ConfDefaults->cust_fields_avail() ];
-%
-%  tie my %hash, 'Tie::IxHash', @{ $opt{'avail_fields'} };
-%
-%
+<%init>
+  my( $cust_fields, %opt ) = @_;
 
+  use FS::ConfDefaults;
+  $opt{'avail_fields'} ||= [ FS::ConfDefaults->cust_fields_avail() ];
+
+  tie my %hash, 'Tie::IxHash', @{ $opt{'avail_fields'} };
+</%init>
 
 <SELECT NAME="cust_fields">
 
   <OPTION VALUE="">(configured default)
-% 
-%     foreach my $value ( keys %hash ) { 
-
 
-       <OPTION VALUE="<% $value %>"><% $hash{$value} %>
+% foreach my $value ( keys %hash ) { 
+  <OPTION VALUE="<% $value %>"><% $hash{$value} %>
 % } 
 
 
diff --git a/httemplate/search/elements/cust_main_dayranges.html b/httemplate/search/elements/cust_main_dayranges.html
index 4933652..e78f2a4 100644
--- a/httemplate/search/elements/cust_main_dayranges.html
+++ b/httemplate/search/elements/cust_main_dayranges.html
@@ -15,12 +15,13 @@ Example:
   };
 
 </%doc>
+
 <& search.html,
                  'name'        => 'customers',
                  'query'       => $sql_query,
                  'count_query' => $count_sql,
-                 'header'      => [ 
-                                    FS::UI::Web::cust_header(),
+                 'header'      => [
+				    @cust_header = FS::UI::Web::cust_header($cgi->param('cust_fields')),
                                     '0-30',
                                     '30-60',
                                     '60-90',
@@ -30,12 +31,8 @@ Example:
                                   ],
                  'footer'      => [
                                     'Total',
-                                    ( map '',
-                                          ( 1 .. 
-                                            scalar(FS::UI::Web::cust_header()-1)
-                                          ),
-                                    ),
-                                    
+                                    ( map '', ( 1 .. $#cust_header ) ),
+
                                     sprintf( $money_char.'%.2f',
                                              $row->{'rangecol_0_30'} ),
                                     sprintf( $money_char.'%.2f',
@@ -58,9 +55,7 @@ Example:
                                     @pay_labels,
                                   ],
                  'links'       => [
-                                    ( map { $_ ne 'Cust. Status' ? $clink : '' }
-                                          FS::UI::Web::cust_header()
-                                    ),
+                                    ( map { $_ ne 'Cust. Status' ? $clink : '' } @cust_header) ),
                                     '',
                                     '',
                                     '',
@@ -68,10 +63,10 @@ Example:
                                     '',
                                     @pay_links,
                                   ],
-                 'align'       => FS::UI::Web::cust_aligns(). 
+                 'align'       => FS::UI::Web::cust_aligns().
                                    'rrrrr'.
                                   ('c' x @pay_labels),
-                 'size'        => [ ( map '', FS::UI::Web::cust_header() ),
+                 'size'        => [ ( map '', @cust_header ) ),
                                     #'-1', '', '', '', '',  '', ],
                                     '', '', '', '', '',  '', 
                                     ( map '', @pay_labels ),
@@ -99,6 +94,7 @@ Example:
 <%init>
 
 my %opt = @_;
+my @cust_header = ();
 
 #actually need to auto-generate other things too for a passed-in ranges to work
 my $ranges = $opt{'ranges'} ? delete($opt{'ranges'}) : [
diff --git a/httemplate/search/report_receivables.html b/httemplate/search/report_receivables.html
index 854b24a..20a98be 100755
--- a/httemplate/search/report_receivables.html
+++ b/httemplate/search/report_receivables.html
@@ -65,6 +65,15 @@ function toggle(obj) {
                 } 
   &>
 
+  <TR>
+    <TH CLASS="background" COLSPAN=2> </TH>
+  </TR>
+
+  <TR>
+    <TH CLASS="background" COLSPAN=2 ALIGN="left"><FONT SIZE="+1"><% mt('Display options') |h %></FONT></TH>
+  </TR>
+  <& /elements/tr-select-cust-fields.html &>
+
 </TABLE>
 
 <BR><INPUT TYPE="submit" VALUE="Get Report">

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

Summary of changes:
 FS/FS/ConfDefaults.pm                              |    3 +++
 httemplate/elements/select-cust-fields.html        |   22 ++++++++------------
 .../search/elements/cust_main_dayranges.html       |   22 ++++++++------------
 httemplate/search/report_receivables.html          |    9 ++++++++
 4 files changed, 30 insertions(+), 26 deletions(-)