projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7bc84db
)
fix cpu/memory problem?, RT#11452
author
ivan
<ivan>
Sat, 5 Feb 2011 04:05:12 +0000
(
04:05
+0000)
committer
ivan
<ivan>
Sat, 5 Feb 2011 04:05:12 +0000
(
04:05
+0000)
FS/FS/cust_bill.pm
patch
|
blob
|
history
FS/FS/cust_bill_pkg.pm
patch
|
blob
|
history
diff --git
a/FS/FS/cust_bill.pm
b/FS/FS/cust_bill.pm
index
b8c395a
..
91cdcda
100644
(file)
--- a/
FS/FS/cust_bill.pm
+++ b/
FS/FS/cust_bill.pm
@@
-4197,9
+4197,8
@@
sub _items_cust_bill_pkg {
foreach my $cust_bill_pkg ( @$cust_bill_pkg )
{
foreach my $cust_bill_pkg ( @$cust_bill_pkg )
{
- #eating cpu and memory?
- #$discount_show_always = ($cust_bill_pkg->cust_bill_pkg_discount
- # && $conf->exists('discount-show-always'));
+ $discount_show_always = ($cust_bill_pkg->cust_bill_pkg_discount
+ && $conf->exists('discount-show-always'));
foreach ( $s, $r, ($opt{skip_usage} ? () : $u ) ) {
if ( $_ && !$cust_bill_pkg->hidden ) {
foreach ( $s, $r, ($opt{skip_usage} ? () : $u ) ) {
if ( $_ && !$cust_bill_pkg->hidden ) {
diff --git
a/FS/FS/cust_bill_pkg.pm
b/FS/FS/cust_bill_pkg.pm
index
5a7c7fe
..
791999c
100644
(file)
--- a/
FS/FS/cust_bill_pkg.pm
+++ b/
FS/FS/cust_bill_pkg.pm
@@
-875,6
+875,17
@@
sub cust_bill_pkg_detail {
}
}
+=item cust_bill_pkg_discount
+
+Returns the list of associated cust_bill_pkg_discount objects.
+
+=cut
+
+sub cust_bill_pkg_discount {
+ my $self = shift;
+ qsearch ( 'cust_bill_pkg_discount', { 'billpkgnum' => $self->billpkgnum } );
+}
+
=back
=head1 BUGS
=back
=head1 BUGS