fix misplaced merge onto devel branch, #32250
authorMark Wells <mark@freeside.biz>
Mon, 21 Dec 2015 23:58:32 +0000 (15:58 -0800)
committerMark Wells <mark@freeside.biz>
Tue, 22 Dec 2015 09:03:05 +0000 (01:03 -0800)
FS/FS/Conf.pm

index eec719a..7dbc2eb 100644 (file)
@@ -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',
   },
 
   {
@@ -4322,6 +4321,7 @@ 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',
                        'tomtom'   => 'TomTom',
                        'melissa'  => 'Melissa WebSmart',