projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i18n, RT#12515
[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
bb60abb
..
e84fa98
100644
(file)
--- a/
FS/FS/cust_main_county.pm
+++ b/
FS/FS/cust_main_county.pm
@@
-2,7
+2,7
@@
package FS::cust_main_county;
use strict;
use vars qw( @ISA @EXPORT_OK $conf
use strict;
use vars qw( @ISA @EXPORT_OK $conf
- @cust_main_county %cust_main_county $countyflag );
+ @cust_main_county %cust_main_county $countyflag );
# $cityflag );
use Exporter;
use FS::Record qw( qsearch dbh );
use FS::cust_bill_pkg;
use Exporter;
use FS::Record qw( qsearch dbh );
use FS::cust_bill_pkg;
@@
-17,6
+17,7
@@
use FS::cust_tax_exempt_pkg;
@cust_main_county = ();
$countyflag = '';
@cust_main_county = ();
$countyflag = '';
+#$cityflag = '';
#ask FS::UID to run this stuff for us later
$FS::UID::callback{'FS::cust_main_county'} = sub {
#ask FS::UID to run this stuff for us later
$FS::UID::callback{'FS::cust_main_county'} = sub {
@@
-55,10
+56,12
@@
currently supported:
=item taxnum - primary key (assigned automatically for new tax rates)
=item taxnum - primary key (assigned automatically for new tax rates)
-=item
state
+=item
city
=item county
=item county
+=item state
+
=item country
=item tax - percentage
=item country
=item tax - percentage
@@
-116,8
+119,9
@@
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_
anything('state
')
+ || $self->ut_
textn('city
')
|| $self->ut_textn('county')
|| $self->ut_textn('county')
+ || $self->ut_anything('state')
|| $self->ut_text('country')
|| $self->ut_float('tax')
|| $self->ut_textn('taxclass') # ...
|| $self->ut_text('country')
|| $self->ut_float('tax')
|| $self->ut_textn('taxclass') # ...
@@
-252,7
+256,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?)".