projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add more options to freeside-overdue
[freeside.git]
/
FS
/
bin
/
freeside-bill
diff --git
a/FS/bin/freeside-bill
b/FS/bin/freeside-bill
index
1dce9a1
..
49ec43c
100755
(executable)
--- a/
FS/bin/freeside-bill
+++ b/
FS/bin/freeside-bill
@@
-1,3
+1,5
@@
+#!/usr/bin/perl -w
+# don't take any world-facing input
#!/usr/bin/perl -Tw
use strict;
#!/usr/bin/perl -Tw
use strict;
@@
-9,8
+11,8
@@
use FS::Record qw(qsearch qsearchs);
use FS::cust_main;
&untaint_argv; #what it sounds like (eww)
use FS::cust_main;
&untaint_argv; #what it sounds like (eww)
-use vars qw($opt_a $opt_c $opt_i $opt_d);
-getopts("acid:");
+use vars qw($opt_a $opt_c $opt_i $opt_d
$opt_p
);
+getopts("acid:
p
");
my $user = shift or die &usage;
adminsuidsetup $user;
my $user = shift or die &usage;
adminsuidsetup $user;
@@
-20,7
+22,7
@@
my %bill_only = map { $_ => 1 } (
);
#we're at now now (and later).
);
#we're at now now (and later).
-my($time)= $
main::opt_d ? str2time($main::
opt_d) : $^T;
+my($time)= $
opt_d ? str2time($
opt_d) : $^T;
# find packages w/ bill < time && cancel != '', and create corresponding
# customer objects
# find packages w/ bill < time && cancel != '', and create corresponding
# customer objects
@@
-32,7
+34,7
@@
foreach $cust_main (
$saw{ $_->custnum } = 0; # to avoid 'use of uninitialized value' errors
}
if (
$saw{ $_->custnum } = 0; # to avoid 'use of uninitialized value' errors
}
if (
- ( $
main::
opt_a || ( ( $_->getfield('bill') || 0 ) <= $time ) )
+ ( $opt_a || ( ( $_->getfield('bill') || 0 ) <= $time ) )
&& $bill_only{ $_->custnum }
&& !$saw{ $_->custnum }++
) {
&& $bill_only{ $_->custnum }
&& !$saw{ $_->custnum }++
) {
@@
-55,16
+57,16
@@
foreach $cust_main (
warn "Error billing, customer #" . $cust_main->getfield('custnum') .
":" . $error if $error;
warn "Error billing, customer #" . $cust_main->getfield('custnum') .
":" . $error if $error;
- if ($
main::
opt_p) {
+ if ($opt_p) {
$cust_main->apply_payments;
$cust_main->apply_payments;
- $
error=$
cust_main->apply_credits;
+ $cust_main->apply_credits;
}
}
- if ($
main::
opt_c) {
+ if ($opt_c) {
$error=$cust_main->collect('invoice_time'=>$time,
$error=$cust_main->collect('invoice_time'=>$time,
- 'batch_card' => $
main::
opt_i ? 'no' : 'yes',
+ 'batch_card' => $opt_i ? 'no' : 'yes',
);
);
- warn "Error collecting from customer #" . $cust_main->
g
custnum. ":$error"
+ warn "Error collecting from customer #" . $cust_main->custnum. ":$error"
if $error;
#sleep 1;
if $error;
#sleep 1;
@@
-121,7
+123,7
@@
customers. Otherwise, bills all customers.
=head1 VERSION
=head1 VERSION
-$Id: freeside-bill,v 1.
8 2001-09-03 22:07:39
ivan Exp $
+$Id: freeside-bill,v 1.
11 2001-12-28 14:40:35
ivan Exp $
=head1 BUGS
=head1 BUGS