RT##29285: State field not needed for New Zealand

[freeside.git] / FS / FS / Conf.pm

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index ddbdc29..4c6b1e4 100644 (file)
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1381,7 +1381,7 @@ sub reason_type_options {
   },
 
   {
-    'key'         => 'invoicehtmlwatermark',
+    'key'         => 'invoice_htmlwatermark',
     'section'     => 'invoicing',
     'description' => 'Watermark for HTML invoices. Appears in a semitransparent positioned DIV overlaid on the main invoice container.',
     'type'        => 'textarea',
@@ -1577,7 +1577,7 @@ and customer address. Include units.',
   },
 
   {
-    'key'         => 'invoicelatexwatermark',
+    'key'         => 'invoice_latexwatermark',
     'section'     => 'invoicing',
     'description' => 'Watermark for LaTeX invoices. See "texdoc background" for information on what this can contain. The content itself should be enclosed in braces, optionally followed by a comma and any formatting options.',
     'type'        => 'textarea',
@@ -4553,6 +4553,13 @@ and customer address. Include units.',
   },
 
   {
+    'key'         => 'cust_main-no_city_in_address',
+    'section'     => 'UI',
+    'description' => 'Turn off City for billing & shipping addresses',
+    'type'        => 'checkbox',
+  },
+
+  {
     'key'         => 'census_year',
     'section'     => 'UI',
     'description' => 'The year to use in census tract lookups.  NOTE: you need to select 2012 or 2013 for Year 2010 Census tract codes.  A selection of 2011 provides Year 2000 Census tract codes.  Use the freeside-censustract-update tool if exisitng customers need to be changed.',