diff options
author | Ivan Kohler <ivan@freeside.biz> | 2013-03-11 01:03:51 -0700 |
---|---|---|
committer | Ivan Kohler <ivan@freeside.biz> | 2013-03-11 01:03:51 -0700 |
commit | a2ff7564f36a5db81bdba053ff70017b8f438904 (patch) | |
tree | 001829a440930d6dbd2ed0e0ea13bfc39332f4d2 | |
parent | 57c5cf47f41739b57c563ddac09d0bd49d6d67b4 (diff) |
fix quotations, RT#21103
-rw-r--r-- | FS/FS/TemplateItem_Mixin.pm | 4 | ||||
-rw-r--r-- | FS/FS/quotation_pkg.pm | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/FS/FS/TemplateItem_Mixin.pm b/FS/FS/TemplateItem_Mixin.pm index 6d7ea26bc..f9ab51af6 100644 --- a/FS/FS/TemplateItem_Mixin.pm +++ b/FS/FS/TemplateItem_Mixin.pm @@ -271,10 +271,12 @@ sub cust_bill_pkg_display { } else { my $hashref = { 'billpkgnum' => $self->billpkgnum }; $hashref->{type} = $type if defined($type); + + my $order_by = $self->display_table_orderby || 'billpkgdisplaynum'; @result = qsearch ({ 'table' => $self->display_table, 'hashref' => { 'billpkgnum' => $self->billpkgnum }, - 'order_by' => 'ORDER BY billpkgdisplaynum', + 'order_by' => "ORDER BY $order_by", }); } diff --git a/FS/FS/quotation_pkg.pm b/FS/FS/quotation_pkg.pm index 3d40bb03a..47045cd13 100644 --- a/FS/FS/quotation_pkg.pm +++ b/FS/FS/quotation_pkg.pm @@ -1,10 +1,11 @@ package FS::quotation_pkg; use strict; -use base qw( FS::Record ); +use base qw( FS::TemplateItem_Mixin FS::Record ); use FS::Record qw( qsearchs ); #qsearch use FS::part_pkg; use FS::cust_location; +use FS::quotation_pkg_discount; #so its loaded when TemplateItem_Mixin needs it =head1 NAME @@ -80,6 +81,11 @@ points to. You can ask the object for a copy with the I<hash> method. sub table { 'quotation_pkg'; } +sub display_table { 'quotation_pkg'; } +sub display_table_orderby { 'quotationpkgnum'; } # something else? + # (for invoice display order) +sub discount_table { 'quotation_pkg_discount'; } + =item insert Adds this record to the database. If there is an error, returns the error, |