[freeside-commits] branch master updated. dd003d59f56742f9374cec309ad81d527e88c846

[Ivan]

The branch, master has been updated
       via  dd003d59f56742f9374cec309ad81d527e88c846 (commit)
       via  2040b70c10db3390b26777bc584d54333534419d (commit)
      from  7ec6e27220e3fe82405c911a4c52b24070438328 (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 dd003d59f56742f9374cec309ad81d527e88c846
Merge: 2040b70 7ec6e27
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sat Dec 26 12:30:18 2015 -0800

    Merge branch 'master' of git.freeside.biz:/home/git/freeside

diff --cc FS/FS/Conf.pm
index 72421c7,7dbc2eb..e066225
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@@ -4321,8 -4321,8 +4321,9 @@@ and customer address. Include units.'
      'description' => 'Method for standardizing customer addresses.',
      'type'        => 'select',
      'select_hash' => [ '' => '', 
+                        'uscensus' => 'U.S. Census Bureau',
                         'usps'     => 'U.S. Postal Service',
 +                       'uscensus' => 'U.S. Census Bureau',
                         'tomtom'   => 'TomTom',
                         'melissa'  => 'Melissa WebSmart',
                       ],

commit 2040b70c10db3390b26777bc584d54333534419d
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sat Dec 26 12:30:10 2015 -0800

    fix mis-application of change, #32250

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index eec719a..72421c7 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -4289,7 +4289,6 @@ and customer address. Include units.',
     'section'     => 'invoicing',
     'description' => 'Instead of showing payments (and credits) applied to the invoice, show those received since the previous invoice date.',
     'type'        => 'checkbox',
-                       'uscensus' => 'U.S. Census Bureau',
   },
 
   {
@@ -4323,6 +4322,7 @@ and customer address. Include units.',
     'type'        => 'select',
     'select_hash' => [ '' => '', 
                        'usps'     => 'U.S. Postal Service',
+                       'uscensus' => 'U.S. Census Bureau',
                        'tomtom'   => 'TomTom',
                        'melissa'  => 'Melissa WebSmart',
                      ],

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

Summary of changes:
 FS/FS/Conf.pm |    1 +
 1 file changed, 1 insertion(+)