merge r12740,12802,13026 from trunk

lib/admin/Model/Provisioning.pm

@@ -159,12 +159,8 @@ sub _translate {
                         )
     };
     unless(defined $translation) {
-        eval {
-            $self->call_prov( $c, 'voip', 'get_localized_string',
-                              { language => $lang, code => 'Server.Internal' },
-                              \$translation,
-                            )
-        };
+        # display error code if no translation is found
+        $translation = $code;
     }
 
     return $translation;

root/tt/subscriber_call_data.tt

@@ -80,7 +80,7 @@
               <td class="callfee">[% callentry.call_fee %]</td>
               [% END %]
               <td class="calldate">[% callentry.date %]</td>
-              <td><a href="javascript:$('#cdrdialog[% i %]').dialog('open');">Details</a></td>
+              <td><a class="cdrpopup" id="[% i %]" href="#">Details</a></td>
             </tr>
             [% END %]
 
@@ -127,3 +127,10 @@
           </tr>
           </table>
 
+<script>
+	$(function () {
+		$('.cdrpopup').click(function(){
+			$('#cdrdialog'+$(this).attr('id')).dialog('open');
+		});
+	});
+</script>

root/tt/subscriber_callforward_times.tt

@@ -282,6 +282,10 @@
 
           // from-year
           if(dropped.attr("id") == "drag-elem-year" || dropped.attr("id") == "drag-elem-year-range") {
+	    var y = d.getFullYear(); var py = parseInt(param);
+	    if(y > py) {
+	      $('<option value="' + py + '" selected="selected">' + py + '</option>').appendTo(from_select);
+	    }
             for(var i = 0; i < years.length; ++i) {
               var y = d.getFullYear() + i;
               $('<option value="' + y + '"' + ((param == y || from_param == y) ? 'selected="selected"' : '') + '>' + y + '</option>').appendTo(from_select);