projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
97bd9c0
)
fix for uumlaut problem, RT#10359
author
ivan
<ivan>
Tue, 2 Nov 2010 00:28:13 +0000
(
00:28
+0000)
committer
ivan
<ivan>
Tue, 2 Nov 2010 00:28:13 +0000
(
00:28
+0000)
FS/FS/Record.pm
patch
|
blob
|
history
httemplate/edit/cust_main/contact.html
patch
|
blob
|
history
httemplate/view/cust_main/billing.html
patch
|
blob
|
history
httemplate/view/cust_main/contacts.html
patch
|
blob
|
history
diff --git
a/FS/FS/Record.pm
b/FS/FS/Record.pm
index
4f0984c
..
0df3f44
100644
(file)
--- a/
FS/FS/Record.pm
+++ b/
FS/FS/Record.pm
@@
-2458,7
+2458,9
@@
May not be null.
sub ut_name {
my( $self, $field ) = @_;
sub ut_name {
my( $self, $field ) = @_;
- $self->getfield($field) =~ /^([\w \,\.\-\']+)$/
+# warn "ut_name allowed alphanumerics: +(sort grep /\w/, map { chr() } 0..255), "\n";
+ #$self->getfield($field) =~ /^([\w \,\.\-\']+)$/
+ $self->getfield($field) =~ /^([µ_0123456789aAáÁàÀâÂåÅäÄãêæÆbBcCçÇdDðÐeEéÉèÈêÊëËfFgGhHiIíÍìÌîÎïÏjJkKlLmMnNñÑoOóÓòÒôÔöÖõÕøغpPqQrRsSßtTuUúÚùÙûÛüÜvVwWxXyYýÝÿzZþÞ \,\.\-\']+)$/
or return gettext('illegal_name'). " $field: ". $self->getfield($field);
$self->setfield($field,$1);
'';
or return gettext('illegal_name'). " $field: ". $self->getfield($field);
$self->setfield($field,$1);
'';
diff --git
a/httemplate/edit/cust_main/contact.html
b/httemplate/edit/cust_main/contact.html
index
feb61db
..
99bc558
100644
(file)
--- a/
httemplate/edit/cust_main/contact.html
+++ b/
httemplate/edit/cust_main/contact.html
@@
-3,8
+3,8
@@
<TR>
<TH ALIGN="right"><%$r%>Contact name<BR>(last, first)</TH>
<TD COLSPAN=5>
<TR>
<TH ALIGN="right"><%$r%>Contact name<BR>(last, first)</TH>
<TD COLSPAN=5>
- <INPUT TYPE="text" NAME="<%$pre%>last" VALUE="<% $cust_main->get($pre.'last') %>" onChange="<% $onchange %>" <%$disabled%> <%$style%>> ,
- <INPUT TYPE="text" NAME="<%$pre%>first" VALUE="<% $cust_main->get($pre.'first') %>" onChange="<% $onchange %>" <%$disabled%> <%$style%>>
+ <INPUT TYPE="text" NAME="<%$pre%>last" VALUE="<% $cust_main->get($pre.'last')
|h
%>" onChange="<% $onchange %>" <%$disabled%> <%$style%>> ,
+ <INPUT TYPE="text" NAME="<%$pre%>first" VALUE="<% $cust_main->get($pre.'first')
|h
%>" onChange="<% $onchange %>" <%$disabled%> <%$style%>>
</TD>
% if ( $conf->exists('show_ss') && !$pre ) {
</TD>
% if ( $conf->exists('show_ss') && !$pre ) {
@@
-21,7
+21,7
@@
<TR>
<TD ALIGN="right">Company</TD>
<TD COLSPAN=7>
<TR>
<TD ALIGN="right">Company</TD>
<TD COLSPAN=7>
- <INPUT TYPE="text" NAME="<%$pre%>company" VALUE="<% $cust_main->get($pre.'company') %>" SIZE=70 onChange="<% $onchange %>" <%$disabled%> <%$style%>>
+ <INPUT TYPE="text" NAME="<%$pre%>company" VALUE="<% $cust_main->get($pre.'company')
|h
%>" SIZE=70 onChange="<% $onchange %>" <%$disabled%> <%$style%>>
</TD>
</TR>
</TD>
</TR>
diff --git
a/httemplate/view/cust_main/billing.html
b/httemplate/view/cust_main/billing.html
index
dd19523
..
014ddab
100644
(file)
--- a/
httemplate/view/cust_main/billing.html
+++ b/
httemplate/view/cust_main/billing.html
@@
-132,7
+132,7
@@
Billing information
<TR>
<TD ALIGN="right">Attention</TD>
<TR>
<TD ALIGN="right">Attention</TD>
- <TD BGCOLOR="#ffffff"><% $cust_main->payname %></TD>
+ <TD BGCOLOR="#ffffff"><% $cust_main->payname
|h
%></TD>
</TR>
% } elsif ( $cust_main->payby eq 'COMP' ) {
</TR>
% } elsif ( $cust_main->payby eq 'COMP' ) {
diff --git
a/httemplate/view/cust_main/contacts.html
b/httemplate/view/cust_main/contacts.html
index
e88c02e
..
e91af54
100644
(file)
--- a/
httemplate/view/cust_main/contacts.html
+++ b/
httemplate/view/cust_main/contacts.html
@@
-10,7
+10,7
@@
<TR>
<TD ALIGN="right">Contact name</TD>
<TD COLSPAN=5 BGCOLOR="#ffffff">
<TR>
<TD ALIGN="right">Contact name</TD>
<TD COLSPAN=5 BGCOLOR="#ffffff">
- <% $cust_main->get("${pre}last"). ', '. $cust_main->get("${pre}first") %>
+ <% $cust_main->get("${pre}last"). ', '. $cust_main->get("${pre}first")
|h
%>
</TD>
% if ( $which eq '' && $conf->exists('show_ss') ) {
<TD ALIGN="right">SS#</TD>
</TD>
% if ( $which eq '' && $conf->exists('show_ss') ) {
<TD ALIGN="right">SS#</TD>
@@
-19,11
+19,11
@@
</TR>
<TR>
<TD ALIGN="right">Company</TD>
</TR>
<TR>
<TD ALIGN="right">Company</TD>
- <TD COLSPAN=7 BGCOLOR="#ffffff"><% $cust_main->get("${pre}company") %></TD>
+ <TD COLSPAN=7 BGCOLOR="#ffffff"><% $cust_main->get("${pre}company")
|h
%></TD>
</TR>
<TR>
<TD ALIGN="right">Address</TD>
</TR>
<TR>
<TD ALIGN="right">Address</TD>
- <TD COLSPAN=7 BGCOLOR="#ffffff"><% $cust_main->get("${pre}address1") %></TD>
+ <TD COLSPAN=7 BGCOLOR="#ffffff"><% $cust_main->get("${pre}address1")
|h
%></TD>
</TR>
% if ( $cust_main->get("${pre}address2") ) {
</TR>
% if ( $cust_main->get("${pre}address2") ) {
@@
-36,20
+36,20
@@
<TR>
<TD ALIGN="right"><% $address2_label %></TD>
<TR>
<TD ALIGN="right"><% $address2_label %></TD>
- <TD COLSPAN=7 BGCOLOR="#ffffff"><% $cust_main->get("${pre}address2") %></TD>
+ <TD COLSPAN=7 BGCOLOR="#ffffff"><% $cust_main->get("${pre}address2")
|h
%></TD>
</TR>
% }
<TR>
<TD ALIGN="right">City</TD>
</TR>
% }
<TR>
<TD ALIGN="right">City</TD>
- <TD BGCOLOR="#ffffff"><% $cust_main->get("${pre}city") %></TD>
+ <TD BGCOLOR="#ffffff"><% $cust_main->get("${pre}city")
|h
%></TD>
% if ( $cust_main->get("${pre}county") ) {
<TD ALIGN="right">County</TD>
% if ( $cust_main->get("${pre}county") ) {
<TD ALIGN="right">County</TD>
- <TD BGCOLOR="#ffffff"><% $cust_main->get("${pre}county") %></TD>
+ <TD BGCOLOR="#ffffff"><% $cust_main->get("${pre}county")
|h
%></TD>
% }
<TD ALIGN="right">State</TD>
% }
<TD ALIGN="right">State</TD>
- <TD BGCOLOR="#ffffff"><% state_label( $cust_main->get("${pre}state"), $cust_main->get("${pre}country") ) %></TD>
+ <TD BGCOLOR="#ffffff"><% state_label( $cust_main->get("${pre}state"), $cust_main->get("${pre}country") )
|h
%></TD>
<TD ALIGN="right">Zip</TD>
<TD BGCOLOR="#ffffff"><% $cust_main->get("${pre}zip") %></TD>
</TR>
<TD ALIGN="right">Zip</TD>
<TD BGCOLOR="#ffffff"><% $cust_main->get("${pre}zip") %></TD>
</TR>