pg 8.1 fix from Chris Cappuccio

[freeside.git] / httemplate / search / report_receivables.cgi

diff --git a/httemplate/search/report_receivables.cgi b/httemplate/search/report_receivables.cgi
index 6a2dff3..1dd0fee 100755 (executable)
--- a/httemplate/search/report_receivables.cgi
+++ b/httemplate/search/report_receivables.cgi
@@ -91,6 +91,12 @@ where 0 <
          )
 END
 
+  my $agentnum = '';
+  if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
+    $agentnum = $1;
+    $where .= " AND agentnum = '$agentnum' ";
+  }
+
   my $count_sql = "select count(*) from cust_main $where";
 
   my $sql_query = {
@@ -100,7 +106,11 @@ END
     'extra_sql' => "$where order by coalesce(lower(company), ''), lower(last)",
   };
 
-  my $total_sql = "select $owed_cols";
+  if ( $agentnum ) {
+    $owed_cols =~
+      s/cust_bill\.custnum/cust_bill.custnum AND cust_main.agentnum = '$agentnum'/g;
+  }
+  my $total_sql = "select $owed_cols from cust_main";
   my $total_sth = dbh->prepare($total_sql) or die dbh->errstr;
   $total_sth->execute or die $total_sth->errstr;
   my $row = $total_sth->fetchrow_hashref();
@@ -108,16 +118,20 @@ END
   my $conf = new FS::Conf;
   my $money_char = $conf->config('money_char') || '$';
 
+  my $align = join('', map { /#/ ? 'r' : 'l' } FS::UI::Web::cust_header() ).
+             'crrrrr';
+
+  my $clink = [ "${p}view/cust_main.cgi?", 'custnum' ];
+
 %><%= include( 'elements/search.html',
                  'title'       => 'Accounts Receivable Aging Summary',
                  'name'        => 'customers',
                  'query'       => $sql_query,
                  'count_query' => $count_sql,
                  'header'      => [
-                                    '#',
-                                    'Customer',
-                                    'Status (me)',
-                                    'Status (cust_main)',
+                                    FS::UI::Web::cust_header(),
+                                    'Status', # (me)',
+                                    #'Status', # (cust_main)',
                                     '0-30',
                                     '30-60',
                                     '60-90',
@@ -125,10 +139,14 @@ END
                                     'Total',
                                   ],
                  'footer'      => [
-                                    '',
                                     'Total',
+                                    ( map '',
+                                          ( 1 .. 
+                                            scalar(FS::UI::Web::cust_header()-1)
+                                          )
+                                    ),
                                     '',
-                                    '',
+                                    #'',
                                     sprintf( $money_char.'%.2f',
                                              $row->{'owed_0_30'} ),
                                     sprintf( $money_char.'%.2f',
@@ -140,13 +158,9 @@ END
                                     sprintf( '<b>'. $money_char.'%.2f'. '</b>',
                                              $row->{'owed_total'} ),
                                   ],
-                 'align'       => 'rlccrrrrr',
-                 'size'        => [ '', '', '-1', '-1', '', '', '', '',  '', ],
-                 'style'       => [ '', '',  'b',  'b', '', '', '', '', 'b', ],
-                 'color'       => [
-                                    '',
-                                    '',
-                                    sub {  
+                 'fields'      => [
+                                    \&FS::UI::Web::cust_fields,
+                                    sub {
                                           my $row = shift;
                                           my $status = 'Cancelled';
                                           my $statuscol = 'FF0000';
@@ -158,19 +172,41 @@ END
                                               $statuscol = '00CC00';
                                             }
                                           }
-                                           $statuscol;
+                                          $status;
                                         },
-                                    sub { shift->statuscolor; },
+                                    #sub { ucfirst(shift->status) },
+                                    sub { sprintf( $money_char.'%.2f',
+                                                   shift->get('owed_0_30') ) },
+                                    sub { sprintf( $money_char.'%.2f',
+                                                   shift->get('owed_30_60') ) },
+                                    sub { sprintf( $money_char.'%.2f',
+                                                   shift->get('owed_60_90') ) },
+                                    sub { sprintf( $money_char.'%.2f',
+                                                   shift->get('owed_90_pl') ) },
+                                    sub { sprintf( $money_char.'%.2f',
+                                                   shift->get('owed_total') ) },
+                                  ],
+                 'links'       => [
+                                    ( map $clink, FS::UI::Web::cust_header() ),
+                                    '',
+                                    #'',
                                     '',
                                     '',
                                     '',
                                     '',
                                     '',
                                   ],
-                 'fields'      => [
-                                    'custnum',
-                                    'name',
-                                    sub {
+                 #'align'       => 'rlccrrrrr',
+                 'align'       => $align,
+                 #'size'        => [ '', '', '-1', '-1', '', '', '', '',  '', ],
+                 #'style'       => [ '', '',  'b',  'b', '', '', '', '', 'b', ],
+                 'size'        => [ ( map '', FS::UI::Web::cust_header() ),
+                                    '-1', '', '', '', '',  '', ],
+                 'style'       => [ ( map '', FS::UI::Web::cust_header() ),
+                                    'b', '', '', '', '', 'b', ],
+                 'color'       => [
+                                    ( map '', FS::UI::Web::cust_header() ),
+                                    sub {  
                                           my $row = shift;
                                           my $status = 'Cancelled';
                                           my $statuscol = 'FF0000';
@@ -182,20 +218,15 @@ END
                                               $statuscol = '00CC00';
                                             }
                                           }
-                                          $status;
+                                           $statuscol;
                                         },
-                                    sub { ucfirst(shift->status) },
-                                    sub { sprintf( $money_char.'%.2f',
-                                                   shift->get('owed_0_30') ) },
-                                    sub { sprintf( $money_char.'%.2f',
-                                                   shift->get('owed_30_60') ) },
-                                    sub { sprintf( $money_char.'%.2f',
-                                                   shift->get('owed_60_90') ) },
-                                    sub { sprintf( $money_char.'%.2f',
-                                                   shift->get('owed_90_pl') ) },
-                                    sub { sprintf( $money_char.'%.2f',
-                                                   shift->get('owed_total') ) },
+                                    #sub { shift->statuscolor; },
+                                    '',
+                                    '',
+                                    '',
+                                    '',
+                                    '',
                                   ],
+
              )
 %>
-