From 7f9a709406959210d4177c6e76a5e074319abf18 Mon Sep 17 00:00:00 2001
From: Ivan Kohler <ivan@freeside.biz>
Date: Mon, 5 May 2014 20:18:09 -0700
Subject: [PATCH] add state and salesperson to customer accounting summary,
 RT#24112

---
 FS/FS/cust_main/Search.pm                          |  1 +
 httemplate/search/customer_accounting_summary.html | 31 +++++++++++++---------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/FS/FS/cust_main/Search.pm b/FS/FS/cust_main/Search.pm
index 32806401c..046e95993 100644
--- a/FS/FS/cust_main/Search.pm
+++ b/FS/FS/cust_main/Search.pm
@@ -1003,6 +1003,7 @@ sub search {
 
   my @select = (
                  'cust_main.custnum',
+                 'cust_main.salesnum',
                  # there's a good chance that we'll need these
                  'cust_main.bill_locationnum',
                  'cust_main.ship_locationnum',
diff --git a/httemplate/search/customer_accounting_summary.html b/httemplate/search/customer_accounting_summary.html
index c9cfa4088..0dab7cecf 100644
--- a/httemplate/search/customer_accounting_summary.html
+++ b/httemplate/search/customer_accounting_summary.html
@@ -87,7 +87,7 @@ as <A HREF="<% "$myself;_type=xls" %>">Excel spreadsheet</A><BR>
 <style type="text/css">
 .report * {
   background-color: #f8f8f8;
-  border: 1px solid black;
+  border: 1px solid #999999;
   padding: 2px;
 }
 .report td {
@@ -156,7 +156,6 @@ if ( $cgi->param('setuprecur') ) {
 }
 my @labels = ();
 my @cross_params = ();
-my @custnames = ();
 
 my $status = $cgi->param('status');
 die "invalid status" unless $status =~ /^\w+|$/;
@@ -171,12 +170,9 @@ $search_hash{'classnum'} = [ $cgi->param('cust_classnum') ]
   if grep { $_ eq 'cust_classnum' } $cgi->param;
 
 my $query = FS::cust_main::Search->search(\%search_hash);
-my @custs = qsearch($query);
-
-foreach my $cust_main ( @custs ) {
-
-  push @custnames, $cust_main->name;
+my @cust_main = qsearch($query);
 
+foreach my $cust_main (@cust_main) {
   push @cross_params, [ ('custnum' => $cust_main->custnum) ];
 }
 
@@ -209,7 +205,7 @@ my @cells; # arrayrefs of cell info
 # header row
 $rows[0] = {};
 $cells[0] = [
-  { header => 1, rowspan => 2, colspan => ($setuprecur ? 2 : 1) },
+  { header => 1, rowspan => 2, colspan => ($setuprecur ? 4 : 3) },
   ($setuprecur ? '' : ()),
   map {
     { header => 1, colspan => 2, value => time2str('%b %Y', $_) },
@@ -229,7 +225,7 @@ $cells[1] = [ '',
 
 # use PDL; # ha ha, I just might.
 my $row = 0;
-foreach my $name (@custnames) { # correspond to cross_params
+foreach my $cust_main (@cust_main) { # correspond to cross_params
   my $skip = 1; # skip the customer iff ALL of their values are zero
   for my $subrow (0..($setuprecur ? 1 : 0)) { # the setup/recur axis
     push @rows, { class => $subrow ? 'shaded' : '' };
@@ -237,9 +233,19 @@ foreach my $name (@custnames) { # correspond to cross_params
     if ( $subrow == 0 ) {
       # customer name
       push @thisrow,
-        { value => $name,
-          header => 1,
-          rowspan => ($setuprecur ? 2 : 1) };
+        { value   => $cust_main->name,
+          header  => 1,
+          rowspan => ($setuprecur ? 2 : 1),
+        },
+        { value   => $cust_main->state, #cust_main->bill_location->state,
+          header  => 1,
+          rowspan => ($setuprecur ? 2 : 1),
+        },
+        { value => $cust_main->salesnum ? $cust_main->sales->salesperson : '',
+          header  => 1,
+          rowspan => ($setuprecur ? 2 : 1),
+        },
+      ;
     } else {
       push @thisrow, '';
     }
@@ -278,6 +284,7 @@ for my $subrow (0..($setuprecur ? 1 : 0)) {
     push @thisrow,
       { value => mt('Total'),
         header => 1,
+        colspan => 3,
         rowspan => ($setuprecur ? 2 : 1), };
   } else {
     push @thisrow, '';
-- 
2.11.0