projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
0f1ddc8
)
default census_year to 2012 going forward, for 2010 census tracts
author
ivan
<ivan>
Mon, 13 Feb 2012 22:09:25 +0000
(22:09 +0000)
committer
ivan
<ivan>
Mon, 13 Feb 2012 22:09:25 +0000
(22:09 +0000)
FS/FS/cust_main.pm
patch
|
blob
|
history
httemplate/edit/cust_main/bottomfixup.js
patch
|
blob
|
history
diff --git
a/FS/FS/cust_main.pm
b/FS/FS/cust_main.pm
index
95614e7
..
f3f6602
100644
(file)
--- a/
FS/FS/cust_main.pm
+++ b/
FS/FS/cust_main.pm
@@
-465,7
+465,7
@@
sub insert {
$self->signupdate(time) unless $self->signupdate;
$self->signupdate(time) unless $self->signupdate;
- $self->censusyear($conf->config('census_year')) if $self->censustract;
+ $self->censusyear($conf->config('census_year')
||'2012'
) if $self->censustract;
$self->auto_agent_custid()
if $conf->config('cust_main-auto_agent_custid') && ! $self->agent_custid;
$self->auto_agent_custid()
if $conf->config('cust_main-auto_agent_custid') && ! $self->agent_custid;
@@
-1534,7
+1534,7
@@
sub replace {
if ( $self->censustract ne '' and $self->censustract ne $old->censustract ) {
# update censusyear whenever tract code changes
if ( $self->censustract ne '' and $self->censustract ne $old->censustract ) {
# update censusyear whenever tract code changes
- $self->censusyear($conf->config('census_year'));
+ $self->censusyear($conf->config('census_year')
||'2012'
);
}
}
diff --git
a/httemplate/edit/cust_main/bottomfixup.js
b/httemplate/edit/cust_main/bottomfixup.js
index
9d1f1e1
..
bcddd7e
100644
(file)
--- a/
httemplate/edit/cust_main/bottomfixup.js
+++ b/
httemplate/edit/cust_main/bottomfixup.js
@@
-37,7
+37,7
@@
function post_geocode() {
var cf = document.CustomerForm;
var state_el = cf.elements['ship_state'];
var census_data = new Array(
var cf = document.CustomerForm;
var state_el = cf.elements['ship_state'];
var census_data = new Array(
- 'year', <% $conf->config('census_year') || '201
1
' %>,
+ 'year', <% $conf->config('census_year') || '201
2
' %>,
'address1', cf.elements['ship_address1'].value,
'city', cf.elements['ship_city'].value,
'state', state_el.options[ state_el.selectedIndex ].value,
'address1', cf.elements['ship_address1'].value,
'city', cf.elements['ship_city'].value,
'state', state_el.options[ state_el.selectedIndex ].value,
@@
-90,12
+90,12
@@
function update_censustract(arg) {
var choose_censustract =
'<CENTER><BR><B>Confirm censustract</B><BR>' +
'<A href="http://maps.ffiec.gov/FFIECMapper/TGMapSrv.aspx?' +
var choose_censustract =
'<CENTER><BR><B>Confirm censustract</B><BR>' +
'<A href="http://maps.ffiec.gov/FFIECMapper/TGMapSrv.aspx?' +
- 'census_year=<% $conf->config('census_year') || '20
08
' %>' +
+ 'census_year=<% $conf->config('census_year') || '20
12
' %>' +
'&latitude=' + cf.elements['latitude'].value +
'&longitude=' + cf.elements['longitude'].value +
'" target="_blank">Map service module location</A><BR>' +
'<A href="http://maps.ffiec.gov/FFIECMapper/TGMapSrv.aspx?' +
'&latitude=' + cf.elements['latitude'].value +
'&longitude=' + cf.elements['longitude'].value +
'" target="_blank">Map service module location</A><BR>' +
'<A href="http://maps.ffiec.gov/FFIECMapper/TGMapSrv.aspx?' +
- 'census_year=<% $conf->config('census_year') || '20
08
' %>' +
+ 'census_year=<% $conf->config('census_year') || '20
12
' %>' +
'&zip_code=' + cf.elements['ship_zip'].value +
'" target="_blank">Map zip code center</A><BR><BR>' +
'<TABLE>';
'&zip_code=' + cf.elements['ship_zip'].value +
'" target="_blank">Map zip code center</A><BR><BR>' +
'<TABLE>';