projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
redisable rt apachectl
[freeside.git]
/
httemplate
/
search
/
cust_bill_pkg.cgi
diff --git
a/httemplate/search/cust_bill_pkg.cgi
b/httemplate/search/cust_bill_pkg.cgi
index
975d02a
..
94860d3
100644
(file)
--- a/
httemplate/search/cust_bill_pkg.cgi
+++ b/
httemplate/search/cust_bill_pkg.cgi
@@
-1,32
+1,30
@@
-<
% include( 'elements/search.html'
,
- 'title' =>
'Line items'
,
- 'name' =>
'line items'
,
+<
& elements/search.html
,
+ 'title' =>
emt('Line items')
,
+ 'name' =>
emt('line items')
,
'query' => $query,
'count_query' => $count_query,
'count_addl' => [ $money_char. '%.2f total',
$unearned ? ( $money_char. '%.2f unearned revenue' ) : (),
],
'header' => [
'query' => $query,
'count_query' => $count_query,
'count_addl' => [ $money_char. '%.2f total',
$unearned ? ( $money_char. '%.2f unearned revenue' ) : (),
],
'header' => [
- #'#',
- 'Description',
+ emt('Description'),
( $unearned
( $unearned
- ? (
'Unearned', 'Owed', 'Payment date'
)
- : (
'Setup charge'
)
+ ? (
emt('Unearned'), emt('Owed'), emt('Payment date')
)
+ : (
emt('Setup charge')
)
),
( $use_usage eq 'usage'
),
( $use_usage eq 'usage'
- ?
'Usage charge'
- :
'Recurring charge'
+ ?
emt('Usage charge')
+ :
emt('Recurring charge')
),
( $unearned
),
( $unearned
- ? (
'Charge start', 'Charge end'
)
+ ? (
emt('Charge start'), emt('Charge end')
)
: ()
),
: ()
),
-
'Invoice'
,
-
'Date'
,
+
emt('Invoice')
,
+
emt('Date')
,
FS::UI::Web::cust_header(),
],
'fields' => [
FS::UI::Web::cust_header(),
],
'fields' => [
- #'billpkgnum',
sub { $_[0]->pkgnum > 0
? $_[0]->get('pkg') # possibly use override.pkg
: $_[0]->get('itemdesc') # but i think this correct
sub { $_[0]->pkgnum > 0
? $_[0]->get('pkg') # possibly use override.pkg
: $_[0]->get('itemdesc') # but i think this correct
@@
-75,6
+73,7
@@
\&FS::UI::Web::cust_fields,
],
'sort_fields' => [
\&FS::UI::Web::cust_fields,
],
'sort_fields' => [
+ '',
'setup', #broken in $unearned case i guess
( $unearned ? ('', '') : () ),
( $use_usage eq 'recurring' ? 'recur - usage' :
'setup', #broken in $unearned case i guess
( $unearned ? ('', '') : () ),
( $use_usage eq 'recurring' ? 'recur - usage' :
@@
-127,8
+126,7
@@
'',
FS::UI::Web::cust_styles(),
],
'',
FS::UI::Web::cust_styles(),
],
- )
-%>
+&>
<%init>
#LOTS of false laziness below w/cust_credit_bill_pkg.cgi
<%init>
#LOTS of false laziness below w/cust_credit_bill_pkg.cgi
@@
-147,8
+145,16
@@
my $agentnums_sql =
my @where = ( $agentnums_sql );
my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi);
my @where = ( $agentnums_sql );
my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi);
-push @where, "_date >= $beginning",
- "_date <= $ending";
+
+if ( $cgi->param('distribute') == 1 ) {
+ push @where, "sdate <= $ending",
+ "edate > $beginning",
+ ;
+}
+else {
+ push @where, "_date >= $beginning",
+ "_date <= $ending";
+}
if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
push @where, "cust_main.agentnum = $1";
if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
push @where, "cust_main.agentnum = $1";
@@
-204,12
+210,9
@@
if ( $cgi->param('taxclass')
#
#} else {
#
#} else {
- push @where,
- ' ( '. join(' OR ',
- map ' part_pkg.taxclass = '.dbh->quote($_),
- $cgi->param('taxclass')
- ).
- ' ) ';
+ push @where, ' part_pkg.taxclass IN ( '.
+ join(', ', map dbh->quote($_), $cgi->param('taxclass') ).
+ ' ) ';
#}
#}
@@
-305,8
+308,11
@@
if ( $cgi->param('out') ) {
#warn "neither nottax nor istax parameters specified";
}
#warn "neither nottax nor istax parameters specified";
}
- if ( $cgi->param('taxclassNULL') ) {
-
+ if ( $cgi->param('taxclassNULL')
+ && ! $cgi->param('istax') #no part_pkg.taxclass in this case
+ #(see comment above?)
+ )
+ {
my %hash = ( 'country' => scalar($cgi->param('country')) );
foreach (qw( state county )) {
$hash{$_} = scalar($cgi->param($_)) if $cgi->param($_);
my %hash = ( 'country' => scalar($cgi->param('country')) );
foreach (qw( state county )) {
$hash{$_} = scalar($cgi->param($_)) if $cgi->param($_);
@@
-315,6
+321,7
@@
if ( $cgi->param('out') ) {
die "unknown base region for empty taxclass" unless $cust_main_county;
my $same_sql = $cust_main_county->sql_taxclass_sameregion;
die "unknown base region for empty taxclass" unless $cust_main_county;
my $same_sql = $cust_main_county->sql_taxclass_sameregion;
+ $same_sql =~ s/taxclass/part_pkg.taxclass/g;
push @where, $same_sql if $same_sql;
}
push @where, $same_sql if $same_sql;
}