projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.freeside.biz:/home/git/freeside
[freeside.git]
/
httemplate
/
elements
/
change_history_common.html
diff --git
a/httemplate/elements/change_history_common.html
b/httemplate/elements/change_history_common.html
index
d941427
..
5aaf6e6
100644
(file)
--- a/
httemplate/elements/change_history_common.html
+++ b/
httemplate/elements/change_history_common.html
@@
-3,6
+3,7
@@
% my $bgcolor2 = '#ffffff';
% my $bgcolor = '';
% my $bgcolor2 = '#ffffff';
% my $bgcolor = '';
+<THEAD>
<TR>
<TH CLASS="grid" BGCOLOR="#cccccc">User</TH>
<TH CLASS="grid" BGCOLOR="#cccccc">Date</TH>
<TR>
<TH CLASS="grid" BGCOLOR="#cccccc">User</TH>
<TH CLASS="grid" BGCOLOR="#cccccc">Date</TH>
@@
-14,6
+15,7
@@
<TH CLASS="grid" BGCOLOR="#cccccc">Action</TH>
<TH CLASS="grid" BGCOLOR="#cccccc">Description</TH>
</TR>
<TH CLASS="grid" BGCOLOR="#cccccc">Action</TH>
<TH CLASS="grid" BGCOLOR="#cccccc">Description</TH>
</TR>
+</THEAD>
% foreach my $item ( @history ) {
% my $history_other = '';
% foreach my $item ( @history ) {
% my $history_other = '';
@@
-46,10
+48,10
@@
<TR>
<TD ALIGN="left" CLASS="grid" BGCOLOR="<% $bgcolor %>">
<TR>
<TD ALIGN="left" CLASS="grid" BGCOLOR="<% $bgcolor %>">
-% my $otaker;
+% my $otaker
= ''
;
% if ( $item->history_usernum ) {
% $access_user{ $item->history_usernum } ||=
% if ( $item->history_usernum ) {
% $access_user{ $item->history_usernum } ||=
-%
qsearchs('access_user', { 'usernum' => $item->history_usernum }
);
+%
FS::access_user->by_key( $item->history_usernum
);
% $otaker = $access_user{ $item->history_usernum }->username
% if $access_user{ $item->history_usernum };
% }
% $otaker = $access_user{ $item->history_usernum }->username
% if $access_user{ $item->history_usernum };
% }
@@
-83,7
+85,7
@@
<TD ALIGN="center" CLASS="grid" BGCOLOR="<% $bgcolor %>">
% my $label = '';
<TD ALIGN="center" CLASS="grid" BGCOLOR="<% $bgcolor %>">
% my $label = '';
-% if ( $item->table eq 'legacy_cust_
bill
' ) {
+% if ( $item->table eq 'legacy_cust_
history
' ) {
% $label = $item->item;
% } else {
% $label = $item->table;
% $label = $item->item;
% } else {
% $label = $item->table;
@@
-100,7
+102,7
@@
</TD>
<TD ALIGN="left" CLASS="grid" BGCOLOR="<% $bgcolor %>">
</TD>
<TD ALIGN="left" CLASS="grid" BGCOLOR="<% $bgcolor %>">
-% if ( $item->table eq 'legacy_cust_
bill
' ) {
+% if ( $item->table eq 'legacy_cust_
history
' ) {
<% $item->description |h %>
% } else {
<% join(', ',
<% $item->description |h %>
% } else {
<% join(', ',
@@
-148,8
+150,8
@@
die "access deined"
my %action = (
'insert' => 'Insert', #'Create',
my %action = (
'insert' => 'Insert', #'Create',
- 'replace_old' =>
'Change from'
,
- 'replace_new' =>
'Change to'
,
+ 'replace_old' =>
"Change\xA0from"
,
+ 'replace_new' =>
"Change\xA0to"
,
'delete' => 'Remove',
);
'delete' => 'Remove',
);
@@
-195,6
+197,12
@@
my $svc_labelsub = sub {
$label. ': <b>'. encode_entities($item->label($item->history_date)). '</b>';
};
$label. ': <b>'. encode_entities($item->label($item->history_date)). '</b>';
};
+my $tag_labelsub = sub {
+ my($item, $label) = @_;
+ my $part_tag = qsearchs('part_tag',{ tagnum => $item->tagnum });
+ $label. ': <SPAN STYLE="background-color: #'.$part_tag->tagcolor.'">'. encode_entities($part_tag->tagname). '</SPAN>';
+};
+
my %h_table_labelsub = (
'h_cust_pkg' => $pkg_labelsub,
'h_svc_acct' => $svc_labelsub,
my %h_table_labelsub = (
'h_cust_pkg' => $pkg_labelsub,
'h_svc_acct' => $svc_labelsub,
@@
-206,6
+214,7
@@
my %h_table_labelsub = (
'h_svc_external' => $svc_labelsub,
'h_svc_phone' => $svc_labelsub,
#'h_phone_device'
'h_svc_external' => $svc_labelsub,
'h_svc_phone' => $svc_labelsub,
#'h_phone_device'
+ 'h_cust_tag' => $tag_labelsub,
);
my $discounts = {};
);
my $discounts = {};