From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 1 Aug 2018 20:34:56 +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=7ecaf988ed810746534bf85abde34022f2b5d6b2;hp=8ebe92e270a8e035e2afee0ad99cb0c411a0201c

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

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 0ada39fed..59a18c506 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -2736,6 +2736,7 @@ sub tables_hashref {
         'country',          'char',     '',       2, '', '', 
         'payby',            'char',     '',       4, '', '',
         'payinfo',       'varchar', 'NULL',     512, '', '', 
+        #'paymask',       'varchar', 'NULL', $char_d, '', '',
         #'exp',          @date_type,                  '', '',
         'exp',           'varchar', 'NULL',      11, '', '', 
         'payname',       'varchar', 'NULL', $char_d, '', '', 
diff --git a/httemplate/misc/cust_pkg-import.html b/httemplate/misc/cust_pkg-import.html
index 9bee7a060..da242a28f 100644
--- a/httemplate/misc/cust_pkg-import.html
+++ b/httemplate/misc/cust_pkg-import.html
@@ -219,9 +219,9 @@ Field information:
 
   <li><i>quantity</i>
 
-  <li><i>setup_fee</i>: Including this fee implements per-customer custom pricing for this package, overriding package definition pricing
+  <li><i>setup_fee</i>: Including this implements per-customer custom pricing for this package, overriding package definition pricing
 
-  <li><i>recur_fee</i>: Including this fee implements per-customer custom pricing for this package, overriding package definition pricing
+  <li><i>recur_fee</i>: Including this implements per-customer custom pricing for this package, overriding package definition pricing
 
   <li><i>invoice_details</i>: Package invoice details (optionally, can include multiple lines of details separated by a vertical bar)