projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6117058
)
fix bad bug in line item generation RT#10024
author
jeff
<jeff>
Fri, 24 Sep 2010 03:14:38 +0000
(
03:14
+0000)
committer
jeff
<jeff>
Fri, 24 Sep 2010 03:14:38 +0000
(
03:14
+0000)
FS/FS/cust_main/Billing.pm
patch
|
blob
|
history
diff --git
a/FS/FS/cust_main/Billing.pm
b/FS/FS/cust_main/Billing.pm
index
4fd8643
..
0cd304b
100644
(file)
--- a/
FS/FS/cust_main/Billing.pm
+++ b/
FS/FS/cust_main/Billing.pm
@@
-720,13
+720,6
@@
sub calculate_taxes {
foreach my $tax ( keys %$taxlisthash ) {
foreach ( @{ $taxlisthash->{$tax} }[1 ... scalar(@{ $taxlisthash->{$tax} })] ) {
next unless ref($_) eq 'FS::cust_bill_pkg';
foreach my $tax ( keys %$taxlisthash ) {
foreach ( @{ $taxlisthash->{$tax} }[1 ... scalar(@{ $taxlisthash->{$tax} })] ) {
next unless ref($_) eq 'FS::cust_bill_pkg';
-
- unless ( $packagemap{$_->pkgnum} ) {
- warn "WARNING: can't move cust_tax_exempt_pkg records for pkgnum".
- $_->pkgnum. " - not in our line item list";
- next;
- }
-
push @{ $packagemap{$_->pkgnum}->_cust_tax_exempt_pkg },
splice( @{ $_->_cust_tax_exempt_pkg } );
}
push @{ $packagemap{$_->pkgnum}->_cust_tax_exempt_pkg },
splice( @{ $_->_cust_tax_exempt_pkg } );
}
@@
-938,7
+931,7
@@
sub _make_lines {
# If $cust_pkg has been modified, update it (if we're a real pkgpart)
###
# If $cust_pkg has been modified, update it (if we're a real pkgpart)
###
- if ( $lineitems
|| $options{has_hidden}
) {
+ if ( $lineitems ) {
if ( $cust_pkg->modified && $cust_pkg->pkgpart == $real_pkgpart ) {
# hmm.. and if just the options are modified in some weird price plan?
if ( $cust_pkg->modified && $cust_pkg->pkgpart == $real_pkgpart ) {
# hmm.. and if just the options are modified in some weird price plan?