summaryrefslogtreecommitdiff
path: root/httemplate/view
diff options
context:
space:
mode:
authormark <mark>2011-09-15 10:19:03 +0000
committermark <mark>2011-09-15 10:19:03 +0000
commit62b12e8b09608b7081ffd596be899fafb5c2403f (patch)
treeea185e690b709c5e66365f24e039c86b3404b12b /httemplate/view
parent43af0ec176ff2ad5c4ecd60a58145f8370cc39d7 (diff)
invoice template and config localization, #12367
Diffstat (limited to 'httemplate/view')
-rwxr-xr-xhttemplate/view/cust_bill-logo.cgi3
-rw-r--r--httemplate/view/cust_main/billing.html9
2 files changed, 11 insertions, 1 deletions
diff --git a/httemplate/view/cust_bill-logo.cgi b/httemplate/view/cust_bill-logo.cgi
index ad2ff5430..75321ef82 100755
--- a/httemplate/view/cust_bill-logo.cgi
+++ b/httemplate/view/cust_bill-logo.cgi
@@ -5,7 +5,7 @@ die "access denied"
unless $FS::CurrentUser::CurrentUser->access_right('View invoices')
or $FS::CurrentUser::CurrentUser->access_right('Configuration');
-my $conf = new FS::Conf;
+my $conf;
my $templatename;
my $agentnum = '';
@@ -13,6 +13,7 @@ if ( $cgi->param('invnum') ) {
$templatename = $cgi->param('template') || $cgi->param('templatename');
my $cust_bill = qsearchs('cust_bill', { 'invnum' => $cgi->param('invnum') } )
or die 'unknown invnum';
+ $conf = $cust_bill->conf;
$agentnum = $cust_bill->cust_main->agentnum;
} else {
my($query) = $cgi->keywords;
diff --git a/httemplate/view/cust_main/billing.html b/httemplate/view/cust_main/billing.html
index cf22ff701..09c0b4d1d 100644
--- a/httemplate/view/cust_main/billing.html
+++ b/httemplate/view/cust_main/billing.html
@@ -273,6 +273,15 @@
</TR>
% }
+% if ( $cust_main->locale ) {
+% my %locale_info = FS::Locales->locale_info($cust_main->locale);
+ <TR>
+ <TD ALIGN="right"><% mt('Invoicing locale') |h %></TD>
+ <TD BGCOLOR="#ffffff"><% $locale_info{name} . " (" . $locale_info{country} .")" %></TD>
+ </TR>
+% }
+
+
</TABLE></TD></TR></TABLE>
<%once>