FD3-576 fix conflictos

src/CablemodemBundle/Admin/CablemodemAdmin.php

@@ -69,6 +69,7 @@ class CablemodemAdmin extends WorkflowBaseAdmin
                         ->add('activationCode')
                         ->add('node')
                         ->add('profile')
+                        ->add('comments')
                     ->end()
                 ->end()
                 ->tab('cm_form_advanced')
@@ -101,6 +102,7 @@ class CablemodemAdmin extends WorkflowBaseAdmin
             ->add('activationCode')
             ->add('node')
             ->add('profile')
+            ->add('comments')
             ->add('mtaEnabled')
         ;
         

src/CablemodemBundle/Entity/Cablemodem.php

@@ -155,19 +155,24 @@ class Cablemodem implements DeviceInterface, TenancyIdTraitInterface, LocationIn
     protected $voip = null;
     
     /**
-     * @ORM\Column(type="boolean", nullable=true)
-     */
+    * @ORM\Column(type="boolean", nullable=true)
+    */
     protected $fixedIP = false;
     
     /**
-     * @ORM\Column(type="boolean", nullable=true)
-     */
+    * @ORM\Column(type="boolean", nullable=true)
+    */
     protected $cpeFixedIP = false;
     
     /**
-     * @ORM\Column(type="boolean", nullable=true)
-     */
+    * @ORM\Column(type="boolean", nullable=true)
+    */
     protected $mtaFixedIP = false;
+    
+    /**
+    * @ORM\Column(type="text", nullable=true)
+    */
+    protected $comments;
 
 
     /**
@@ -431,13 +436,20 @@ class Cablemodem implements DeviceInterface, TenancyIdTraitInterface, LocationIn
     {
         if(is_null($voip)) {
             $this->voip = $voip;
+            
             return $this;
         }
 
         $this->voip = array_values($voip);
+        
         return $this;
     }
-
+    
+    /**
+     * @param string $index
+     *
+     * @return mixed
+     */
     public function getVoipData($index)
     {
         if(is_null($this->voip)) return null;
@@ -473,6 +485,7 @@ class Cablemodem implements DeviceInterface, TenancyIdTraitInterface, LocationIn
         return $this->cpeFixedIP;
     }
     
+<<<<<<< HEAD
     /**
      * @param boolean $cpeFixedIP
      *
@@ -504,5 +517,25 @@ class Cablemodem implements DeviceInterface, TenancyIdTraitInterface, LocationIn
         
         return $this;
     }
+    
+    /**
+     * @return string
+     */
+    public function getComments()
+    {
+        return $this->comments;
+    }
+    
+    /**
+     * @param string $comments
+     *
+     * @return Cablemodem
+     */
+    public function setComments($comments)
+    {
+        $this->comments = $comments;
+        
+        return $this;
+    }
 
 }

src/CablemodemBundle/Resources/translations/CablemodemBundle.es.yml

@@ -39,6 +39,8 @@ filter:
     label_library: Librería
     label_docs_version: Versión DOCSIS
     label_mta_enabled: MTA Enabled
+    label_comments: Comentarios
+    
 form:
     label_name: Nombre
     label_parent: Padre
@@ -73,6 +75,7 @@ form:
     label_fixed_i_p: IP fija
     label_cpe_fixed_i_p: IP fija CPE
     label_mta_fixed_i_p:  IP fija MTA
+    label_comments: Comentarios
     
 list:
     label_id: Id
@@ -104,6 +107,8 @@ list:
     label_library: Librería
     label_docs_version: Versión DOCSIS
     label_mta_enabled: MTA Enabled
+    label_comments: Comentarios
+    
 show:
     label_id: Id
     label_name: Nombre
@@ -134,6 +139,7 @@ show:
     label_library: Librería
     label_docs_version: Versión DOCSIS
     label_mta_enabled: MTA Enabled
+    label_comments: Comentarios
 
 Mac: Mac
 Options: Opciones