projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
617f356
)
improve editing of district taxes, #15089
author
Mark Wells
<mark@freeside.biz>
Tue, 28 Apr 2015 20:41:41 +0000
(13:41 -0700)
committer
Mark Wells
<mark@freeside.biz>
Tue, 28 Apr 2015 20:41:41 +0000
(13:41 -0700)
httemplate/browse/cust_main_county.cgi
patch
|
blob
|
history
httemplate/edit/bulk-cust_main_county.html
patch
|
blob
|
history
httemplate/edit/process/bulk-cust_main_county.html
patch
|
blob
|
history
diff --git
a/httemplate/browse/cust_main_county.cgi
b/httemplate/browse/cust_main_county.cgi
index
dfbe119
..
e8c09e4
100755
(executable)
--- 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' =>
'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,
},
'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
(file)
--- a/
httemplate/edit/bulk-cust_main_county.html
+++ b/
httemplate/edit/bulk-cust_main_county.html
@@
-24,6
+24,20
@@
</TR>
% }
</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 %>
% 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 @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);
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
(file)
--- 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( taxname tax exempt_amount setuptax recurtax )
),
( map { $_ => $cust_main_county->get($_) }
- qw( country state county taxclass )
+ qw( country state county
city district
taxclass )
)
};
)
};