X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FSchema.pm;h=66be8b6d49598a3205d40277f0c8327aeff97196;hb=4ee28b411fa819a420926b8a6e60be043fdb1d2e;hp=4ffeaa2e843e190d2dd47a804b117839620b5429;hpb=d3784b40552e9f00c9d803ac0833e09828c73d96;p=freeside.git

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 4ffeaa2e8..66be8b6d4 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -320,6 +320,8 @@ sub tables_hashref {
   my @perl_type = ( 'text', 'NULL', ''  ); 
   my @money_type = ( 'decimal',   '', '10,2' );
   my @money_typen = ( 'decimal',   'NULL', '10,2' );
+  my @taxrate_type  = ( 'decimal',   '',     '14,8' ); # requires pg 8 for 
+  my @taxrate_typen = ( 'decimal',   'NULL', '14,8' ); # fs-upgrade to work
 
   my $username_len = 32; #usernamemax config file
 
@@ -396,7 +398,9 @@ sub tables_hashref {
       'primary_key' => 'eventnum',
       #no... there are retries now #'unique' => [ [ 'eventpart', 'invnum' ] ],
       'unique' => [],
-      'index' => [ ['invnum'], ['status'], ['eventpart'] ],
+      'index' => [ ['invnum'], ['status'], ['eventpart'],
+                   ['statustext'], ['_date'],
+                 ],
     },
 
     'part_bill_event' => {
@@ -493,7 +497,9 @@ sub tables_hashref {
       'primary_key' => 'eventnum',
       #no... there are retries now #'unique' => [ [ 'eventpart', 'invnum' ] ],
       'unique' => [],
-      'index' => [ ['eventpart'], ['tablenum'], ['status'] ],
+      'index' => [ ['eventpart'], ['tablenum'], ['status'],
+                   ['statustext'], ['_date'],
+                 ],
     },
 
     'cust_bill_pkg' => {
@@ -525,7 +531,7 @@ sub tables_hashref {
         'invnum',  'int', 'NULL', '', '', '',           # deprecated
         'amount',  @money_typen, '', '', 
         'format',  'char', 'NULL', 1, '', '',
-        'classnum', 'char', 'NULL', 1, '', '',
+        'classnum', 'int', 'NULL', '', '', '',
         'detail',  'varchar', '', 255, '', '', 
       ],
       'primary_key' => 'detailnum',
@@ -770,17 +776,17 @@ sub tables_hashref {
         'location',    'varchar', 'NULL', $char_d, '', '',#provided by tax authority
         'taxclassnum', 'int',      '',      '', '', '', 
         'effective_date', @date_type, '', '', 
-        'tax',        'real',  '',    '', '', '',        # tax %
-        'excessrate', 'real',  'NULL','', '', '',        # second tax %
+        'tax',        @taxrate_type,      '', '',        # tax %
+        'excessrate', @taxrate_typen,     '', '',        # second tax %
         'taxbase',    @money_typen, '', '',              # amount at first tax rate
         'taxmax',     @money_typen, '', '',              # maximum about at both rates
-        'usetax',        'real',  'NULL',    '', '', '', # tax % when non-local
-        'useexcessrate', 'real',  'NULL',    '', '', '', # second tax % when non-local
+        'usetax',        @taxrate_typen,     '', '',     # tax % when non-local
+        'useexcessrate', @taxrate_typen,     '', '',     # second tax % when non-local
         'unittype',    'int',  'NULL', '', '', '',      # for fee
-        'fee',         'real', 'NULL', '', '', '',      # amount tax per unit
-        'excessfee',   'real', 'NULL', '', '', '',      # second amount tax per unit
-        'feebase',     'real', 'NULL', '', '', '',      # units taxed at first rate
-        'feemax',      'real', 'NULL', '', '', '',      # maximum number of unit taxed
+        'fee',         @taxrate_typen,     '', '',      # amount tax per unit
+        'excessfee',   @taxrate_typen,     '', '',      # second amount tax per unit
+        'feebase',     @taxrate_typen,     '', '',      # units taxed at first rate
+        'feemax',      @taxrate_typen,     '', '',      # maximum number of unit taxed
         'maxtype',     'int',  'NULL', '', '', '',      # indicator of how thresholds accumulate
         'taxname', 'varchar',  'NULL', $char_d, '', '', # may appear on invoice
         'taxauth',     'int',  'NULL', '', '', '',      # tax authority
@@ -841,6 +847,7 @@ sub tables_hashref {
         'payinfo',      'varchar', 'NULL', 512, '', '', #see cust_main above
 	'paymask',      'varchar', 'NULL', $char_d, '', '', 
         'paydate',      'varchar', 'NULL', 10, '', '', 
+        'recurring_billing', 'varchar', 'NULL', $char_d, '', '',
         #'paybatch',     'varchar', 'NULL', $char_d, '', '', #for auditing purposes.
         'payunique',    'varchar', 'NULL', $char_d, '', '', #separate paybatch "unique" functions from current usage
 
@@ -1227,7 +1234,7 @@ sub tables_hashref {
       ],
       'primary_key' => 'pkgsvcnum',
       'unique' => [ ['pkgpart', 'svcpart'] ],
-      'index' => [ ['pkgpart'] ],
+      'index' => [ ['pkgpart'], ['quantity'] ],
     },
 
     'part_referral' => {
@@ -1497,6 +1504,7 @@ sub tables_hashref {
         'svcnum',         'int', 'NULL',      '', '', '', 
         'custnum',        'int', 'NULL',      '', '', '',
         'secure',        'char', 'NULL',       1, '', '',
+        'priority',       'int', 'NULL',      '', '', '',
       ],
       'primary_key' => 'jobnum',
       'unique'      => [],