summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--FS/FS/Conf.pm2
-rw-r--r--FS/FS/cust_bill.pm5
-rw-r--r--README.1.4.0pre121
-rwxr-xr-xbin/fs-setup4
4 files changed, 7 insertions, 5 deletions
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 6bcf9c43e..2a7a4c103 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -481,7 +481,7 @@ httemplate/docs/config.html
{
'key' => 'defaultrecords',
'section' => 'BIND',
- 'description' => 'DNS entries add automatically when creating a domain',
+ 'description' => 'DNS entries to add automatically when creating a domain',
'type' => 'editlist',
'editlist_parts' => [ { type=>'text' },
{ type=>'immutable', value=>'IN' },
diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 68ef094e3..2c21f1e46 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -483,7 +483,8 @@ sub realtime_card {
if ( $conf->exists('business-onlinepayment-description') ) {
my $dtempl = $conf->config('business-onlinepayment-description');
- my $agent = $cust_main->agent->agent;
+ my $agent_obj = $cust_main->agent;
+ my $agent = $agent_obj->agent;
my $pkgs = join(', ',
map { $_->cust_pkg->part_pkg->pkg }
grep { $_->pkgnum } $self->cust_bill_pkg
@@ -944,7 +945,7 @@ sub print_text {
=head1 VERSION
-$Id: cust_bill.pm,v 1.30 2002-04-16 22:38:04 ivan Exp $
+$Id: cust_bill.pm,v 1.31 2002-04-16 22:52:14 ivan Exp $
=head1 BUGS
diff --git a/README.1.4.0pre12 b/README.1.4.0pre12
index e8fdd3070..7de0619cc 100644
--- a/README.1.4.0pre12
+++ b/README.1.4.0pre12
@@ -14,6 +14,7 @@ install the FS perl modules and httemplate as per install.html or upgrade8.html
ALTER TABLE cust_bill_event ADD status varchar(80);
ALTER TABLE cust_bill_event ADD statustext text NULL;
UPDATE cust_bill_event SET status = 'done';
+DROP INDEX cust_bill_event1;
CREATE TABLE radius_usergroup (
usergroupnum int primary key,
diff --git a/bin/fs-setup b/bin/fs-setup
index 535408891..211c73fd2 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
#!/usr/bin/perl -Tw
#
-# $Id: fs-setup,v 1.87 2002-04-11 22:05:31 ivan Exp $
+# $Id: fs-setup,v 1.88 2002-04-16 22:52:14 ivan Exp $
#to delay loading dbdef until we're ready
BEGIN { $FS::Record::setup_hack = 1; }
@@ -382,7 +382,7 @@ sub tables_hash_hack {
'statustext', 'text', 'NULL', '',
],
'primary_key' => 'eventnum',
- 'unique' => [ [ 'eventpart', 'invnum' ] ],
+ #no... there are retries now #'unique' => [ [ 'eventpart', 'invnum' ] ],
'index' => [ ['invnum'], ['status'] ],
},