From: Mark Wells <mark@freeside.biz>
Date: Mon, 17 Oct 2016 23:15:00 +0000 (-0700)
Subject: Merge branch 'master' of git.freeside.biz:/home/git/freeside
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=068b074adcb3cd0c4d0b39d407c7bb2272a9cade;hp=76aa1ddd3ef1c63972fa4e940cbdc9a84fde35a1

Merge branch 'master' of git.freeside.biz:/home/git/freeside
---

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index a48125d09..6bfe047b9 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -774,6 +774,7 @@ my $validate_email = sub { $_[0] =~
     'section'     => 'credit_cards',
     'description' => 'Add a credit card surcharge to invoices, as a % of the invoice total.  WARNING: Although recently permitted to US merchants in general, specific consumer protection laws may prohibit or restrict this practice in California, Colorado, Connecticut, Florda, Kansas, Maine, Massachusetts, New York, Oklahome, and Texas.  Surcharging is also generally prohibited in most countries outside the US, AU and UK.  When allowed, typically not permitted to be above 4%.',
     'type'        => 'text',
+    'per_agent'   => 1,
   },
 
   {