[freeside-commits] branch master updated. 7ecaf988ed810746534bf85abde34022f2b5d6b2

[Ivan Kohler]

The branch, master has been updated
       via  7ecaf988ed810746534bf85abde34022f2b5d6b2 (commit)
       via  19e18e74e91345ad51a11ceed88da273188d0943 (commit)
       via  cc8b085c509ac0054b457a3b6e5f5ca647529190 (commit)
      from  8ebe92e270a8e035e2afee0ad99cb0c411a0201c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7ecaf988ed810746534bf85abde34022f2b5d6b2
Merge: 19e18e74e 8ebe92e27
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Aug 1 13:34:56 2018 -0700

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


commit 19e18e74e91345ad51a11ceed88da273188d0943
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Aug 1 13:34:53 2018 -0700

    cust_pay_batch.paymask ?

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index e2c575eb5..d47046ff2 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, '', '', 

commit cc8b085c509ac0054b457a3b6e5f5ca647529190
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Aug 1 13:33:40 2018 -0700

    wording

diff --git a/httemplate/misc/cust_pkg-import.html b/httemplate/misc/cust_pkg-import.html
index 3b200e5f3..6272d28ff 100644
--- a/httemplate/misc/cust_pkg-import.html
+++ b/httemplate/misc/cust_pkg-import.html
@@ -215,9 +215,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)
 

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/Schema.pm                      | 1 +
 httemplate/misc/cust_pkg-import.html | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)