[freeside-commits] branch master updated. fead47c024e1a6c4bc49b5387a4c690dc1a4bf3d

[Ivan]

The branch, master has been updated
       via  fead47c024e1a6c4bc49b5387a4c690dc1a4bf3d (commit)
      from  84fa358b56b89205fff99927080d5c28c01d57ff (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 fead47c024e1a6c4bc49b5387a4c690dc1a4bf3d
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sun Nov 11 13:28:06 2012 -0800

    fix compilation errors, RT#13763

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 02869b1..7f3fcaa 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -14,7 +14,6 @@ use FS::conf;
 use FS::Record qw(qsearch qsearchs);
 use FS::UID qw(dbh datasrc use_confcompat);
 use FS::Misc::Invoicing qw( spool_formats );
-use FS::Misc::Geo;
 
 $base_dir = '%%%FREESIDE_CONF%%%';
 
@@ -4130,7 +4129,12 @@ and customer address. Include units.',
     'section'     => 'UI',
     'description' => 'The method to use to look up tax district codes.',
     'type'        => 'select',
-    'select_hash' => [ FS::Misc::Geo::get_district_methods() ],
+    #'select_hash' => [ FS::Misc::Geo::get_district_methods() ],
+    #after RT#13763, using FS::Misc::Geo here now causes a dependancy loop :/
+    'select_hash' => [
+                       ''         => '',
+                       'wa_sales' => 'Washington sales tax',
+                     ],
   },
 
   {
diff --git a/FS/FS/Misc/Geo.pm b/FS/FS/Misc/Geo.pm
index 6bc71fc..5cb10b2 100644
--- a/FS/FS/Misc/Geo.pm
+++ b/FS/FS/Misc/Geo.pm
@@ -9,6 +9,7 @@ use HTTP::Request::Common qw( GET POST );
 use HTML::TokeParser;
 use URI::Escape 3.31;
 use Data::Dumper;
+use FS::Conf;
 
 FS::UID->install_callback( sub {
   $conf = new FS::Conf;
@@ -137,10 +138,10 @@ sub get_censustract_ffiec {
   $return->{'statecode'} .  $return->{'countycode'} .  $return->{'tractcode'};
 }
 
-sub get_district_methods {
-  ''         => '',
-  'wa_sales' => 'Washington sales tax',
-};
+#sub get_district_methods {
+#  ''         => '',
+#  'wa_sales' => 'Washington sales tax',
+#};
 
 =item get_district LOCATION METHOD
 

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

Summary of changes:
 FS/FS/Conf.pm     |    8 ++++++--
 FS/FS/Misc/Geo.pm |    9 +++++----
 2 files changed, 11 insertions(+), 6 deletions(-)