projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
per-agent disable_previous_balance, #15863
[freeside.git]
/
FS
/
FS
/
cust_main_county.pm
diff --git
a/FS/FS/cust_main_county.pm
b/FS/FS/cust_main_county.pm
index
ab1ac1e
..
e01e1d2
100644
(file)
--- a/
FS/FS/cust_main_county.pm
+++ b/
FS/FS/cust_main_county.pm
@@
-56,6
+56,8
@@
currently supported:
=item taxnum - primary key (assigned automatically for new tax rates)
=item taxnum - primary key (assigned automatically for new tax rates)
+=item district - tax district (optional)
+
=item city
=item county
=item city
=item county
@@
-119,6
+121,7
@@
sub check {
$self->exempt_amount(0) unless $self->exempt_amount;
$self->ut_numbern('taxnum')
$self->exempt_amount(0) unless $self->exempt_amount;
$self->ut_numbern('taxnum')
+ || $self->ut_alphan('district')
|| $self->ut_textn('city')
|| $self->ut_textn('county')
|| $self->ut_anything('state')
|| $self->ut_textn('city')
|| $self->ut_textn('county')
|| $self->ut_anything('state')
@@
-256,7
+259,10
@@
sub taxline {
my ($mon,$year) =
(localtime( $cust_bill_pkg->sdate || $invoice_date ) )[4,5];
$mon++;
my ($mon,$year) =
(localtime( $cust_bill_pkg->sdate || $invoice_date ) )[4,5];
$mon++;
- my $freq = $part_pkg->freq || 1;
+ my $freq = $cust_bill_pkg->freq;
+ unless ($freq) {
+ $freq = $part_pkg->freq || 1; # less trustworthy fallback
+ }
if ( $freq !~ /(\d+)$/ ) {
$dbh->rollback if $oldAutoCommit;
return "daily/weekly package definitions not (yet?)".
if ( $freq !~ /(\d+)$/ ) {
$dbh->rollback if $oldAutoCommit;
return "daily/weekly package definitions not (yet?)".