[freeside-commits] branch master updated. eccc0b7af126b0c7450de27165866bbb1786f65e

[Mark Wells]

The branch, master has been updated
       via  eccc0b7af126b0c7450de27165866bbb1786f65e (commit)
      from  617f35605d4f67ae62ac557baa8572561e06a1c6 (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 eccc0b7af126b0c7450de27165866bbb1786f65e
Author: Mark Wells <mark at freeside.biz>
Date:   Tue Apr 28 13:41:41 2015 -0700

    improve editing of district taxes, #15089

diff --git a/httemplate/browse/cust_main_county.cgi b/httemplate/browse/cust_main_county.cgi
index dfbe119..e8c09e4 100755
--- a/httemplate/browse/cust_main_county.cgi
+++ b/httemplate/browse/cust_main_county.cgi
@@ -10,7 +10,9 @@
                            'table'    => 'cust_main_county',
                            'hashref'  => $hashref,
                            'order_by' =>
-                  'ORDER BY country, state, county, city, district, taxclass',
+                              'ORDER BY country, state, county, city, '.
+                              'district, taxclass, '.
+                              "COALESCE(taxname, '')",
                          },
      'count_query'    => $count_query,
      'header'         => \@header,
diff --git a/httemplate/edit/bulk-cust_main_county.html b/httemplate/edit/bulk-cust_main_county.html
index 8e447e5..6b5a7c2 100644
--- a/httemplate/edit/bulk-cust_main_county.html
+++ b/httemplate/edit/bulk-cust_main_county.html
@@ -24,6 +24,20 @@
   </TR>
 % }
 
+% if ( $cities ) {
+  <& /elements/tr-td-label.html, 'label' => 'City' &>
+    <TD BGCOLOR="#dddddd"><% $cities %>
+    </TD>
+  </TR>
+% }
+
+% if ( $districts ) {
+  <& /elements/tr-td-label.html, 'label' => 'District' &>
+    <TD BGCOLOR="#dddddd"><% $districts %>
+    </TD>
+  </TR>
+% }
+
 % if ( $conf->exists('enable_taxclasses') && $taxclasses ) {
   <% include('/elements/tr-td-label.html', 'label' => 'Tax Class' ) %>
     <TD BGCOLOR="#dddddd"><% $taxclasses %>
@@ -112,6 +126,13 @@ my %seen_county = {};
 my @counties = grep !$seen_county{$_}++, map $_->county, @cust_main_county;
 my $counties = join(', ', @counties);
 
+my %seen_city = ( map { $_->city => 1 } @cust_main_county );
+my @cities = grep $_, keys %seen_city;
+my $cities = join(', ', @cities);
+
+my @districts = grep $_, map { $_->district } @cust_main_county;
+my $districts = join(', ', @districts);
+
 my %seen_taxclass = {};
 my @taxclasses = grep !$seen_taxclass{$_}++, map $_->taxclass, @cust_main_county;
 my $taxclasses = join(', ', @taxclasses);
diff --git a/httemplate/edit/process/bulk-cust_main_county.html b/httemplate/edit/process/bulk-cust_main_county.html
index af9e495..b7ff40f 100644
--- a/httemplate/edit/process/bulk-cust_main_county.html
+++ b/httemplate/edit/process/bulk-cust_main_county.html
@@ -49,7 +49,7 @@ foreach my $taxnum ( @taxnum ) {
               qw( taxname tax exempt_amount setuptax recurtax )
         ),
         ( map { $_ => $cust_main_county->get($_) }
-              qw( country state county taxclass ) 
+              qw( country state county city district taxclass ) 
         )
       };
 

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

Summary of changes:
 httemplate/browse/cust_main_county.cgi             |    4 +++-
 httemplate/edit/bulk-cust_main_county.html         |   21 ++++++++++++++++++++
 httemplate/edit/process/bulk-cust_main_county.html |    2 +-
 3 files changed, 25 insertions(+), 2 deletions(-)