From: ivan <ivan>
Date: Fri, 12 Aug 2011 20:07:55 +0000 (+0000)
Subject: don't show an empty merge dropdown when there's only one order
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=b9d92c81c81c3cbdba5124055246bda49dc8f2c7

don't show an empty merge dropdown when there's only one order
---

diff --git a/httemplate/browse/did_order.html b/httemplate/browse/did_order.html
index 61b37d8d9..f328c1fcc 100644
--- a/httemplate/browse/did_order.html
+++ b/httemplate/browse/did_order.html
@@ -149,9 +149,10 @@ my @merge_targets = qsearch({
 my $merge_select = sub {
     my $source_ordernum = shift;
     my $merge_select = '';
-    if ( @merge_targets ) {
+    my @targets = grep { $_->ordernum != $source_ordernum } @merge_targets;
+    if ( @targets ) {
         $merge_select = "<SELECT onchange='mergeconfirm(this,$source_ordernum)'><OPTION></OPTION>";
-        foreach my $order ( @merge_targets ) {
+        foreach my $order ( @targets ) {
             next if $order->ordernum == $source_ordernum;
             $merge_select .= "<OPTION>".$order->ordernum."</OPTION>";
         }