add pkey to batch payments and fix a doc typo

diff --git a/FS/FS/cust_pay_batch.pm b/FS/FS/cust_pay_batch.pm
index 0576cbe..671cd71 100644 (file)
--- a/FS/FS/cust_pay_batch.pm
+++ b/FS/FS/cust_pay_batch.pm
@@ -35,6 +35,8 @@ following fields are currently supported:
 
 =over 4
 
 
 =over 4
 

+=item paybatchnum - primary key (automatically assigned)
+

 =item trancode - 77 for charges
 
 =item cardnum
 =item trancode - 77 for charges
 
 =item cardnum


@@ -117,7 +119,8 @@ sub check {
   my $self = shift;
 
   my $error = 
   my $self = shift;
 
   my $error = 

-      $self->ut_numbern('trancode')
+      $self->ut_numbern('paybatchnum')
+    || $self->ut_numbern('trancode')

     || $self->ut_number('cardnum') 
     || $self->ut_money('amount')
     || $self->ut_number('invnum')
     || $self->ut_number('cardnum') 
     || $self->ut_money('amount')
     || $self->ut_number('invnum')


@@ -188,7 +191,7 @@ sub check {
 
 =head1 VERSION
 
 
 =head1 VERSION
 

-$Id: cust_pay_batch.pm,v 1.2 2000-06-17 21:48:05 ivan Exp $
+$Id: cust_pay_batch.pm,v 1.3 2001-10-02 16:00:30 jeff Exp $

 
 =head1 BUGS
 
 
 =head1 BUGS
 

diff --git a/README.1.4.0pre3-4 b/README.1.4.0pre3-4
index 6d3b0cd..9814a65 100644 (file)
--- a/README.1.4.0pre3-4
+++ b/README.1.4.0pre3-4
@@ -12,5 +12,8 @@ CREATE TABLE part_pop_local (
 );
 CREATE INDEX part_pop_local1 ON part_pop_local ( npa, nxx );
 
 );
 CREATE INDEX part_pop_local1 ON part_pop_local ( npa, nxx );
 

+ALTER TABLE cust_pay_batch ADD paybatchnum integer;
+CREATE UNIQUE INDEX cust_pay_batch_pkey ON cust_pay_batch ( paybatchnum );
+

 Run bin/dbdef-create
 
 Run bin/dbdef-create
 

diff --git a/bin/fs-setup b/bin/fs-setup
index 52a2505..476b84d 100755 (executable)
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
 #!/usr/bin/perl -Tw
 #

-# $Id: fs-setup,v 1.59 2001-09-26 09:17:06 ivan Exp $
+# $Id: fs-setup,v 1.60 2001-10-02 16:00:30 jeff Exp $

 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }


@@ -447,6 +447,7 @@ sub tables_hash_hack {
     'cust_pay_batch' => { #what's this used for again?  list of customers
                           #in current CARD batch? (necessarily CARD?)
       'columns' => [
     'cust_pay_batch' => { #what's this used for again?  list of customers
                           #in current CARD batch? (necessarily CARD?)
       'columns' => [

+        'paybatchnum',   'int',    '',   '',

         'invnum',   'int',    '',   '',
         'custnum',   'int',    '',   '',
         'last',     'varchar', '',     $char_d,
         'invnum',   'int',    '',   '',
         'custnum',   'int',    '',   '',
         'last',     'varchar', '',     $char_d,


@@ -464,7 +465,7 @@ sub tables_hash_hack {
         'payname',  'varchar', 'NULL', $char_d,
         'amount',   @money_type,
       ],
         'payname',  'varchar', 'NULL', $char_d,
         'amount',   @money_type,
       ],

-      'primary_key' => '',
+      'primary_key' => 'paybatchnum',

       'unique' => [ [] ],
       'index' => [ ['invnum'], ['custnum'] ],
     },
       'unique' => [ [] ],
       'index' => [ ['invnum'], ['custnum'] ],
     },

diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index 747b8e2..6be51d6 100644 (file)
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -132,6 +132,7 @@ ALTER TABLE svc_acct ADD domsvc integer NOT NULL;
 ALTER TABLE svc_domain ADD catchall integer NULL;
 ALTER TABLE cust_main ADD referral_custnum integer NULL;
 ALTER TABLE cust_pay ADD custnum integer;
 ALTER TABLE svc_domain ADD catchall integer NULL;
 ALTER TABLE cust_main ADD referral_custnum integer NULL;
 ALTER TABLE cust_pay ADD custnum integer;

+ALTER TABLE cust_pay_batch ADD paybatchnum integer;

 ALTER TABLE cust_refund ADD custnum integer;
 CREATE INDEX cust_main3 ON cust_main ( referral_custnum );
 CREATE INDEX cust_credit_bill1 ON cust_credit_bill ( crednum );
 ALTER TABLE cust_refund ADD custnum integer;
 CREATE INDEX cust_main3 ON cust_main ( referral_custnum );
 CREATE INDEX cust_credit_bill1 ON cust_credit_bill ( crednum );


@@ -140,13 +141,14 @@ CREATE INDEX cust_bill_pay1 ON cust_bill_pay ( invnum );
 CREATE INDEX cust_bill_pay2 ON cust_bill_pay ( paynum );
 CREATE INDEX cust_credit_refund1 ON cust_credit_refund ( crednum );
 CREATE INDEX cust_credit_refund2 ON cust_credit_refund ( refundnum );
 CREATE INDEX cust_bill_pay2 ON cust_bill_pay ( paynum );
 CREATE INDEX cust_credit_refund1 ON cust_credit_refund ( crednum );
 CREATE INDEX cust_credit_refund2 ON cust_credit_refund ( refundnum );

+CREATE UNIQUE INDEX cust_pay_batch_pkey ON cust_pay_batch ( paybatchnum );

 CREATE UNIQUE INDEX part_svc_column1 ON part_svc_column ( svcpart, columnname );
 </pre>
 
   <li>If you are using PostgreSQL, apply the following changes to your database:
 <pre>
 CREATE UNIQUE INDEX agent_pkey ON agent ( agentnum );
 CREATE UNIQUE INDEX part_svc_column1 ON part_svc_column ( svcpart, columnname );
 </pre>
 
   <li>If you are using PostgreSQL, apply the following changes to your database:
 <pre>
 CREATE UNIQUE INDEX agent_pkey ON agent ( agentnum );

-CREATE UNIQUE INDEX agent_type_pkey agent_type ( typenum );
+CREATE UNIQUE INDEX agent_type_pkey ON agent_type ( typenum );

 CREATE UNIQUE INDEX cust_bill_pkey ON cust_bill ( invnum );
 CREATE UNIQUE INDEX cust_credit_pkey ON cust_credit ( crednum );
 CREATE UNIQUE INDEX cust_main_pkey ON cust_main ( custnum );
 CREATE UNIQUE INDEX cust_bill_pkey ON cust_bill ( invnum );
 CREATE UNIQUE INDEX cust_credit_pkey ON cust_credit ( crednum );
 CREATE UNIQUE INDEX cust_main_pkey ON cust_main ( custnum );