[freeside-commits] branch master updated. a631b9ccc61d5c51ab0f6f08a1d13371334f33b0
Ivan Kohler
ivan at freeside.biz
Mon Jul 29 11:21:08 PDT 2019
The branch, master has been updated
via a631b9ccc61d5c51ab0f6f08a1d13371334f33b0 (commit)
via dcd475e399e8cd59b9beb2e95d7f933bf1d6dfc1 (commit)
from f21a9f30d3dc0bab67741cb32c0357b1632e9c8b (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 a631b9ccc61d5c51ab0f6f08a1d13371334f33b0
Author: Ivan Kohler <ivan at freeside.biz>
Date: Mon Jul 29 11:21:03 2019 -0700
buster (deb 10)
diff --git a/debian/control b/debian/control
index dfae6b0f0..ec394952f 100644
--- a/debian/control
+++ b/debian/control
@@ -102,7 +102,8 @@ Depends: aspell-en,gnupg,ghostscript,gsfonts,gzip,latex-xcolor,
libgeo-streetaddress-us-perl, libbusiness-onlinepayment-perl,
libnet-vitelity-perl (>= 0.05), libnet-sslglue-perl, libexpect-perl,
libspreadsheet-parsexlsx-perl, libunicode-truncate-perl (>= 0.303-1),
- libspreadsheet-xlsx-perl, libpod-simple-perl, libwebservice-northern911-perl
+ libspreadsheet-xlsx-perl, libpod-simple-perl, libwebservice-northern911-perl,
+ liblocale-codes-perl
Conflicts: libparams-classify-perl (>= 0.013-6)
Replaces: freeside (<<4)
Breaks: freeside (<<4)
commit dcd475e399e8cd59b9beb2e95d7f933bf1d6dfc1
Author: Ivan Kohler <ivan at freeside.biz>
Date: Mon Jul 29 10:50:09 2019 -0700
import fields, RT#83362
diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 8cc8416de..2dcbb6ff6 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -694,6 +694,7 @@ sub tables_hashref {
'title', 'varchar', 'NULL', $char_d, '', '',
'body', 'blob', 'NULL', '', '', '',
'disabled', @date_type, '', '',
+ 'attachnum_import', 'int', 'NULL', '', '', '',
],
'primary_key' => 'attachnum',
'unique' => [],
@@ -1024,6 +1025,7 @@ sub tables_hashref {
'quantity', 'int', 'NULL', '', '', '',
'hidden', 'char', 'NULL', 1, '', '',
'feepart', 'int', 'NULL', '', '', '',
+ 'billpkgnum_import', 'int', 'NULL', '', '', '',
],
'primary_key' => 'billpkgnum',
'unique' => [],
@@ -1062,6 +1064,7 @@ sub tables_hashref {
'startdate', @date_type, '', '',
'regionname', 'varchar', 'NULL', $char_d, '', '',
'detail', 'varchar', '', 255, '', '',
+ 'detailnum_import', 'int', 'NULL', '', '', '',
],
'primary_key' => 'detailnum',
'unique' => [],
@@ -1094,6 +1097,7 @@ sub tables_hashref {
'post_total', 'char', 'NULL', 1, '', '',
'type', 'char', 'NULL', 1, '', '',
'summary', 'char', 'NULL', 1, '', '',
+ 'billpkgdisplaynum_import', 'int', 'NULL', '', '', '',
],
'primary_key' => 'billpkgdisplaynum',
'unique' => [],
@@ -1159,6 +1163,7 @@ sub tables_hashref {
'amount', @money_type, '', '',
'currency', 'char', 'NULL', 3, '', '',
'taxable_billpkgnum', 'int', 'NULL', '', '', '',
+ 'billpkgtaxlocationnum_import', 'int', 'NULL', '', '', '',
],
'primary_key' => 'billpkgtaxlocationnum',
'unique' => [],
@@ -1243,6 +1248,7 @@ sub tables_hashref {
'reason', 'varchar', 'NULL', $char_d, '', '',
'reasonnum', 'int', 'NULL', '', '', '',
'void_usernum', 'int', 'NULL', '', '', '',
+ 'billpkgnum_import', 'int', 'NULL', '', '', '',
],
'primary_key' => 'billpkgnum',
'unique' => [],
@@ -1286,6 +1292,7 @@ sub tables_hashref {
'startdate', @date_type, '', '',
'regionname', 'varchar', 'NULL', $char_d, '', '',
'detail', 'varchar', '', 255, '', '',
+ 'detailnum_import', 'int', 'NULL', '', '', '',
],
'primary_key' => 'detailnum',
'unique' => [],
@@ -1316,6 +1323,7 @@ sub tables_hashref {
'post_total', 'char', 'NULL', 1, '', '',
'type', 'char', 'NULL', 1, '', '',
'summary', 'char', 'NULL', 1, '', '',
+ 'billpkgdisplaynum_import', 'int', 'NULL', '', '', '',
],
'primary_key' => 'billpkgdisplaynum',
'unique' => [],
@@ -1338,6 +1346,7 @@ sub tables_hashref {
'amount', @money_type, '', '',
'currency', 'char', 'NULL', 3, '', '',
'taxable_billpkgnum', 'int', 'NULL', '', '', '',
+ 'billpkgtaxlocationnum_import', 'int', 'NULL', '', '', '',
],
'primary_key' => 'billpkgtaxlocationnum',
'unique' => [],
@@ -1401,7 +1410,8 @@ sub tables_hashref {
'commission_salesnum', 'int', 'NULL', '', '', '', #
'commission_pkgnum', 'int', 'NULL', '', '', '', #
'commission_invnum', 'int', 'NULL', '', '', '',
- 'credbatch', 'varchar', 'NULL', $char_d, '', '',
+ 'credbatch', 'varchar', 'NULL', $char_d, '', '',
+ 'crednum_import', 'int', 'NULL', '', '', '',
],
'primary_key' => 'crednum',
'unique' => [],
@@ -1465,8 +1475,9 @@ sub tables_hashref {
#void fields
'void_date', @date_type, '', '',
'void_reason', 'varchar', 'NULL', $char_d, '', '',
- 'void_reasonnum', 'int', 'NULL', '', '', '',
+ 'void_reasonnum', 'int', 'NULL', '', '', '',
'void_usernum', 'int', 'NULL', '', '', '',
+ 'crednum_import', 'int', 'NULL', '', '', '',
],
'primary_key' => 'crednum',
'unique' => [],
@@ -1525,6 +1536,7 @@ sub tables_hashref {
'_date', @date_type, '', '',
'amount', @money_type, '', '',
'pkgnum', 'int', 'NULL', '', '', '', #desired pkgnum for pkg-balances
+ 'creditbillnum_import', 'int', 'NULL', '', '', '',
],
'primary_key' => 'creditbillnum',
'unique' => [],
@@ -1553,6 +1565,7 @@ sub tables_hashref {
'setuprecur', 'varchar', '', $char_d, '', '',
'sdate', @date_type, '', '',
'edate', @date_type, '', '',
+ 'creditbillpkgnum_import', 'int', 'NULL', '', '', '',
],
'primary_key' => 'creditbillpkgnum',
'unique' => [],
@@ -1780,6 +1793,7 @@ sub tables_hashref {
'classnum', 'serial', '', '', '', '',
'classname', 'varchar', '', $char_d, '', '',
'disabled', 'char', 'NULL', 1, '', '',
+ 'classnum_import', 'int', 'NULL', '', '', '',
],
'primary_key' => 'classnum',
'unique' => [],
@@ -1855,6 +1869,7 @@ sub tables_hashref {
'_password_encoding', 'varchar', 'NULL', $char_d, '', '',
'disabled', 'char', 'NULL', 1, '', '',
'invoice_dest', 'char', 'NULL', 1, '', '',
+ 'contactnum_import', 'int', 'NULL', '', '', '',
],
'primary_key' => 'contactnum',
'unique' => [],
@@ -1886,6 +1901,7 @@ sub tables_hashref {
'phonenum', 'varchar', '', 14, '', '',
'extension', 'varchar', 'NULL', 7, '', '',
#?#'comment', 'varchar', '', $char_d, '', '',
+ 'contactphonenum_import', 'int', 'NULL', '', '', '',
],
'primary_key' => 'contactphonenum',
'unique' => [],
@@ -1916,6 +1932,7 @@ sub tables_hashref {
'contactemailnum', 'serial', '', '', '', '',
'contactnum', 'int', '', '', '', '',
'emailaddress', 'varchar', '', $char_d, '', '',
+ 'contactemailnum_import', 'int', 'NULL', '', '', '',
],
'primary_key' => 'contactemailnum',
#'unique' => [ [ 'contactnum', 'emailaddress' ], ],
@@ -2104,6 +2121,7 @@ sub tables_hashref {
'incorporated', 'char', 'NULL', 1, '', '',
'disabled', 'char', 'NULL', 1, '', '',
+ 'locationnum_import', 'int', 'NULL', '', '', '',
],
'primary_key' => 'locationnum',
'unique' => [],
@@ -2126,6 +2144,7 @@ sub tables_hashref {
'destnum', 'serial', '', '', '', '',
'custnum', 'int', '', '', '', '',
'dest', 'varchar', '', $char_d, '', '',
+ 'destnum_import', 'int', 'NULL', '', '', '',
],
'primary_key' => 'destnum',
'unique' => [],
@@ -2167,6 +2186,7 @@ sub tables_hashref {
'usernum', 'int', 'NULL', '', '', '',
'comments', 'text', 'NULL', '', '', '',
'sticky', 'int', '', '', 0, '',
+ 'notenum_import', 'int', 'NULL', '', '', '',
],
'primary_key' => 'notenum',
'unique' => [],
@@ -2200,7 +2220,8 @@ sub tables_hashref {
'categorynum', 'serial', '', '', '', '',
'categoryname', 'varchar', '', $char_d, '', '',
'weight', 'int', 'NULL', '', '', '',
- 'disabled', 'char', 'NULL', 1, '', '',
+ 'disabled', 'char', 'NULL', 1, '', '',
+ 'categorynum_import', 'int', 'NULL', '', '', '',
],
'primary_key' => 'categorynum',
'unique' => [],
@@ -2530,6 +2551,7 @@ sub tables_hashref {
'processor', 'varchar', 'NULL', $char_d, '', '', # module name
'auth', 'varchar', 'NULL', 16, '', '', # CC auth number
'order_number','varchar', 'NULL', 256, '', '', # transaction number
+ 'paynum_import', 'int', 'NULL', '', '', '',
],
'primary_key' => 'paynum',
#i guess not now, with cust_pay_pending, if we actually make it here, we _do_ want to record it# 'unique' => [ [ 'payunique' ] ],
@@ -2592,6 +2614,8 @@ sub tables_hashref {
'reason', 'varchar', 'NULL', $char_d, '', '',
'reasonnum', 'int', 'NULL', '', '', '',
'void_usernum', 'int', 'NULL', '', '', '',
+
+ 'paynum_import', 'int', 'NULL', '', '', '',
],
'primary_key' => 'paynum',
'unique' => [],
@@ -2632,6 +2656,7 @@ sub tables_hashref {
'amount', @money_type, '', '',
'_date', @date_type, '', '',
'pkgnum', 'int', 'NULL', '', '', '', #desired pkgnum for pkg-balances
+ 'billpaynum_import', 'int', 'NULL', '', '', '',
],
'primary_key' => 'billpaynum',
'unique' => [],
@@ -2681,6 +2706,7 @@ sub tables_hashref {
'setuprecur', 'varchar', '', $char_d, '', '',
'sdate', @date_type, '', '',
'edate', @date_type, '', '',
+ 'billpaypkgnum_import', 'int', 'NULL', '', '', '',
],
'primary_key' => 'billpaypkgnum',
'unique' => [],
@@ -2894,6 +2920,7 @@ sub tables_hashref {
'pkgnum', 'int', '', '', '', '',
'optionname', 'varchar', '', $char_d, '', '',
'optionvalue', 'text', 'NULL', '', '', '',
+ 'optionnum_import', 'int', 'NULL', '', '', '',
],
'primary_key' => 'optionnum',
'unique' => [],
@@ -2912,6 +2939,7 @@ sub tables_hashref {
'detail', 'varchar', '', 2*$char_d, '', '',
'detailtype', 'char', '', 1, '', '', #"I"nvoice or "C"omment
'weight', 'int', '', '', '', '',
+ 'pkgdetailnum_import', 'int', 'NULL', '', '', '',
],
'primary_key' => 'pkgdetailnum',
'unique' => [],
@@ -2932,6 +2960,7 @@ sub tables_hashref {
'otaker', 'varchar', 'NULL', 32, '', '',
'usernum', 'int', 'NULL', '', '', '',
'date', @date_type, '', '',
+ 'num_import', 'int', 'NULL', '', '', '',
],
'primary_key' => 'num',
'unique' => [],
@@ -2983,6 +3012,7 @@ sub tables_hashref {
'usernum', 'int', 'NULL', '', '', '',
'disabled', 'char', 'NULL', 1, '', '',
'setuprecur', 'char', 'NULL', 5, '', '',
+ 'pkgdiscountnum_import', 'int', 'NULL', '', '', '',
],
'primary_key' => 'pkgdiscountnum',
'unique' => [],
@@ -3047,6 +3077,7 @@ sub tables_hashref {
'pkgdiscountnum', 'int', '', '', '', '',
'amount', @money_type, '', '',
'months', 'decimal', 'NULL', '7,4', '', '',
+ 'billpkgdiscountnum_import', 'int', 'NULL', '', '', '',
],
'primary_key' => 'billpkgdiscountnum',
'unique' => [],
@@ -3068,6 +3099,7 @@ sub tables_hashref {
'pkgdiscountnum', 'int', '', '', '', '',
'amount', @money_type, '', '',
'months', 'decimal', 'NULL', '7,4', '', '',
+ 'billpkgdiscountnum_import', 'int', 'NULL', '', '', '',
],
'primary_key' => 'billpkgdiscountnum',
'unique' => [],
@@ -3094,6 +3126,7 @@ sub tables_hashref {
'disabled', 'char', 'NULL', 1, '', '',
'setup', 'char', 'NULL', 1, '', '',
#'linked', 'char', 'NULL', 1, '', '',
+ 'discountnum_import', 'int', 'NULL', '', '', '',
],
'primary_key' => 'discountnum',
'unique' => [],
@@ -3111,6 +3144,7 @@ sub tables_hashref {
'classname', 'varchar', '', $char_d, '', '',
#'categorynum', 'int', 'NULL', '', '', '',
'disabled', 'char', 'NULL', 1, '', '',
+ 'classnum_import', 'int', 'NULL', '', '', '',
],
'primary_key' => 'classnum',
'unique' => [],
@@ -3143,6 +3177,7 @@ sub tables_hashref {
'auth', 'varchar','NULL',16, '', '', # CC auth number
'order_number', 'varchar','NULL',$char_d, '', '', # transaction number
'is_tokenized', 'char', 'NULL', 1, '', '',
+ 'refundnum_import', 'int', 'NULL', '', '', '',
],
'primary_key' => 'refundnum',
'unique' => [],
@@ -3174,6 +3209,7 @@ sub tables_hashref {
'refundnum', 'int', '', '', '', '',
'amount', @money_type, '', '',
'_date', @date_type, '', '',
+ 'creditrefundnum_import', 'int', 'NULL', '', '', '',
],
'primary_key' => 'creditrefundnum',
'unique' => [],
@@ -3196,6 +3232,7 @@ sub tables_hashref {
'svcpart', 'int', '', '', '', '',
'agent_svcid', 'int', 'NULL', '', '', '',
'overlimit', @date_type, '', '',
+ 'svcnum_import', 'int', 'NULL', '', '', '',
],
'primary_key' => 'svcnum',
'unique' => [],
@@ -3652,6 +3689,7 @@ sub tables_hashref {
'hidden', 'char', 'NULL', 1, '', '',
'bulk_skip', 'char', 'NULL', 1, '', '',
'provision_hold', 'char', 'NULL', 1, '', '',
+ 'pkgsvcnum_import', 'int', 'NULL', '', '', '',
],
'primary_key' => 'pkgsvcnum',
'unique' => [ ['pkgpart', 'svcpart'] ],
@@ -3673,6 +3711,7 @@ sub tables_hashref {
'disabled', 'char', 'NULL', 1, '', '',
'agentnum', 'int', 'NULL', '', '', '',
'title', 'varchar', 'NULL', $char_d, '', '',
+ 'refnum_import', 'int', 'NULL', '', '', '',
],
'primary_key' => 'refnum',
'unique' => [ ['agentnum', 'title'] ],
@@ -3695,6 +3734,7 @@ sub tables_hashref {
'classnum', 'int', 'NULL', '', '', '',
'restrict_edit_password','char', 'NULL', 1, '', '',
'has_router', 'char', 'NULL', 1, '', '',
+ 'svcpart_import', 'int', 'NULL', '', '', '',
],
'primary_key' => 'svcpart',
'unique' => [],
@@ -3715,6 +3755,7 @@ sub tables_hashref {
'columnvalue', 'varchar', 'NULL', 512, '', '',
'columnflag', 'char', 'NULL', 1, '', '',
'required', 'char', 'NULL', 1, '', '',
+ 'columnnum_import', 'int', 'NULL', '', '', '',
],
'primary_key' => 'columnnum',
'unique' => [ [ 'svcpart', 'columnname' ] ],
@@ -3730,7 +3771,8 @@ sub tables_hashref {
'columns' => [
'classnum', 'serial', '', '', '', '',
'classname', 'varchar', '', $char_d, '', '',
- 'disabled', 'char', 'NULL', 1, '', '',
+ 'disabled', 'char', 'NULL', 1, '', '',
+ 'classnum_import', 'int', 'NULL', '', '', '',
],
'primary_key' => 'classnum',
'unique' => [],
@@ -3866,6 +3908,7 @@ sub tables_hashref {
'svc_acct' => {
'columns' => [
'svcnum', 'int', '', '', '', '',
+ 'svcnum_import', 'int', 'NULL', '', '', '',
'username', 'varchar', '', $username_len, '', '',
'_password', 'varchar', 'NULL', 512, '', '',
'_password_encoding', 'varchar', 'NULL', $char_d, '', '',
@@ -3998,6 +4041,7 @@ sub tables_hashref {
'svc_domain' => {
'columns' => [
'svcnum', 'int', '', '', '', '',
+ 'svcnum_import', 'int', 'NULL', '', '', '',
'domain', 'varchar', '', $char_d, '', '',
'suffix', 'varchar', 'NULL', $char_d, '', '',
'catchall', 'int', 'NULL', '', '', '',
@@ -4539,10 +4583,11 @@ sub tables_hashref {
'export_svc' => {
'columns' => [
- 'exportsvcnum' => 'serial', '', '', '', '',
- 'exportnum' => 'int', '', '', '', '',
- 'svcpart' => 'int', '', '', '', '',
- 'role' => 'varchar', 'NULL', 16, '', '',
+ 'exportsvcnum', 'serial', '', '', '', '',
+ 'exportnum', 'int', '', '', '', '',
+ 'svcpart', 'int', '', '', '', '',
+ 'role', 'varchar', 'NULL', 16, '', '',
+ 'exportsvcnum_import', 'int', 'NULL', '', '', '',
],
'primary_key' => 'exportsvcnum',
'unique' => [ [ 'exportnum', 'svcpart' ] ],
@@ -4606,6 +4651,7 @@ sub tables_hashref {
'default_machine','int', 'NULL', '', '', '',
'no_suspend', 'char', 'NULL', 1, '', '',
# could also have 'no_insert', 'no_replace', etc.
+ 'exportnum_import', 'int', 'NULL', '', '', '',
],
'primary_key' => 'exportnum',
'unique' => [],
@@ -4624,6 +4670,7 @@ sub tables_hashref {
'exportnum', 'int', '', '', '', '',
'optionname', 'varchar', '', $char_d, '', '',
'optionvalue', 'text', 'NULL', '', '', '',
+ 'optionnum_import', 'int', 'NULL', '', '', '',
],
'primary_key' => 'optionnum',
'unique' => [],
@@ -4641,6 +4688,7 @@ sub tables_hashref {
'svcnum', 'int', '', '', '', '',
'groupname', 'varchar', 'NULL', $char_d, '', '', #deprecated
'groupnum', 'int', 'NULL', '', '', '',
+ 'usergroupnum_import', 'int', 'NULL', '', '', '',
],
'primary_key' => 'usergroupnum',
'unique' => [],
@@ -4663,6 +4711,7 @@ sub tables_hashref {
'priority', 'int', '', '', '1', '',
'speed_up', 'int', 'NULL', '', '', '',
'speed_down', 'int', 'NULL', '', '', '',
+ 'groupnum_import', 'int', 'NULL', '', '', '',
],
'primary_key' => 'groupnum',
'unique' => [ ['groupname'] ],
@@ -4872,6 +4921,7 @@ sub tables_hashref {
'svc_broadband' => {
'columns' => [
'svcnum', 'int', '', '', '', '',
+ 'svcnum_import', 'int', 'NULL', '', '', '',
'description', 'varchar', 'NULL', $char_d, '', '',
'routernum', 'int', 'NULL', '', '', '',
'blocknum', 'int', 'NULL', '', '', '',
@@ -5079,6 +5129,7 @@ sub tables_hashref {
'refundnum', 'int', '', '', '', '',
'_date', @date_type, '', '',
'amount', @money_type, '', '',
+ 'payrefundnum_import', 'int', 'NULL', '', '', '',
],
'primary_key' => 'payrefundnum',
'unique' => [],
@@ -5099,6 +5150,7 @@ sub tables_hashref {
'pkgpart', 'int', '', '', '', '',
'optionname', 'varchar', '', $char_d, '', '',
'optionvalue', 'text', 'NULL', '', '', '',
+ 'optionnum_import', 'int', 'NULL', '', '', '',
],
'primary_key' => 'optionnum',
'unique' => [],
@@ -5186,6 +5238,7 @@ sub tables_hashref {
'fccoptionname', 'varchar', '', $char_d, '', '',
'pkgpart', 'int', '', '', '', '',
'optionvalue', 'varchar', 'NULL', $char_d, '', '',
+ 'num_import', 'int', 'NULL', '', '', '',
],
'primary_key' => 'num',
'unique' => [ [ 'fccoptionname', 'pkgpart' ] ],
@@ -5514,6 +5567,7 @@ sub tables_hashref {
'ticketing_queueid', 'int', 'NULL', '', '', '',
'condense', 'char', 'NULL', 1, '', '',
'disabled', 'char', 'NULL', 1, '', '',
+ 'categorunum_import', 'int', 'NULL', '', '', '',
],
'primary_key' => 'categorynum',
'unique' => [],
@@ -5527,6 +5581,7 @@ sub tables_hashref {
'categorynum', 'int', 'NULL', '', '', '',
'disabled', 'char', 'NULL', 1, '', '',
'fcc_ds0s', 'int', 'NULL', '', '', '',
+ 'classnum_import', 'int', 'NULL', '', '', '',
],
'primary_key' => 'classnum',
'unique' => [],
@@ -6295,6 +6350,7 @@ sub tables_hashref {
'typenum', 'serial', '', '', '', '',
'class', 'char', '', 1, '', '',
'type', 'varchar', '', $char_d, '', '',
+ 'typenum_import', 'int', 'NULL', '', '', '',
],
'primary_key' => 'typenum',
'unique' => [],
@@ -6313,6 +6369,7 @@ sub tables_hashref {
'feepart', 'int', 'NULL', '', '', '',
'fee_on_unsuspend','char', 'NULL', 1, '', '',
'fee_hold', 'char', 'NULL', 1, '', '',
+ 'reasonnum_import', 'int', 'NULL', '', '', '',
],
'primary_key' => 'reasonnum',
'unique' => [],
@@ -6352,6 +6409,7 @@ sub tables_hashref {
'pkgrefnum', 'serial', '', '', '', '',
'pkgnum', 'int', '', '', '', '',
'refnum', 'int', '', '', '', '',
+ 'pkgrefnum_import', 'int', 'NULL', '', '', '',
],
'primary_key' => 'pkgrefnum',
'unique' => [ [ 'pkgnum', 'refnum' ] ],
-----------------------------------------------------------------------
Summary of changes:
FS/FS/Schema.pm | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
debian/control | 3 ++-
2 files changed, 68 insertions(+), 9 deletions(-)
More information about the freeside-commits
mailing list