Merge remote-tracking branch 'origin/master' into luciano

composer.lock

@@ -1262,7 +1262,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/BaseAdmin.git",
-                "reference": "e7d165c1537e1d73063df9ab6d721ab373333ee5"
+                "reference": "9ea1772fe297c40392bc5e3dbf2ffb7946fd8d08"
             },
             "type": "library",
             "autoload": {
@@ -1277,7 +1277,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2017-04-18 19:08:56"
+            "time": "2017-04-20 18:25:44"
         },
         {
             "name": "ik/oauthclient-bundle",
@@ -1356,7 +1356,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/WorkflowBundle.git",
-                "reference": "e5f88591e85de0436f5c4dcc5562dcdc297ac0f9"
+                "reference": "996c1b6a41a5bcb83c639786d8fcc55249a0b822"
             },
             "require": {
                 "php-amqplib/rabbitmq-bundle": "^1.12"
@@ -1386,7 +1386,7 @@
                 "bundle",
                 "workflow"
             ],
-            "time": "2017-04-18 14:35:03"
+            "time": "2017-04-19 19:03:43"
         },
         {
             "name": "incenteev/composer-parameter-handler",

src/FTTHBundle/Admin/ONUAdmin.php

@@ -34,7 +34,7 @@ class ONUAdmin extends BaseAdmin
     protected function configureListFields(ListMapper $listMapper)
     {
         $listMapper
-	    ->add('clientId')
+	        ->add('clientId')
             ->add('ip')
             ->add('mac')
             ->add('serialNumber')
@@ -62,7 +62,7 @@ class ONUAdmin extends BaseAdmin
     protected function configureFormFields(FormMapper $formMapper)
     {
         $formMapper
-	    ->add('clientId')
+	        ->add('clientId')
             ->add('ponSerialNumber')
             ->add('profile')
             ->add('node')
@@ -81,7 +81,7 @@ class ONUAdmin extends BaseAdmin
     {
         $showMapper
             ->add('id')
-	    ->add('clientId')
+	        ->add('clientId')
             ->add('ponSerialNumber')
             ->add('profile')
             ->add('node')