Merge branch 'FD3-758' of bitbucket.org:ikflowdat/ftth into FD3-745

src/FTTHBundle/Admin/ONUAdmin.php

@@ -71,10 +71,10 @@ class ONUAdmin extends WorkflowBaseAdmin
                 'template' => 'FTTHBundle:ONU:base_list_field_client.html.twig'
             ))
             ->add('ip')
-            ->add('serialNumber', 'string', array(
+            ->add('ponSerialNumberAux', 'string', array(
                 'template' => 'FTTHBundle:ONU:base_list_field_upper.html.twig'
             ))
-            ->add('ponSerialNumber', 'string', array(
+            ->add('serialNumber', 'string', array(
                 'template' => 'FTTHBundle:ONU:base_list_field_upper.html.twig'
             ))
             ;
@@ -688,7 +688,7 @@ class ONUAdmin extends WorkflowBaseAdmin
                             break;
                         }
                     }
-                    if(ctype_xdigit($isNumeric)) { //hexa check
+                    if($isNumeric) { //hexa check
                         $vendoId = $this->hex2str($hex);
                         $rest = substr($ponSerialNumber,8);
                         $psn = strtolower($vendoId.$rest);