X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FSchema.pm;h=d354561e53874b5f4c2789a07766e2fae4cc8355;hb=44b5d849d7fb3af5ea1e2812097126633add0fd4;hp=f8dd38b8c75f609d4e76b60e4cadd9b312d8df8a;hpb=8333462f80da553234ef53076a932e9f417e6ad2;p=freeside.git diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm index f8dd38b8c..d354561e5 100644 --- a/FS/FS/Schema.pm +++ b/FS/FS/Schema.pm @@ -192,6 +192,14 @@ sub dbdef_dist { } keys %indices; + $h_indices{"h_${table}_srckey"} = DBIx::DBSchema::Index->new({ + 'name' => "h_${table}_srckey", + 'unique' => 0, + 'columns' => [ 'history_action', #right? + $tableobj->primary_key, + ], + }); + my $h_tableobj = DBIx::DBSchema::Table->new( { 'name' => "h_$table", 'primary_key' => 'historynum', @@ -488,6 +496,10 @@ sub tables_hashref { 'sdate', @date_type, '', '', 'edate', @date_type, '', '', 'itemdesc', 'varchar', 'NULL', $char_d, '', '', + 'section', 'varchar', 'NULL', $char_d, '', '', + 'quantity', 'int', 'NULL', '', '', '', + 'unitsetup', @money_typen, '', '', + 'unitrecur', @money_typen, '', '', ], 'primary_key' => 'billpkgnum', 'unique' => [], @@ -497,13 +509,50 @@ sub tables_hashref { 'cust_bill_pkg_detail' => { 'columns' => [ 'detailnum', 'serial', '', '', '', '', - 'pkgnum', 'int', '', '', '', '', - 'invnum', 'int', '', '', '', '', + 'billpkgnum', 'int', 'NULL', '', '', '', # should not be nullable + 'pkgnum', 'int', 'NULL', '', '', '', # deprecated + 'invnum', 'int', 'NULL', '', '', '', # deprecated + 'amount', @money_typen, '', '', + 'format', 'char', 'NULL', 1, '', '', + 'classnum', 'char', 'NULL', 1, '', '', 'detail', 'varchar', '', $char_d, '', '', ], 'primary_key' => 'detailnum', 'unique' => [], - 'index' => [ [ 'pkgnum', 'invnum' ] ], + 'index' => [ [ 'billpkgnum' ], [ 'pkgnum', 'invnum' ] ], + }, + + #instead of 'duplicate', 'char', 'NULL', 1, '', '', + # that way we keep display vs *TOTALLY* out of the table for actual + # finanancial line items + 'cust_bill_pkg_display' => { + 'columns' => [ + 'billpkgdisplaynum', 'serial', '', '', '', '', + 'billpkgnum', 'int', '', '', '', '', + 'section', 'varchar', 'NULL', $char_d, '', '', + #override the linked real one?#'unitsetup', @money_typen, '', '', + #this too?#'unitrecur', @money_typen, '', '', + 'post_total', 'char', 'NULL', 1, '', '', + 'type', 'char', 'NULL', 1, '', '', + #any other fields we need to control this display-only line item... + ], + 'primary_key' => 'billpkgdisplaynum', + 'unique' => [], + 'index' => [ ['billpkgnum'], ], + }, + + #and this, to break down a line item into slices for taxation purposes + #(instead of creating usage line items for each usage class) + 'cust_bill_pkg_slice' => { + 'columns' => [ + 'slicenum', 'serial', '', '', '', '', + 'billpkgnum', 'int', '', '', '', '', + 'amount', @money_typen, '', '', + 'classnum', 'int', '', '', '', '', + ], + 'primary_key' => 'slicenum', + 'unique' => [], + 'index' => [ [ 'billpkgnum' ], [ 'classnum' ], ], }, 'cust_credit' => { @@ -555,6 +604,7 @@ sub tables_hashref { 'custnum', 'serial', '', '', '', '', 'agentnum', 'int', '', '', '', '', 'agent_custid', 'varchar', 'NULL', $char_d, '', '', + 'custbatch', 'varchar', 'NULL', $char_d, '', '', # 'titlenum', 'int', 'NULL', '', '', '', 'last', 'varchar', '', $char_d, '', '', # 'middle', 'varchar', 'NULL', $char_d, '', '', @@ -608,6 +658,7 @@ sub tables_hashref { 'referral_custnum', 'int', 'NULL', '', '', '', 'comments', 'text', 'NULL', '', '', '', 'spool_cdr','char', 'NULL', 1, '', '', + 'squelch_cdr','char', 'NULL', 1, '', '', 'invoice_terms', 'varchar', 'NULL', $char_d, '', '', ], 'primary_key' => 'custnum', @@ -619,6 +670,7 @@ sub tables_hashref { [ 'ship_last' ], [ 'ship_company' ], [ 'ship_daytime' ], [ 'ship_night' ], [ 'ship_fax' ], [ 'payby' ], [ 'paydate' ], + [ 'agentnum' ], [ 'custbatch' ], ], }, @@ -695,6 +747,7 @@ sub tables_hashref { 'setuptax', 'char', 'NULL', 1, '', '', # Y = setup tax exempt 'recurtax', 'char', 'NULL', 1, '', '', # Y = recur tax exempt 'manual', 'char', 'NULL', 1, '', '', # Y = manually edited + 'disabled', 'char', 'NULL', 1, '', '', # Y = tax disabled ], 'primary_key' => 'taxnum', 'unique' => [], @@ -899,6 +952,7 @@ sub tables_hashref { 'change_pkgnum', 'int', 'NULL', '', '', '', 'change_pkgpart', 'int', 'NULL', '', '', '', 'manual_flag', 'char', 'NULL', 1, '', '', + 'quantity', 'int', 'NULL', '', '', '', ], 'primary_key' => 'pkgnum', 'unique' => [], @@ -921,17 +975,31 @@ sub tables_hashref { 'index' => [ [ 'pkgnum' ], [ 'optionname' ] ], }, + 'cust_pkg_detail' => { + 'columns' => [ + 'pkgdetailnum', 'serial', '', '', '', '', + 'pkgnum', 'int', '', '', '', '', + 'detail', 'varchar', '', $char_d, '', '', + 'detailtype', 'char', '', 1, '', '', # "I"nvoice or "C"omment + 'weight', 'int', '', '', '', '', + ], + 'primary_key' => 'pkgdetailnum', + 'unique' => [], + 'index' => [ [ 'pkgnum', 'detailtype' ] ], + }, + 'cust_pkg_reason' => { 'columns' => [ 'num', 'serial', '', '', '', '', 'pkgnum', 'int', '', '', '', '', 'reasonnum','int', '', '', '', '', + 'action', 'char', 'NULL', 1, '', '', #should not be nullable 'otaker', 'varchar', '', 32, '', '', 'date', @date_type, '', '', ], 'primary_key' => 'num', 'unique' => [], - 'index' => [], + 'index' => [ [ 'pkgnum' ], [ 'reasonnum' ], ['action'], ], }, 'cust_refund' => { @@ -981,6 +1049,18 @@ sub tables_hashref { 'index' => [ ['svcnum'], ['pkgnum'], ['svcpart'] ], }, + 'cust_svc_option' => { + 'columns' => [ + 'optionnum', 'serial', '', '', '', '', + 'svcnum', 'int', '', '', '', '', + 'optionname', 'varchar', '', $char_d, '', '', + 'optionvalue', 'text', 'NULL', '', '', '', + ], + 'primary_key' => 'optionnum', + 'unique' => [], + 'index' => [ [ 'svcnum' ], [ 'optionname' ] ], + }, + 'part_pkg' => { 'columns' => [ 'pkgpart', 'serial', '', '', '', '', @@ -1069,6 +1149,7 @@ sub tables_hashref { 'taxoverridenum', 'serial', '', '', '', '', 'pkgpart', 'serial', '', '', '', '', 'taxclassnum', 'serial', '', '', '', '', + 'usage_class', 'varchar', 'NULL', $char_d, '', '', ], 'primary_key' => 'taxoverridenum', 'unique' => [], @@ -1637,6 +1718,7 @@ sub tables_hashref { 'min_charge', 'decimal', '', '10,5', '', '', 'sec_granularity', 'int', '', '', '', '', #time period (link to table of periods)? + 'classnum', 'int', 'NULL', '', '', '', ], 'primary_key' => 'ratedetailnum', 'unique' => [ [ 'ratenum', 'orig_regionnum', 'dest_regionnum' ] ], @@ -1666,6 +1748,17 @@ sub tables_hashref { 'index' => [ [ 'countrycode' ], [ 'regionnum' ] ], }, + 'usage_class' => { + 'columns' => [ + 'classnum', 'serial', '', '', '', '', + 'classname', 'varchar', '', $char_d, '', '', + 'disabled', 'char', 'NULL', 1, '', '', + ], + 'primary_key' => 'classnum', + 'unique' => [], + 'index' => [ ['disabled'] ], + }, + 'reg_code' => { 'columns' => [ 'codenum', 'serial', '', '', '', '', @@ -1765,11 +1858,23 @@ sub tables_hashref { 'index' => [], }, + 'pkg_category' => { + 'columns' => [ + 'categorynum', 'serial', '', '', '', '', + 'categoryname', 'varchar', '', $char_d, '', '', + 'disabled', 'char', 'NULL', 1, '', '', + ], + 'primary_key' => 'categorynum', + 'unique' => [], + 'index' => [ ['disabled'] ], + }, + 'pkg_class' => { 'columns' => [ - 'classnum', 'serial', '', '', '', '', - 'classname', 'varchar', '', $char_d, '', '', - 'disabled', 'char', 'NULL', 1, '', '', + 'classnum', 'serial', '', '', '', '', + 'classname', 'varchar', '', $char_d, '', '', + 'categorynum', 'int', 'NULL', '', '', '', + 'disabled', 'char', 'NULL', 1, '', '', ], 'primary_key' => 'classnum', 'unique' => [], @@ -1859,10 +1964,12 @@ sub tables_hashref { #NULL, done (or something) 'freesidestatus', 'varchar', 'NULL', 32, '', '', + 'cdrbatch', 'varchar', 'NULL', $char_d, '', '', + ], 'primary_key' => 'acctid', 'unique' => [], - 'index' => [ [ 'calldate' ], [ 'dst' ], [ 'accountcode' ], [ 'freesidestatus' ] ], + 'index' => [ [ 'calldate' ], [ 'dst' ], [ 'accountcode' ], [ 'freesidestatus' ], [ 'cdrbatch' ], ], }, 'cdr_calltype' => { @@ -2002,16 +2109,32 @@ sub tables_hashref { 'svc_phone' => { 'columns' => [ - 'svcnum', 'int', '', '', '', '', - 'countrycode', 'varchar', '', 3, '', '', - 'phonenum', 'varchar', '', 15, '', '', #12 ? - 'pin', 'varchar', 'NULL', $char_d, '', '', + 'svcnum', 'int', '', '', '', '', + 'countrycode', 'varchar', '', 3, '', '', + 'phonenum', 'varchar', '', 15, '', '', #12 ? + 'pin', 'varchar', 'NULL', $char_d, '', '', + 'sip_password', 'varchar', 'NULL', $char_d, '', '', + 'phone_name', 'varchar', 'NULL', $char_d, '', '', ], 'primary_key' => 'svcnum', 'unique' => [], 'index' => [ [ 'countrycode', 'phonenum' ] ], }, + 'phone_avail' => { + 'columns' => [ + 'availnum', 'int', '', '', '', '', + 'exportnum', 'int', '', '', '', '', + 'countrycode', 'varchar', '', 3, '', '', + 'state', 'char', 'NULL', 2, '', '', + 'npa', 'char', '', 3, '', '', + 'nxx', 'char', 'NULL', 3, '', '', + ], + 'primary_key' => 'availnum', + 'unique' => [], + 'index' => [ [ 'exportnum', 'countrycode', 'state' ] ], + }, + 'reason_type' => { 'columns' => [ 'typenum', 'serial', '', '', '', '',