RT#37165: Print document when account is created [fix for welcome_letter, no backport...

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

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 9255284..1d4a85a 100644 (file)
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -605,10 +605,12 @@ invoice_latexfooter
 invoice_latexsmallfooter
 invoice_latexnotes
 invoice_latexcoupon
 invoice_latexsmallfooter
 invoice_latexnotes
 invoice_latexcoupon

+invoice_latexwatermark

 invoice_html
 invoice_htmlreturnaddress
 invoice_htmlfooter
 invoice_htmlnotes
 invoice_html
 invoice_htmlreturnaddress
 invoice_htmlfooter
 invoice_htmlnotes

+invoice_htmlwatermark

 logo.png
 logo.eps
 );
 logo.png
 logo.eps
 );


@@ -703,6 +705,11 @@ sub reason_type_options {
   }
 }
 
   }
 }
 

+my $validate_email = sub { $_[0] =~
+                             /^[^@]+\@[[:alnum:]-]+(\.[[:alnum:]-]+)+$/
+                             ? '' : 'Invalid email address';
+                         };
+

 #Billing (81 items)
 #Invoicing (50 items)
 #UI (69 items)
 #Billing (81 items)
 #Invoicing (50 items)
 #UI (69 items)


@@ -1194,10 +1201,7 @@ sub reason_type_options {
     'description' => 'Return address on email invoices (address only, see invoice_from_name)',
     'type'        => 'text',
     'per_agent'   => 1,
     'description' => 'Return address on email invoices (address only, see invoice_from_name)',
     'type'        => 'text',
     'per_agent'   => 1,

-    'validate'    => sub { $_[0] =~
-                             /^[^@]+\@[[:alnum:]-]+(\.[[:alnum:]-]+)+$/
-                             ? '' : 'Invalid email address';
-                         }
+    'validate'    => $validate_email,

   },
 
   {
   },
 
   {


@@ -1303,6 +1307,15 @@ sub reason_type_options {
     'per_locale'  => 1,
   },
 
     'per_locale'  => 1,
   },
 

+  {
+    'key'         => 'invoice_htmlwatermark',
+    'section'     => 'invoicing',
+    'description' => 'Watermark for HTML invoices. Appears in a semitransparent positioned DIV overlaid on the main invoice container.',
+    'type'        => 'textarea',
+    'per_agent'   => 1,
+    'per_locale'  => 1,
+  },
+

   {
     'key'         => 'invoice_latex',
     'section'     => 'invoicing',
   {
     'key'         => 'invoice_latex',
     'section'     => 'invoicing',


@@ -1490,6 +1503,15 @@ and customer address. Include units.',
     'per_locale'  => 1,
   },
 
     'per_locale'  => 1,
   },
 

+  {
+    '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',
+    'per_agent'   => 1,
+    'per_locale'  => 1,
+  },
+

   {
     'key'         => 'invoice_email_pdf',
     'section'     => 'invoicing',
   {
     'key'         => 'invoice_email_pdf',
     'section'     => 'invoicing',


@@ -2737,6 +2759,14 @@ and customer address. Include units.',
     'type'        => 'text',
   },
 
     'type'        => 'text',
   },
 

+  {
+    'key'         => 'dump-email_to',
+    'section'     => '',
+    'description' => "Optional email address to send success/failure message for database dumps.",
+    'type'        => 'text',
+    'validate'    => $validate_email,
+  },
+

   {
     'key'         => 'users-allow_comp',
     'section'     => 'deprecated',
   {
     'key'         => 'users-allow_comp',
     'section'     => 'deprecated',


@@ -3352,14 +3382,6 @@ and customer address. Include units.',
     'per_agent'   => 1,
   },
 
     'per_agent'   => 1,
   },
 

-  {
-    'key'         => 'city_not_required',
-    'section'     => 'required',
-    'description' => 'Turn off requirement for a City to be entered for billing & shipping addresses',
-    'type'        => 'checkbox',
-    'per_agent'   => 1,
-  },
-

   {
     'key'         => 'echeck-void',
     'section'     => 'deprecated',
   {
     'key'         => 'echeck-void',
     'section'     => 'deprecated',


@@ -3952,6 +3974,13 @@ and customer address. Include units.',
     'type'        => 'text',
   },
 
     'type'        => 'text',
   },
 

+  {
+    'key'         => 'batchconfig-nacha-origin_name',
+    'section'     => 'billing',
+    'description' => 'Configuration for NACHA batching, Origin name (defaults to company name, but sometimes bank name is needed instead.)',
+    'type'        => 'text',
+  },
+

   {
     'key'         => 'batch-manual_approval',
     'section'     => 'billing',
   {
     'key'         => 'batch-manual_approval',
     'section'     => 'billing',


@@ -4494,6 +4523,13 @@ and customer address. Include units.',
     'type'        => 'checkbox',
   },
 
     'type'        => 'checkbox',
   },
 

+  {
+    'key'         => 'cust_main-no_city_in_address',
+    'section'     => 'UI',
+    'description' => 'Turn off City for billing & shipping addresses',
+    'type'        => 'checkbox',
+  },
+

   {
     'key'         => 'census_year',
     'section'     => 'UI',
   {
     'key'         => 'census_year',
     'section'     => 'UI',


@@ -5795,6 +5831,13 @@ and customer address. Include units.',
     'type'        => 'checkbox',
   },
 
     'type'        => 'checkbox',
   },
 

+  {
+    'key'         => 'selfservice-enable_payment_without_balance',
+    'section'     => 'self-service',
+    'description' => 'Allow selfservice customers to make payments even if balance is zero or below (resulting in an unapplied payment and negative balance.)',
+    'type'        => 'checkbox',
+  },
+

   {
     'key'         => 'logout-timeout',
     'section'     => 'UI',
   {
     'key'         => 'logout-timeout',
     'section'     => 'UI',