projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add config to display note at top, RT#84990
[freeside.git]
/
httemplate
/
misc
/
reason-merge.html
diff --git
a/httemplate/misc/reason-merge.html
b/httemplate/misc/reason-merge.html
index
a531e58
..
b7e4df4
100644
(file)
--- a/
httemplate/misc/reason-merge.html
+++ b/
httemplate/misc/reason-merge.html
@@
-1,9
+1,7
@@
% if ($success) {
<% include('/elements/header-popup.html', 'Reason Merge Success') %>
<SCRIPT>
% if ($success) {
<% include('/elements/header-popup.html', 'Reason Merge Success') %>
<SCRIPT>
-<!--
-window.top.location.reload()
--->
+topreload()
</SCRIPT>
% } else {
<% include('/elements/header-popup.html', 'Merge Reasons') %>
</SCRIPT>
% } else {
<% include('/elements/header-popup.html', 'Merge Reasons') %>
@@
-72,7
+70,7
@@
if ($cgi->param('process_merge') && !$error) {
$error = $destreason->merge(\@reasons);
$success = 1 unless $error;
} else {
$error = $destreason->merge(\@reasons);
$success = 1 unless $error;
} else {
- $error = "No des
it
ation reason selected.";
+ $error = "No des
tin
ation reason selected.";
}
}
}
}