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
bac6a76
..
302bae7
100644
(file)
--- a/
FS/FS/Conf.pm
+++ b/
FS/FS/Conf.pm
@@
-789,6
+789,14
@@
my $validate_email = sub { $_[0] =~
},
{
},
{
+ 'key' => 'credit-card-surcharge-text',
+ 'section' => 'credit_cards',
+ 'description' => 'Text for the credit card surcharge invoice line. If not set, it will default to Credit Card Surcharge.',
+ 'type' => 'text',
+ 'per_agent' => 1,
+ },
+
+ {
'key' => 'discount-show-always',
'section' => 'invoicing',
'description' => 'Generate a line item on an invoice even when a package is discounted 100%',
'key' => 'discount-show-always',
'section' => 'invoicing',
'description' => 'Generate a line item on an invoice even when a package is discounted 100%',
@@
-2169,7
+2177,7
@@
and customer address. Include units.',
{
'key' => 'unmask_ss',
{
'key' => 'unmask_ss',
- 'section' => '
e-checks
',
+ 'section' => '
deprecated
',
'description' => "Don't mask social security numbers in the web interface.",
'type' => 'checkbox',
},
'description' => "Don't mask social security numbers in the web interface.",
'type' => 'checkbox',
},