projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.freeside.biz:/home/git/freeside
[freeside.git]
/
FS
/
FS
/
Conf.pm
diff --git
a/FS/FS/Conf.pm
b/FS/FS/Conf.pm
index
fa4ff41
..
641f925
100644
(file)
--- a/
FS/FS/Conf.pm
+++ b/
FS/FS/Conf.pm
@@
-1674,6
+1674,13
@@
and customer address. Include units.',
'per_agent' => 1,
},
'per_agent' => 1,
},
+ {
+ 'key' => 'refund_receipt_msgnum',
+ 'section' => 'notification',
+ 'description' => 'Template to use for manual refund receipts.',
+ %msg_template_options,
+ },
+
{
'key' => 'trigger_export_insert_on_payment',
'section' => 'billing',
{
'key' => 'trigger_export_insert_on_payment',
'section' => 'billing',
@@
-2512,7
+2519,7
@@
and customer address. Include units.',
'section' => 'billing',
'description' => 'Available payment types.',
'type' => 'selectmultiple',
'section' => 'billing',
'description' => 'Available payment types.',
'type' => 'selectmultiple',
- 'select_enum' => [ qw(CARD DCRD CHEK DCHK
BILL CASH WEST MCRD MCHK PPAL) ],
+ 'select_enum' => [ qw(CARD DCRD CHEK DCHK
) ], #
BILL CASH WEST MCRD MCHK PPAL) ],
},
{
},
{
@@
-3187,6
+3194,13
@@
and customer address. Include units.',
},
},
},
},
+ {
+ 'key' => 'ticket_system-appointment-custom_field',
+ 'section' => 'ticketing',
+ 'description' => 'Custom field from the ticketing system to use as an appointment classification.',
+ 'type' => 'text',
+ },
+
{
'key' => 'ticket_system-escalation',
'section' => 'ticketing',
{
'key' => 'ticket_system-escalation',
'section' => 'ticketing',
@@
-4038,6
+4052,13
@@
and customer address. Include units.',
'type' => 'checkbox',
},
'type' => 'checkbox',
},
+# {
+# 'key' => 'password-no_reuse',
+# 'section' => 'password',
+# 'description' => 'Minimum number of password changes before a password can be reused. By default, passwords can be reused without restriction.',
+# 'type' => 'text',
+# },
+#
{
'key' => 'datavolume-forcemegabytes',
'section' => 'UI',
{
'key' => 'datavolume-forcemegabytes',
'section' => 'UI',
@@
-4162,9
+4183,10
@@
and customer address. Include units.',
reason_type_options('R'),
},
reason_type_options('R'),
},
+ # was only used to negate invoices during signup when card was declined, now we just void
{
'key' => 'signup_credit_type',
{
'key' => 'signup_credit_type',
- 'section' => '
billing
', #self-service?
+ 'section' => '
deprecated
', #self-service?
'description' => 'The group to use for new, automatically generated credit reasons resulting from signup and self-service declines.',
reason_type_options('R'),
},
'description' => 'The group to use for new, automatically generated credit reasons resulting from signup and self-service declines.',
reason_type_options('R'),
},
@@
-5663,6
+5685,13
@@
and customer address. Include units.',
'type' => 'checkbox',
},
'type' => 'checkbox',
},
+ {
+ 'key' => 'selfservice-announcement',
+ 'section' => 'self-service',
+ 'description' => 'HTML announcement to display to all authenticated users on account overview page',
+ 'type' => 'textarea',
+ },
+
{
'key' => 'logout-timeout',
'section' => 'UI',
{
'key' => 'logout-timeout',
'section' => 'UI',