[freeside-commits] freeside/httemplate/search report_tax.cgi, 1.22,
1.23 cust_bill_pkg.cgi, NONE, 1.1 report_tax.html, 1.6,
1.7 report_cust_pay.html, 1.9, 1.10 report_cust_credit.html,
1.5, 1.6 report_cust_bill.html, 1.1, 1.2 cust_pkg_report.cgi,
1.2, 1.3 cust_bill_event.html, 1.7, 1.8
Ivan,,,
ivan at wavetail.420.am
Wed Dec 21 20:01:19 PST 2005
- Previous message: [freeside-commits] freeside/FS/FS cust_bill_pkg.pm,1.9,1.10
- Next message: [freeside-commits] freeside/httemplate/elements table-grid.html,
NONE, 1.1 select-agent.html, NONE, 1.1 tr-select-agent.html,
NONE, 1.1 tr-input-beginning_ending.html, NONE, 1.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /home/cvs/cvsroot/freeside/httemplate/search
In directory wavetail:/tmp/cvs-serv21339/httemplate/search
Modified Files:
report_tax.cgi report_tax.html report_cust_pay.html
report_cust_credit.html report_cust_bill.html
cust_pkg_report.cgi cust_bill_event.html
Added Files:
cust_bill_pkg.cgi
Log Message:
tax report update, link to new line item report, per-agent tax reporting
Index: report_tax.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/report_tax.cgi,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- report_tax.cgi 9 Nov 2004 11:42:56 -0000 1.22
+++ report_tax.cgi 22 Dec 2005 04:01:16 -0000 1.23
@@ -1,15 +1,8 @@
-<!-- mason kludge -->
<%
my $user = getotaker;
-$cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/;
-my $pbeginning = $1;
-my $beginning = $1 ? str2time($1) : 0;
-
-$cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/;
-my $pending = $1;
-my $ending = ( $1 ? str2time($1) : 4294880896 ) + 86399;
+my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi);
my $from_join_cust = "
FROM cust_bill_pkg
@@ -24,11 +17,19 @@
WHERE _date >= $beginning AND _date <= $ending
AND ( county = ? OR ? = '' )
AND ( state = ? OR ? = '' )
- AND ( country = ? )
+ AND country = ?
AND payby != 'COMP'
";
my @base_param = qw( county county state state country );
+my $agentname = '';
+if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
+ my $agent = qsearchs('agent', { 'agentnum' => $1 } );
+ die "agent not found" unless $agent;
+ $agentname = $agent->agent;
+ $where .= ' AND agentnum = '. $agent->agentnum;
+}
+
my $gotcust = "
WHERE 0 < ( SELECT COUNT(*) FROM cust_main
WHERE ( cust_main.county = cust_main_county.county
@@ -43,52 +44,70 @@
";
my $monthly_exempt_warning = 0;
-my($total, $exempt, $taxable, $owed, $tax) = ( 0, 0, 0, 0, 0 );
+my($total, $taxable, $owed, $tax) = ( 0, 0, 0, 0, 0 );
+my( $exempt_cust, $exempt_pkg, $exempt_monthly ) = ( 0, 0 );
my $out = 'Out of taxable region(s)';
-my %regions;
+my %regions = ();
foreach my $r (qsearch('cust_main_county', {}, '', $gotcust) ) {
#warn $r->county. ' '. $r->state. ' '. $r->country. "\n";
my $label = getlabel($r);
$regions{$label}->{'label'} = $label;
+ $regions{$label}->{'url_param'} = join(';', map "$_=".$r->$_(), qw( county state country ) );
+
my $fromwhere = $from_join_cust. $join_pkg. $where;
- my @param = @base_param;
+ my @param = @base_param;
if ( $r->taxclass ) {
- $fromwhere .= " AND ( taxclass = ? ) ";
+ $fromwhere .= " AND taxclass = ? ";
push @param, 'taxclass';
+ $regions{$label}->{'url_param'} .= ';taxclass='. $r->taxclass;
}
+# my $label = getlabel($r);
+# $regions{$label}->{'label'} = $label;
+
my $nottax = 'pkgnum != 0';
- my $a = scalar_sql($r, \@param,
+ ## calculate total for this region
+
+ my $t = scalar_sql($r, \@param,
"SELECT SUM(cust_bill_pkg.setup+cust_bill_pkg.recur) $fromwhere AND $nottax"
);
- $total += $a;
- $regions{$label}->{'total'} += $a;
+ $total += $t;
+ $regions{$label}->{'total'} += $t;
+
+ ## calculate package-exemption for this region
foreach my $e ( grep { $r->get($_.'tax') =~ /^Y/i }
qw( cust_bill_pkg.setup cust_bill_pkg.recur ) ) {
my $x = scalar_sql($r, \@param,
"SELECT SUM($e) $fromwhere AND $nottax"
);
- $exempt += $x;
- $regions{$label}->{'exempt'} += $x;
+ $exempt_pkg += $x;
+ $regions{$label}->{'exempt_pkg'} += $x;
}
- my($t, $x) = (0, 0);
+ ## calculate customer-exemption for this region
+
+ my($t, $x_cust) = (0, 0);
foreach my $e ( grep { $r->get($_.'tax') !~ /^Y/i }
qw( cust_bill_pkg.setup cust_bill_pkg.recur ) ) {
$t += scalar_sql($r, \@param,
"SELECT SUM($e) $fromwhere AND $nottax AND ( tax != 'Y' OR tax IS NULL )"
);
- $x += scalar_sql($r, \@param,
+ $x_cust += scalar_sql($r, \@param,
"SELECT SUM($e) $fromwhere AND $nottax AND tax = 'Y'"
);
}
+ $exempt_cust += $x_cust;
+ $regions{$label}->{'exempt_cust'} += $x_cust;
+
+ ## calculate monthly exemption (texas tax) for this region
+
my($sday,$smon,$syear) = (localtime($beginning) )[ 3, 4, 5 ];
$monthly_exempt_warning=1 if $sday != 1 && $beginning;
$smon++; $syear+=1900;
@@ -97,23 +116,22 @@
my($eday,$emon,$eyear) = (localtime($eending) )[ 3, 4, 5 ];
$emon++; $eyear+=1900;
- my $monthly_exemption = scalar_sql($r, [ 'taxnum' ],
+ my $x_monthly = scalar_sql($r, [ 'taxnum' ],
"SELECT SUM(amount) FROM cust_tax_exempt where taxnum = ? ".
" AND ( year > $syear OR ( year = $syear and month >= $smon ) )".
" AND ( year < $eyear OR ( year = $eyear and month <= $emon ) )"
);
- #warn $r->taxnum(). ": $monthly_exemption\n";
- if ( $monthly_exemption ) {
- $t -= $monthly_exemption;
- $x += $monthly_exemption;
+ if ( $x_monthly ) {
+ warn $r->taxnum(). ": $x_monthly\n";
+ $t -= $x_monthly;
}
+ $exempt_monthly += $x_monthly;
+ $regions{$label}->{'exempt_monthly'} += $x_monthly;
+
$taxable += $t;
$regions{$label}->{'taxable'} += $t;
- $exempt += $x;
- $regions{$label}->{'exempt'} += $x;
-
$owed += $t * ($r->tax/100);
$regions{$label}->{'owed'} += $t * ($r->tax/100);
@@ -165,13 +183,16 @@
keys %regions;
push @regions, {
- 'label' => 'Total',
- 'total' => $total,
- 'exempt' => $exempt,
- 'taxable' => $taxable,
- 'rate' => '',
- 'owed' => $owed,
- 'tax' => $tax,
+ 'label' => 'Total',
+ 'url_param' => '',
+ 'total' => $total,
+ 'exempt_cust' => $exempt_cust,
+ 'exempt_pkg' => $exempt_pkg,
+ 'exempt_monthly' => $exempt_monthly,
+ 'taxable' => $taxable,
+ 'rate' => '',
+ 'owed' => $owed,
+ 'tax' => $tax,
};
#--
@@ -180,7 +201,17 @@
my $r = shift;
my $label;
- if ( $r->tax == 0 ) {
+ if (
+ $r->tax == 0
+ && ! scalar( qsearch('cust_main_county', { 'state' => $r->state,
+ 'county' => $r->county,
+ 'country' => $r->country,
+ 'tax' => { op=>'>', value=>0 },
+ }
+ )
+ )
+
+ ) {
#kludge to avoid "will not stay shared" warning
my $out = 'Out of taxable region(s)';
$label = $out;
@@ -192,6 +223,7 @@
$label = $r->country;
$label = $r->state.", $label" if $r->state;
$label = $r->county." county, $label" if $r->county;
+ $label = "$label (". $r->taxclass. ")" if $r->taxclass;
#$label = $r->taxname. " ($label)" if $r->taxname;
}
return $label;
@@ -210,30 +242,86 @@
%>
-<%= header( "Sales Tax Report - $pbeginning through ".($pending||'now'),
- menubar( 'Main Menu'=>$p, ) ) %>
-<%= table() %>
+<%
+
+my $baselink = $p. "search/cust_bill_pkg.cgi?begin=$beginning;end=$ending";
+
+%>
+
+
+<%= header( "$agentname Sales Tax Report - ".
+ time2str('%h %o %Y through ', $beginning ).
+ ( $cgi->param('ending') == 4294967295
+ ? 'now'
+ : time2str('%h %o %Y', $ending )
+ ),
+ menubar( 'Main Menu'=>$p, )
+ )
+%>
+
+<%= include('/elements/table-grid.html') %>
+
<TR>
- <TH ROWSPAN=2></TH>
- <TH COLSPAN=3>Sales</TH>
- <TH ROWSPAN=2>Rate</TH>
- <TH ROWSPAN=2>Tax owed</TH>
- <TH ROWSPAN=2>Tax invoiced</TH>
+ <TH CLASS="grid" BGCOLOR="#cccccc"ROWSPAN=2></TH>
+ <TH CLASS="grid" BGCOLOR="#cccccc"COLSPAN=5>Sales</TH>
+ <TH CLASS="grid" BGCOLOR="#cccccc"ROWSPAN=2>Rate</TH>
+ <TH CLASS="grid" BGCOLOR="#cccccc"ROWSPAN=2>Tax owed</TH>
+ <TH CLASS="grid" BGCOLOR="#cccccc"ROWSPAN=2>Tax invoiced</TH>
</TR>
<TR>
- <TH>Total</TH>
- <TH>Non-taxable</TH>
- <TH>Taxable</TH>
+ <TH CLASS="grid" BGCOLOR="#cccccc">Total</TH>
+ <TH CLASS="grid" BGCOLOR="#cccccc">Non-taxable<BR><FONT SIZE=-1>(tax-exempt customer)</FONT></TH>
+ <TH CLASS="grid" BGCOLOR="#cccccc">Non-taxable<BR><FONT SIZE=-1>(tax-exempt package)</FONT></TH>
+ <TH CLASS="grid" BGCOLOR="#cccccc">Non-taxable<BR><FONT SIZE=-1>(monthly exemption)</FONT></TH>
+ <TH CLASS="grid" BGCOLOR="#cccccc">Taxable</TH>
</TR>
- <% foreach my $region ( @regions ) { %>
+
+<% my $bgcolor1 = '#eeeeee';
+ my $bgcolor2 = '#ffffff';
+ my $bgcolor;
+%>
+
+ <% foreach my $region ( @regions ) {
+
+ if ( $bgcolor eq $bgcolor1 ) {
+ $bgcolor = $bgcolor2;
+ } else {
+ $bgcolor = $bgcolor1;
+ }
+
+ my $link = $baselink;
+ if ( $region->{'label'} ne 'Total' ) {
+ if ( $region->{'label'} eq $out ) {
+ $link .= ';out=1';
+ } else {
+ $link .= ';'. $region->{'url_param'};
+ }
+ }
+ %>
<TR>
- <TD><%= $region->{'label'} %></TD>
- <TD ALIGN="right">$<%= sprintf('%.2f', $region->{'total'} ) %></TD>
- <TD ALIGN="right">$<%= sprintf('%.2f', $region->{'exempt'} ) %></TD>
- <TD ALIGN="right">$<%= sprintf('%.2f', $region->{'taxable'} ) %></TD>
- <TD ALIGN="right"><%= $region->{'rate'} %></TD>
- <TD ALIGN="right">$<%= sprintf('%.2f', $region->{'owed'} ) %></TD>
- <TD ALIGN="right">$<%= sprintf('%.2f', $region->{'tax'} ) %></TD>
+ <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>"><%= $region->{'label'} %></TD>
+ <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>" ALIGN="right">
+ <A HREF="<%= $link %>;nottax=1">$<%= sprintf('%.2f', $region->{'total'} ) %></A>
+ </TD>
+ <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>" ALIGN="right">
+ <A HREF="<%= $link %>;nottax=1;cust_tax=Y">$<%= sprintf('%.2f', $region->{'exempt_cust'} ) %></A>
+ </TD>
+ <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>" ALIGN="right">
+ <A HREF="<%= $link %>;nottax=1;pkg_tax=Y">$<%= sprintf('%.2f', $region->{'exempt_pkg'} ) %></A>
+ </TD>
+ <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>" ALIGN="right">
+ $<%= sprintf('%.2f', $region->{'exempt_monthly'} ) %></A>
+ </TD>
+ <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>" ALIGN="right">
+ $<%= sprintf('%.2f', $region->{'taxable'} ) %></A>
+ </TD>
+ <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>" ALIGN="right"><%= $region->{'rate'} %></TD>
+ <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>" ALIGN="right">
+ $<%= sprintf('%.2f', $region->{'owed'} ) %>
+ </TD>
+ <TD CLASS="grid" BGCOLOR="<%= $bgcolor %>" ALIGN="right">
+ <A HREF="<%= $link %>;istax=1">$<%= sprintf('%.2f', $region->{'tax'} ) %></A>
+ </TD>
</TR>
<% } %>
--- NEW FILE: cust_bill_pkg.cgi ---
<%
my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi);
my $join_cust = "
JOIN cust_bill USING ( invnum )
JOIN cust_main USING ( custnum )
";
my $join_pkg = "
LEFT JOIN cust_pkg USING ( pkgnum )
LEFT JOIN part_pkg USING ( pkgpart )
";
my $where = "
WHERE _date >= $beginning AND _date <= $ending
AND payby != 'COMP'
";
if ( $cgi->param('out') ) {
$where .= "
AND 0 = ( SELECT COUNT(*) FROM cust_main_county
WHERE ( cust_main_county.county = cust_main.county
OR cust_main_county.county IS NULL AND cust_main.county = ''
OR cust_main_county.county = '' AND cust_main.county IS NULL
)
AND ( cust_main_county.state = cust_main.state
OR cust_main_county.state IS NULL AND cust_main.state = ''
OR cust_main_county.state = '' AND cust_main.state IS NULL
)
AND cust_main_county.country = cust_main.country
AND cust_main_county.tax > 0
)
";
} elsif ( $cgi->param('country' ) ) {
my $county = dbh->quote( $cgi->param('county') );
my $state = dbh->quote( $cgi->param('state') );
my $country = dbh->quote( $cgi->param('country') );
$where .= "
AND ( county = $county OR $county = '' )
AND ( state = $state OR $state = '' )
AND country = $country
";
$where .= ' AND taxclass = '. dbh->quote( $cgi->param('taxclass') )
if $cgi->param('taxclass');
}
$where .= ' AND pkgnum != 0' if $cgi->param('nottax');
$where .= ' AND pkgnum = 0' if $cgi->param('istax');
$where .= " AND tax = 'Y'" if $cgi->param('cust_tax');
my $count_query;
if ( $cgi->param('pkg_tax') ) {
$count_query =
"SELECT COUNT(*), SUM( ( CASE WHEN part_pkg.setuptax = 'Y'
THEN cust_bill_pkg.setup
ELSE 0 )
+
( CASE WHEN part_pkg.recurtax = 'Y'
THEN cust_bill_pkg.recur
ELSE 0 )
)";
$where .= " AND (
( part_pkg.setuptax = 'Y' AND cust_bill_pkg.setup > 0 )
OR ( part_pkg.recurtax = 'Y' AND cust_bill_pkg.recur > 0 )
)";
} else {
$count_query =
"SELECT COUNT(*), SUM(cust_bill_pkg.setup + cust_bill_pkg.recur)";
}
$count_query += " FROM cust_bill_pkg $join_cust $join_pkg $where";
my $query = {
'table' => 'cust_bill_pkg',
'addl_from' => "$join_cust $join_pkg",
'hashref' => {},
'select' => join(', ',
'cust_bill_pkg.*',
'cust_bill._date',
'part_pkg.pkg',
'cust_main.custnum',
FS::UI::Web::cust_sql_fields(),
),
'extra_sql' => $where,
};
my $ilink = [ "${p}view/cust_bill.cgi?", 'invnum' ];
my $clink = [ "${p}view/cust_main.cgi?", 'custnum' ];
my $conf = new FS::Conf;
my $money_char = $conf->config('money_char') || '$';
%><%= include( 'elements/search.html',
'title' => 'Line items',
'name' => 'line items',
'query' => $query,
'count_query' => $count_query,
'count_addl' => [ $money_char. '%.2f total', ],
'header' => [
'#',
'Description',
'Setup charge',
'Recurring charge',
'Invoice',
'Date',
FS::UI::Web::cust_header(),
],
'fields' => [
'billpkgnum',
sub { $_[0]->pkgnum > 0
? $_[0]->get('pkg')
: $_[0]->get('itemdesc')
},
#strikethrough or "N/A ($amount)" or something these when
# they're not applicable to pkg_tax search
sub { sprintf($money_char.'%.2f', shift->setup ) },
sub { sprintf($money_char.'%.2f', shift->recur ) },
'invnum',
sub { time2str('%b %d %Y', shift->_date ) },
\&FS::UI::Web::cust_fields,
],
'links' => [
'',
'',
'',
'',
$ilink,
$ilink,
( map { $clink } FS::UI::Web::cust_header() ),
],
'align' => 'rlrrrc',
)
%>
Index: report_cust_pay.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/report_cust_pay.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- report_cust_pay.html 21 Nov 2005 10:47:12 -0000 1.9
+++ report_cust_pay.html 22 Dec 2005 04:01:16 -0000 1.10
@@ -1,10 +1,6 @@
<HTML>
<HEAD>
<TITLE>Payment report criteria</TITLE>
- <LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2">
- <SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT>
- <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-en.js"></SCRIPT>
- <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-setup.js"></SCRIPT>
</HEAD>
<BODY BGCOLOR="#e8e8e8">
<H1>Payment report criteria</H1>
@@ -29,40 +25,12 @@
</SELECT>
</TD>
</TR>
- <TR>
- <TD ALIGN="right">for agent: </TD>
- <TD><SELECT NAME="agentnum">
- <OPTION VALUE="">all</OPTION>
- <% foreach my $agent ( qsearch('agent', { disabled=>'' } ) ) { %>
- <OPTION VALUE="<%= $agent->agentnum %>"<%= $cgi->param('agentnum') == $agent->agentnum ? ' SELECTED' : '' %>><%= $agent->agent %>
- <% } %>
- </SELECT>
- </TD>
- </TR>
- <TR>
- <TD ALIGN="right">From: </TD>
- <TD><INPUT TYPE="text" NAME="beginning" ID="beginning_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="beginning_button" STYLE="cursor: pointer" TITLE="Select date"><BR><i>m/d/y</i></TD>
-<SCRIPT TYPE="text/javascript">
- Calendar.setup({
- inputField: "beginning_text",
- ifFormat: "%m/%d/%Y",
- button: "beginning_button",
- align: "BR"
- });
-</SCRIPT>
- </TR>
- <TR>
- <TD ALIGN="right">To: </TD>
- <TD><INPUT TYPE="text" NAME="ending" ID="ending_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="ending_button" STYLE="cursor: pointer" TITLE="Select date"><BR><i>m/d/y</i></TD>
-<SCRIPT TYPE="text/javascript">
- Calendar.setup({
- inputField: "ending_text",
- ifFormat: "%m/%d/%Y",
- button: "ending_button",
- align: "BR"
- });
-</SCRIPT>
- </TR>
+ <%= include( '/elements/tr-select-agent.html',
+ $cgi->param('agentnum'),
+ 'label' => 'for agent: ',
+ )
+ %>
+ <%= include( '/elements/tr-input-beginning_ending.html' ) %>
</TABLE>
<BR><INPUT TYPE="submit" VALUE="Get Report">
</FORM>
Index: report_cust_credit.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/report_cust_credit.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- report_cust_credit.html 6 Mar 2005 03:04:29 -0000 1.5
+++ report_cust_credit.html 22 Dec 2005 04:01:16 -0000 1.6
@@ -1,10 +1,6 @@
<HTML>
<HEAD>
<TITLE>Credit report criteria</TITLE>
- <LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2">
- <SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT>
- <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-en.js"></SCRIPT>
- <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-setup.js"></SCRIPT>
</HEAD>
<BODY BGCOLOR="#e8e8e8">
<H1>Credit report criteria</H1>
@@ -27,40 +23,12 @@
</SELECT>
</TD>
</TR>
- <TR>
- <TD ALIGN="right">for agent: </TD>
- <TD><SELECT NAME="agentnum">
- <OPTION VALUE="">all</OPTION>
- <% foreach my $agent ( qsearch('agent', { disabled=>'' } ) ) { %>
- <OPTION VALUE="<%= $agent->agentnum %>"<%= $cgi->param('agentnum') == $agent->agentnum ? ' SELECTED' : '' %>><%= $agent->agent %>
- <% } %>
- </SELECT>
- </TD>
- </TR>
- <TR>
- <TD ALIGN="right">From: </TD>
- <TD><INPUT TYPE="text" NAME="beginning" ID="beginning_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="beginning_button" STYLE="cursor: pointer" TITLE="Select date"><BR><i>m/d/y</i></TD>
-<SCRIPT TYPE="text/javascript">
- Calendar.setup({
- inputField: "beginning_text",
- ifFormat: "%m/%d/%Y",
- button: "beginning_button",
- align: "BR"
- });
-</SCRIPT>
- </TR>
- <TR>
- <TD ALIGN="right">To: </TD>
- <TD><INPUT TYPE="text" NAME="ending" ID="ending_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="ending_button" STYLE="cursor: pointer" TITLE="Select date"><BR><i>m/d/y</i></TD>
-<SCRIPT TYPE="text/javascript">
- Calendar.setup({
- inputField: "ending_text",
- ifFormat: "%m/%d/%Y",
- button: "ending_button",
- align: "BR"
- });
-</SCRIPT>
- </TR>
+ <%= include( '/elements/tr-select-agent.html',
+ $cgi->param('agentnum'),
+ 'label' => 'for agent: ',
+ )
+ %>
+ <%= include( '/elements/tr-input-beginning_ending.html' ) %>
</TABLE>
<BR><INPUT TYPE="submit" VALUE="Get Report">
</FORM>
Index: cust_bill_event.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cust_bill_event.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- cust_bill_event.html 10 Nov 2005 12:47:31 -0000 1.7
+++ cust_bill_event.html 22 Dec 2005 04:01:16 -0000 1.8
@@ -7,10 +7,6 @@
)
%>
- <LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2">
- <SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT>
- <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-en.js"></SCRIPT>
- <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-setup.js"></SCRIPT>
<FORM ACTION="cust_bill_event.cgi" METHOD="GET">
<INPUT TYPE="hidden" NAME="failed" VALUE="<%= $cgi->param('failed') %>">
@@ -27,30 +23,7 @@
</TD>
</TR>
-->
- <TR>
- <TD ALIGN="right">From: </TD>
- <TD><INPUT TYPE="text" NAME="beginning" ID="beginning_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="beginning_button" STYLE="cursor: pointer" TITLE="Select date"><BR><i>m/d/y</i></TD>
-<SCRIPT TYPE="text/javascript">
- Calendar.setup({
- inputField: "beginning_text",
- ifFormat: "%m/%d/%Y",
- button: "beginning_button",
- align: "BR"
- });
-</SCRIPT>
- </TR>
- <TR>
- <TD ALIGN="right">To: </TD>
- <TD><INPUT TYPE="text" NAME="ending" ID="ending_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="ending_button" STYLE="cursor: pointer" TITLE="Select date"><BR><i>m/d/y</i></TD>
-<SCRIPT TYPE="text/javascript">
- Calendar.setup({
- inputField: "ending_text",
- ifFormat: "%m/%d/%Y",
- button: "ending_button",
- align: "BR"
- });
-</SCRIPT>
- </TR>
+ <%= include( '/elements/tr-input-beginning_ending.html' ) %>
<!--
<TR>
<TD ALIGN="right">Events: </TD>
Index: report_cust_bill.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/report_cust_bill.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- report_cust_bill.html 9 Jun 2005 22:40:10 -0000 1.1
+++ report_cust_bill.html 22 Dec 2005 04:01:16 -0000 1.2
@@ -1,49 +1,17 @@
<HEAD>
<TITLE>Invoice report criteria</TITLE>
- <LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2">
- <SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT>
- <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-en.js"></SCRIPT>
- <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-setup.js"></SCRIPT>
</HEAD>
<BODY BGCOLOR="#e8e8e8">
<H1>Invoice report criteria</H1>
<FORM ACTION="cust_bill.html" METHOD="GET">
<INPUT TYPE="hidden" NAME="magic" VALUE="_date">
<TABLE>
- <TR>
- <TD ALIGN="right">for agent: </TD>
- <TD><SELECT NAME="agentnum">
- <OPTION VALUE="">all</OPTION>
- <% foreach my $agent ( qsearch('agent', { disabled=>'' } ) ) { %>
- <OPTION VALUE="<%= $agent->agentnum %>"<%= $cgi->param('agentnum') == $agent->agentnum ? ' SELECTED' : '' %>><%= $agent->agent %>
- <% } %>
- </SELECT>
- </TD>
- </TR>
- <TR>
- <TD ALIGN="right">From: </TD>
- <TD><INPUT TYPE="text" NAME="beginning" ID="beginning_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="beginning_button" STYLE="cursor: pointer" TITLE="Select date"><BR><i>m/d/y</i></TD>
-<SCRIPT TYPE="text/javascript">
- Calendar.setup({
- inputField: "beginning_text",
- ifFormat: "%m/%d/%Y",
- button: "beginning_button",
- align: "BR"
- });
-</SCRIPT>
- </TR>
- <TR>
- <TD ALIGN="right">To: </TD>
- <TD><INPUT TYPE="text" NAME="ending" ID="ending_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="ending_button" STYLE="cursor: pointer" TITLE="Select date"><BR><i>m/d/y</i></TD>
-<SCRIPT TYPE="text/javascript">
- Calendar.setup({
- inputField: "ending_text",
- ifFormat: "%m/%d/%Y",
- button: "ending_button",
- align: "BR"
- });
-</SCRIPT>
- </TR>
+ <%= include( '/elements/tr-select-agent.html',
+ $cgi->param('agentnum'),
+ 'label' => 'Invoices for agent: ',
+ )
+ %>
+ <%= include( '/elements/tr-input-beginning_ending.html' ) %>
<TR>
<TD ALIGN="right"><INPUT TYPE="checkbox" NAME="open" VALUE="1" CHECKED></TD>
<TD>Show only open invoices</TD>
Index: cust_pkg_report.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cust_pkg_report.cgi,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cust_pkg_report.cgi 6 Mar 2005 03:04:29 -0000 1.2
+++ cust_pkg_report.cgi 22 Dec 2005 04:01:16 -0000 1.3
@@ -1,10 +1,6 @@
<HTML>
<HEAD>
<TITLE>Packages</TITLE>
- <LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2">
- <SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT>
- <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-en.js"></SCRIPT>
- <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-setup.js"></SCRIPT>
</HEAD>
<BODY BGCOLOR="#e8e8e8">
<H1>Packages</H1>
@@ -12,47 +8,11 @@
<INPUT TYPE="hidden" NAME="magic" VALUE="bill">
Return packages with next bill date:<BR><BR>
<TABLE>
- <TR>
- <TD ALIGN="right">From: </TD>
- <TD><INPUT TYPE="text" NAME="beginning" ID="beginning_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="beginning_button" STYLE="cursor: pointer" TITLE="Select date"><BR><I>m/d/y</I></TD>
-<SCRIPT TYPE="text/javascript">
- Calendar.setup({
- inputField: "beginning_text",
- ifFormat: "%m/%d/%Y",
- button: "beginning_button",
- align: "BR"
- });
-</SCRIPT>
- </TR>
- <TR>
- <TD ALIGN="right">To: </TD>
- <TD><INPUT TYPE="text" NAME="ending" ID="ending_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="ending_button" STYLE="cursor: pointer" TITLE="Select date"><BR><I>m/d/y</I></TD>
-<SCRIPT TYPE="text/javascript">
- Calendar.setup({
- inputField: "ending_text",
- ifFormat: "%m/%d/%Y",
- button: "ending_button",
- align: "BR"
- });
-</SCRIPT>
- </TR>
-<% my %agent_search = dbdef->table('agent')->column('disabled')
- ? ( 'disabled' => '' ) : ();
- my @agents = qsearch( 'agent', \%agent_search );
- if ( scalar(@agents) == 1 ) {
-%>
- <INPUT TYPE="hidden" NAME="agentnum" VALUE="<%= $agents[0]->agentnum %>">
-<% } else { %>
-
- <TR>
- <TD ALIGN="right">Agent: </TD>
- <TD><SELECT NAME="agentnum"><OPTION VALUE="">(all)
- <% foreach my $agent ( sort { $a->agent cmp $b->agent; } @agents) { %>
- <OPTION VALUE="<%= $agent->agentnum %>"><%= $agent->agent %>
- <% } %>
- </TD>
- </TR>
-<% } %>
+ <%= include( '/elements/tr-input-beginning_ending.html' ) %>
+ <%= include( '/elements/tr-select-agent.html',
+ $cgi->param('agentnum'),
+ )
+ %>
</TABLE>
<BR><INPUT TYPE="submit" VALUE="Get Report">
Index: report_tax.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/report_tax.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- report_tax.html 6 Mar 2005 03:04:29 -0000 1.6
+++ report_tax.html 22 Dec 2005 04:01:16 -0000 1.7
@@ -1,39 +1,13 @@
<HTML>
<HEAD>
<TITLE>Tax Report Criteria</TITLE>
- <LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2">
- <SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT>
- <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-en.js"></SCRIPT>
- <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-setup.js"></SCRIPT> </HEAD>
+ </HEAD>
<BODY BGCOLOR="#e8e8e8">
<H1>Tax Report Criteria</H1>
<FORM ACTION="report_tax.cgi" METHOD="GET">
- Return <B>tax report</B> for period:
<TABLE>
- <TR>
- <TD ALIGN="right">From: </TD>
- <TD><INPUT TYPE="text" NAME="beginning" ID="beginning_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="beginning_button" STYLE="cursor: pointer" TITLE="Select date"><BR><i>m/d/y</i></TD>
-<SCRIPT TYPE="text/javascript">
- Calendar.setup({
- inputField: "beginning_text",
- ifFormat: "%m/%d/%Y",
- button: "beginning_button",
- align: "BR"
- });
-</SCRIPT>
- </TR>
- <TR>
- <TD ALIGN="right">To: </TD>
- <TD><INPUT TYPE="text" NAME="ending" ID="ending_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="ending_button" STYLE="cursor: pointer" TITLE="Select date"><BR><i>m/d/y</i></TD>
-<SCRIPT TYPE="text/javascript">
- Calendar.setup({
- inputField: "ending_text",
- ifFormat: "%m/%d/%Y",
- button: "ending_button",
- align: "BR"
- });
-</SCRIPT>
- </TR>
+ <%= include( '/elements/tr-select-agent.html' ) %>
+ <%= include( '/elements/tr-input-beginning_ending.html' ) %>
</TABLE>
<BR><INPUT TYPE="submit" VALUE="Get Report">
- Previous message: [freeside-commits] freeside/FS/FS cust_bill_pkg.pm,1.9,1.10
- Next message: [freeside-commits] freeside/httemplate/elements table-grid.html,
NONE, 1.1 select-agent.html, NONE, 1.1 tr-select-agent.html,
NONE, 1.1 tr-input-beginning_ending.html, NONE, 1.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the freeside-commits
mailing list