[freeside-commits] freeside/httemplate/search cust_pay_void.html, 1.1, 1.2 cust_pkg.cgi, 1.70, 1.71 report_receivables.html, 1.13, 1.14
Erik Levinson
levinse at wavetail.420.am
Sat May 21 11:46:35 PDT 2011
- Previous message: [freeside-commits] freeside/httemplate/search/elements cust_main_dayranges.html, 1.12, 1.13 cust_pay_or_refund.html, 1.13, 1.14 report_cust_pay_or_refund.html, 1.3, 1.4
- Next message: [freeside-commits] freeside/httemplate/search cust_bill.html, 1.38, 1.39 report_cust_credit.html, 1.16, 1.17 report_cust_pay.html, 1.23, 1.24
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /home/cvs/cvsroot/freeside/httemplate/search
In directory wavetail.420.am:/tmp/cvs-serv9927/search
Modified Files:
cust_pay_void.html cust_pkg.cgi report_receivables.html
Log Message:
internationalization/localization, RT12515
Index: report_receivables.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/report_receivables.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -w -d -r1.13 -r1.14
--- report_receivables.html 7 Sep 2010 23:31:14 -0000 1.13
+++ report_receivables.html 21 May 2011 18:46:33 -0000 1.14
@@ -1,4 +1,4 @@
-<% include('/elements/header.html', 'Accounts Receivable Aging Summary' ) %>
+<& /elements/header.html, emt('Accounts Receivable Aging Summary') &>
<FORM NAME="OneTrueForm" ACTION="report_receivables.cgi" METHOD="GET">
@@ -6,19 +6,18 @@
<TR>
<TH CLASS="background" COLSPAN=2 ALIGN="left">
- <FONT SIZE="+1">Search options</FONT>
+ <FONT SIZE="+1"><% mt('Search options') |h %></FONT>
</TH>
</TR>
- <% include( '/elements/tr-select-agent.html', 'disable_empty'=>0 ) %>
+ <& /elements/tr-select-agent.html, 'disable_empty'=>0 &>
- <% include( '/elements/tr-select-cust_main-status.html',
- 'label' => 'Customer Status'
- )
- %>
+ <& /elements/tr-select-cust_main-status.html,
+ 'label' => emt('Customer Status'),
+ &>
<TR>
- <TD ALIGN="right">Customers</TD>
+ <TD ALIGN="right"><% mt('Customers') |h %></TD>
<TD>
<SCRIPT TYPE="text/javascript">
function toggle(obj) {
@@ -30,28 +29,40 @@
}
</SCRIPT>
<TABLE STYLE="padding: 0px">
- <TR><TD><INPUT TYPE="radio" NAME="all_customers" VALUE="1" onClick="toggle(this)"></TD>
- <TD>All customers (even those without an outstanding balance)</TD></TR>
- <TR><TD><INPUT TYPE="radio" NAME="all_customers" VALUE="0" CHECKED onClick="toggle(this)"></TD>
- <TD>Customers with a balance over <INPUT NAME="days" TYPE="text" SIZE=4 MAXLENGTH=3 VALUE="0"> days old</TD></TR>
- <TR><TD></TD>
- <TD><INPUT TYPE="checkbox" NAME="negative" VALUE="1"> Including customers with credit balances</TD></TR>
+ <TR>
+ <TD><INPUT TYPE="radio" NAME="all_customers" VALUE="1" onClick="toggle(this)"></TD>
+ <TD><% mt('All customers (even those without an outstanding balance)') |h %></TD>
+ </TR>
+ <TR>
+ <TD><INPUT TYPE="radio" NAME="all_customers" VALUE="0" CHECKED onClick="toggle(this)"></TD>
+ <TD>
+% my $daysinput = qq!<INPUT NAME="days" TYPE="text" SIZE=4 MAXLENGTH=3 VALUE="0">!;
+% my $str = emt("Customers with a balance over [_1] days old",'XXXDAYSXXX'); # yeah it's a hack
+% $str =~ s/XXXDAYSXXX/$daysinput/;
+ <% $str %>
+ </TD>
+ </TR>
+ <TR>
+ <TD></TD>
+ <TD><INPUT TYPE="checkbox" NAME="negative" VALUE="1"> <% mt('Including customers with credit balances') |h %></TD>
+ </TR>
</TABLE>
</TD>
</TR>
- <% include( '/elements/tr-input-date-field.html', {
+ <& /elements/tr-input-date-field.html, {
'name' => 'as_of',
'value' => time,
- 'label' => 'As of date ',
+ 'label' => emt('As of date '),
'format' => FS::Conf->new->config('date_format') || '%m/%d/%Y',
- } ) %>
+ }
+ &>
</TABLE>
<BR><INPUT TYPE="submit" VALUE="Get Report">
</FORM>
-<% include('/elements/footer.html') %>
+<& /elements/footer.html &>
<%init>
Index: cust_pay_void.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cust_pay_void.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -d -r1.1 -r1.2
--- cust_pay_void.html 27 Jul 2009 09:07:24 -0000 1.1
+++ cust_pay_void.html 21 May 2011 18:46:33 -0000 1.2
@@ -1,13 +1,11 @@
-<% include( 'elements/cust_pay_or_refund.html',
+<& elements/cust_pay_or_refund.html,
'thing' => 'pay_void',
'amount_field' => 'paid',
- 'name_singular' => 'voided payment',
- 'name_verb' => 'voided', # 'paid',
+ 'name_singular' => emt('voided payment'),
+ 'name_verb' => emt('voided'),
'disable_by' => 1, #showing original not voiding otaker
- 'addl_header' => [ 'Void Date', ], # 'Void Reason' ],
+ 'addl_header' => [ emt('Void Date'), ],
'addl_fields' => [
sub { time2str('%b %d %Y', shift->void_date ) },
- #'reason',
],
- )
-%>
+&>
Index: cust_pkg.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cust_pkg.cgi,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -w -d -r1.70 -r1.71
--- cust_pkg.cgi 10 Feb 2011 17:11:47 -0000 1.70
+++ cust_pkg.cgi 21 May 2011 18:46:33 -0000 1.71
@@ -1,39 +1,35 @@
-<% include( 'elements/search.html',
+<& elements/search.html,
'html_init' => $html_init,
- 'title' => 'Package Search Results',
+ 'title' => emt('Package Search Results'),
'name' => 'packages',
'query' => $sql_query,
'count_query' => $count_query,
- #'redirect' => $link,
- 'header' => [ '#',
- 'Quan.',
- 'Package',
- 'Class',
- 'Status',
- 'Setup',
- 'Base Recur',
- 'Freq.',
- 'Setup',
- 'Last bill',
- 'Next bill',
- 'Adjourn',
- 'Susp.',
- 'Expire',
- 'Contract end',
- 'Cancel',
- 'Reason',
+ 'header' => [ emt('#'),
+ emt('Quan.'),
+ emt('Package'),
+ emt('Class'),
+ emt('Status'),
+ emt('Setup'),
+ emt('Base Recur'),
+ emt('Freq.'),
+ emt('Setup'),
+ emt('Last bill'),
+ emt('Next bill'),
+ emt('Adjourn'),
+ emt('Susp.'),
+ emt('Expire'),
+ emt('Contract end'),
+ emt('Cancel'),
+ emt('Reason'),
FS::UI::Web::cust_header(
$cgi->param('cust_fields')
),
- 'Services',
+ emt('Services'),
],
'fields' => [
'pkgnum',
'quantity',
- sub { #my $part_pkg = $part_pkg{shift->pkgpart};
- #$part_pkg->pkg; # ' - '. $part_pkg->comment;
- $_[0]->pkg; # ' - '. $_[0]->comment;
- },
+ sub { $_[0]->pkg; },
'classname',
sub { ucfirst(shift->status); },
sub { sprintf( $money_char.'%.2f',
@@ -45,20 +41,8 @@
$c->part_pkg->base_recur($c)
);
},
- sub { #shift->part_pkg->freq_pretty;
-
- #my $part_pkg = $part_pkg{shift->pkgpart};
- #$part_pkg->freq_pretty;
-
- FS::part_pkg::freq_pretty(shift);
- },
+ sub { FS::part_pkg::freq_pretty(shift); },
- #sub { time2str('%b %d %Y', shift->setup); },
- #sub { time2str('%b %d %Y', shift->last_bill); },
- #sub { time2str('%b %d %Y', shift->bill); },
- #sub { time2str('%b %d %Y', shift->susp); },
- #sub { time2str('%b %d %Y', shift->expire); },
- #sub { time2str('%b %d %Y', shift->get('cancel')); },
( map { time_or_blank($_) }
qw( setup last_bill bill adjourn susp expire contract_end cancel ) ),
@@ -73,13 +57,6 @@
},
\&FS::UI::Web::cust_fields,
- #sub { '<table border=0 cellspacing=0 cellpadding=0 STYLE="border:none">'.
- # join('', map { '<tr><td align="right" style="border:none">'. $_->[0].
- # ':</td><td style="border:none">'. $_->[1]. '</td></tr>' }
- # shift->labels
- # ).
- # '</table>';
- # },
sub {
my $cust_pkg = shift;
my $type = $cgi->param('_type') || '';
@@ -159,8 +136,7 @@
),
'',
],
- )
-%>
+&>
<%init>
my $curuser = $FS::CurrentUser::CurrentUser;
@@ -171,8 +147,6 @@
my $conf = new FS::Conf;
my $money_char = $conf->config('money_char') || '$';
-# my %part_pkg = map { $_->pkgpart => $_ } qsearch('part_pkg', {});
-
my %search_hash = ();
#some false laziness w/misc/bulk_change_pkg.cgi
@@ -243,23 +217,6 @@
: '';
};
-#if ( scalar(@cust_pkg) == 1 ) {
-# print $cgi->redirect("${p}view/cust_main.cgi?". $cust_pkg[0]->custnum.
-# "#cust_pkg". $cust_pkg[0]->pkgnum );
-
-# my @cust_svc = qsearch( 'cust_svc', { 'pkgnum' => $pkgnum } );
-# my $rowspan = scalar(@cust_svc) || 1;
-
-# my $n2 = '';
-# foreach my $cust_svc ( @cust_svc ) {
-# my($label, $value, $svcdb) = $cust_svc->label;
-# my $svcnum = $cust_svc->svcnum;
-# my $sview = $p. "view";
-# print $n2,qq!<TD><A HREF="$sview/$svcdb.cgi?$svcnum"><FONT SIZE=-1>$label</FONT></A></TD>!,
-# qq!<TD><A HREF="$sview/$svcdb.cgi?$svcnum"><FONT SIZE=-1>$value</FONT></A></TD>!;
-# $n2="</TR><TR>";
-# }
-
sub time_or_blank {
my $column = shift;
return sub {
@@ -277,18 +234,18 @@
if ( $curuser->access_right('Bulk change customer packages') ) {
$text .= include('/elements/init_overlib.html').
include( '/elements/popup_link.html',
- 'label' => 'Change these packages',
+ 'label' => emt('Change these packages'),
'action' => "${p}misc/bulk_change_pkg.cgi?$query",
- 'actionlabel' => 'Change Packages',
+ 'actionlabel' => emt('Change Packages'),
'width' => 569,
'height' => 210,
). '<BR>';
if ( $curuser->access_right('Edit customer package dates') ) {
$text .= include( '/elements/popup_link.html',
- 'label' => 'Increment next bill date',
+ 'label' => emt('Increment next bill date'),
'action' => "${p}misc/bulk_pkg_increment_bill.cgi?$query",
- 'actionlabel' => 'Increment Bill Date',
+ 'actionlabel' => emt('Increment Bill Date'),
'width' => 569,
'height' => 210,
). '<BR>';
- Previous message: [freeside-commits] freeside/httemplate/search/elements cust_main_dayranges.html, 1.12, 1.13 cust_pay_or_refund.html, 1.13, 1.14 report_cust_pay_or_refund.html, 1.3, 1.4
- Next message: [freeside-commits] freeside/httemplate/search cust_bill.html, 1.38, 1.39 report_cust_credit.html, 1.16, 1.17 report_cust_pay.html, 1.23, 1.24
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the freeside-commits
mailing list