projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Compliance Solutions <http://csilongwood.com/> integration, RT#75262
[freeside.git]
/
FS
/
FS
/
TaxEngine
/
suretax.pm
diff --git
a/FS/FS/TaxEngine/suretax.pm
b/FS/FS/TaxEngine/suretax.pm
index
2c418f9
..
0f6c69d
100644
(file)
--- a/
FS/FS/TaxEngine/suretax.pm
+++ b/
FS/FS/TaxEngine/suretax.pm
@@
-77,7
+77,7
@@
sub build_request {
($self->{bill_zip}, $self->{bill_plus4}) =
split('-', $cust_main->bill_location->zip);
($self->{bill_zip}, $self->{bill_plus4}) =
split('-', $cust_main->bill_location->zip);
- $self->{regcode} = $REGCODE{ $conf->config('suretax-regulatory_code') };
+ $self->{regcode} = $REGCODE{ $conf->config('suretax-regulatory_code'
, $agentnum
) };
%taxproduct_cache = ();
%taxproduct_cache = ();
@@
-216,9
+216,9
@@
sub build_item {
my %hash = (
%base_item,
'LineNumber' => 'C' . $cdr->acctid,
my %hash = (
%base_item,
'LineNumber' => 'C' . $cdr->acctid,
- 'OrigNumber' =>
$cdr->src
,
- 'TermNumber' =>
$cdr->dst
,
- 'BillToNumber' =>
$cdr->charged_party
,
+ 'OrigNumber' =>
''
,
+ 'TermNumber' =>
''
,
+ 'BillToNumber' =>
''
,
'TransDate' => $calldate,
'Revenue' => $cdr->rated_price, # 4 decimal places
'Units' => 0, # right?
'TransDate' => $calldate,
'Revenue' => $cdr->rated_price, # 4 decimal places
'Units' => 0, # right?
@@
-258,11
+258,13
@@
sub build_item {
if !$taxproduct;
my $tsr = $TSR_GENERAL;
if !$taxproduct;
my $tsr = $TSR_GENERAL;
+ # when billing on cancellation there are no units
+ my $units = $self->{cancel} ? 0 : $cust_bill_pkg->units;
my %hash = (
%base_item,
'LineNumber' => 'R' . $billpkgnum,
'Revenue' => $recur_without_usage, # 4 decimal places
my %hash = (
%base_item,
'LineNumber' => 'R' . $billpkgnum,
'Revenue' => $recur_without_usage, # 4 decimal places
- 'Units' => $
cust_bill_pkg->
units,
+ 'Units' => $units,
'TaxSitusRule' => $tsr,
'TransTypeCode' => $taxproduct,
);
'TaxSitusRule' => $tsr,
'TransTypeCode' => $taxproduct,
);