[freeside-commits] branch master updated. ba7cfd1a5a421e04061eab8f8a8c1e44cce3f441

[Mark Wells]

The branch, master has been updated
       via  ba7cfd1a5a421e04061eab8f8a8c1e44cce3f441 (commit)
       via  8dfd98dd38686b5a5ce4c64b84e51539f93f5fbf (commit)
      from  ac0ecc2daa4e132d6a1fb3fb759cb757d376f84e (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 ba7cfd1a5a421e04061eab8f8a8c1e44cce3f441
Author: Mark Wells <mark at freeside.biz>
Date:   Sat May 16 09:14:55 2015 -0700

    avoid overwriting secondary taxes during district tax updates, #34668

diff --git a/FS/FS/geocode_Mixin.pm b/FS/FS/geocode_Mixin.pm
index 57d8ca0..611b9e5 100644
--- a/FS/FS/geocode_Mixin.pm
+++ b/FS/FS/geocode_Mixin.pm
@@ -236,6 +236,8 @@ sub process_district_update {
   my $class = shift;
   my $id = shift;
 
+  local $DEBUG = 1;
+
   eval "use FS::Misc::Geo qw(get_district); use FS::Conf; use $class;";
   die $@ if $@;
   die "$class has no location data" if !$class->can('location_hash');
@@ -255,6 +257,8 @@ sub process_district_update {
 
     my %hash = map { $_ => $tax_info->{$_} } 
       qw( district city county state country );
+    $hash{'taxname'} = '';
+
     my $old = qsearchs('cust_main_county', \%hash);
     if ( $old ) {
       my $new = new FS::cust_main_county { $old->hash, %$tax_info };

commit 8dfd98dd38686b5a5ce4c64b84e51539f93f5fbf
Author: Mark Wells <mark at freeside.biz>
Date:   Sat May 16 09:13:44 2015 -0700

    fix "same as billing" oddity

diff --git a/httemplate/edit/cust_main/basics.html b/httemplate/edit/cust_main/basics.html
index 3cf354b..1c5023d 100644
--- a/httemplate/edit/cust_main/basics.html
+++ b/httemplate/edit/cust_main/basics.html
@@ -84,7 +84,8 @@
 
   <&| /elements/onload.js &>
   rescom_changed(document.getElementById('residential_commercial_Residential'));
-  agent_changed(document.getElementById('agentnum'))
+  agent_changed(document.getElementById('agentnum'));
+  samechanged(document.getElementById('same'));
   </&>
  
 </SCRIPT>

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

Summary of changes:
 FS/FS/geocode_Mixin.pm                |    4 ++++
 httemplate/edit/cust_main/basics.html |    3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)