X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Freport_receivables.cgi;h=77e1d4a3603817a2dac5dbbd40ad8bc34b0d9a26;hb=2f3390c76813f42a5456730f58a5fcb69d320bde;hp=6a2dff3e1ee1fcf3e69e5478ff789bd706ece373;hpb=ae7a7aedd844e581638d435e432e08a76f8097d1;p=freeside.git

diff --git a/httemplate/search/report_receivables.cgi b/httemplate/search/report_receivables.cgi
index 6a2dff3e1..77e1d4a36 100755
--- 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,6 +106,10 @@ END
     'extra_sql' => "$where order by coalesce(lower(company), ''), lower(last)",
   };
 
+  if ( $agentnum ) {
+    $owed_cols =~
+      s/cust_bill\.custnum/cust_bill.custnum AND cust_main.agentnum = '$agentnum'/g;
+  }
   my $total_sql = "select $owed_cols";
   my $total_sth = dbh->prepare($total_sql) or die dbh->errstr;
   $total_sth->execute or die $total_sth->errstr;
@@ -116,8 +126,8 @@ END
                  'header'      => [
                                     '#',
                                     'Customer',
-                                    'Status (me)',
-                                    'Status (cust_main)',
+                                    'Status', # (me)',
+                                    #'Status', # (cust_main)',
                                     '0-30',
                                     '30-60',
                                     '60-90',
@@ -128,7 +138,7 @@ END
                                     '',
                                     'Total',
                                     '',
-                                    '',
+                                    #'',
                                     sprintf( $money_char.'%.2f',
                                              $row->{'owed_0_30'} ),
                                     sprintf( $money_char.'%.2f',
@@ -140,13 +150,10 @@ END
                                     sprintf( '<b>'. $money_char.'%.2f'. '</b>',
                                              $row->{'owed_total'} ),
                                   ],
-                 'align'       => 'rlccrrrrr',
-                 'size'        => [ '', '', '-1', '-1', '', '', '', '',  '', ],
-                 'style'       => [ '', '',  'b',  'b', '', '', '', '', 'b', ],
-                 'color'       => [
-                                    '',
-                                    '',
-                                    sub {  
+                 'fields'      => [
+                                    'custnum',
+                                    'name',
+                                    sub {
                                           my $row = shift;
                                           my $status = 'Cancelled';
                                           my $statuscol = 'FF0000';
@@ -158,19 +165,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'       => [
+                                    [ "${p}view/cust_main.cgi?", 'custnum' ],
+                                    [ "${p}view/cust_main.cgi?", 'custnum' ],
+                                    '',
+                                    #'',
                                     '',
                                     '',
                                     '',
                                     '',
                                     '',
                                   ],
-                 'fields'      => [
-                                    'custnum',
-                                    'name',
-                                    sub {
+                 #'align'       => 'rlccrrrrr',
+                 'align'       => 'rlcrrrrr',
+                 #'size'        => [ '', '', '-1', '-1', '', '', '', '',  '', ],
+                 #'style'       => [ '', '',  'b',  'b', '', '', '', '', 'b', ],
+                 'size'        => [ '', '', '-1', '', '', '', '',  '', ],
+                 'style'       => [ '', '',  'b', '', '', '', '', 'b', ],
+                 'color'       => [
+                                    '',
+                                    '',
+                                    sub {  
                                           my $row = shift;
                                           my $status = 'Cancelled';
                                           my $statuscol = 'FF0000';
@@ -182,20 +211,16 @@ 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; },
+                                    '',
+                                    '',
+                                    '',
+                                    '',
+                                    '',
                                   ],
+
              )
 %>