projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.freeside.biz:/home/git/freeside
[freeside.git]
/
FS
/
FS
/
cust_bill_pkg.pm
diff --git
a/FS/FS/cust_bill_pkg.pm
b/FS/FS/cust_bill_pkg.pm
index
156ab5b
..
8233ce0
100644
(file)
--- a/
FS/FS/cust_bill_pkg.pm
+++ b/
FS/FS/cust_bill_pkg.pm
@@
-238,12
+238,12
@@
sub insert {
return "error inserting cust_bill_pkg_tax_location: $error";
}
} else { # handoff
return "error inserting cust_bill_pkg_tax_location: $error";
}
} else { # handoff
- my $other;
+ my $other;
# the as yet uninserted cust_bill_pkg
$other = $link->billpkgnum ? $link->get('taxable_cust_bill_pkg')
: $link->get('tax_cust_bill_pkg');
$other = $link->billpkgnum ? $link->get('taxable_cust_bill_pkg')
: $link->get('tax_cust_bill_pkg');
- my $link_array = $other->get(
'cust_bill_pkg_tax_location'
) || [];
+ my $link_array = $other->get(
$tax_link_table
) || [];
push @$link_array, $link;
push @$link_array, $link;
- $other->set(
'cust_bill_pkg_tax_location'
=> $link_array);
+ $other->set(
$tax_link_table
=> $link_array);
}
} #foreach my $link
}
}
} #foreach my $link
}
@@
-834,6
+834,8
@@
sub _item_discount {
description => $self->mt('Discount'),
amount => 0,
ext_description => \@ext,
description => $self->mt('Discount'),
amount => 0,
ext_description => \@ext,
+ pkgpart => $self->pkgpart,
+ feepart => $self->feepart,
# maybe should show quantity/unit discount?
};
foreach my $pkg_discount (@pkg_discounts) {
# maybe should show quantity/unit discount?
};
foreach my $pkg_discount (@pkg_discounts) {
@@
-1275,7
+1277,7
@@
sub upgrade_tax_location {
local $FS::cust_location::import = 1;
my $conf = FS::Conf->new; # h_conf?
local $FS::cust_location::import = 1;
my $conf = FS::Conf->new; # h_conf?
- return if $conf->
exists('enable_taxproducts
'); #don't touch this case
+ return if $conf->
config('tax_data_vendor
'); #don't touch this case
my $use_ship = $conf->exists('tax-ship_address');
my $use_pkgloc = $conf->exists('tax-pkg_address');
my $use_ship = $conf->exists('tax-ship_address');
my $use_pkgloc = $conf->exists('tax-pkg_address');