Index: pro-violet-viettel/sourcecode/application/modules/admin/controllers/collaborator.php
===================================================================
--- pro-violet-viettel/sourcecode/application/modules/admin/controllers/collaborator.php	(revision 540)
+++ pro-violet-viettel/sourcecode/application/modules/admin/controllers/collaborator.php	(revision 576)
@@ -75,9 +75,9 @@
         if (strlen($input['full_name'])==0)
         {
-            $result['errors'][]="TÃªn cá»ng tÃ¡c viÃªn khÃŽng ÄÆ°á»£c Äá» trá»ng";
+            $result['errors'][]=array("content"=>"TÃªn cá»ng tÃ¡c viÃªn khÃŽng ÄÆ°á»£c Äá» trá»ng","field"=>"full_name");
         }
         if (strlen($input['login_name'])==0)
         {
-            $result['errors'][]="TÃªn ÄÄng nháº­p khÃŽng ÄÆ°á»£c Äá» trá»ng";
+            $result['errors'][]=array("content"=>"TÃªn ÄÄng nháº­p khÃŽng ÄÆ°á»£c Äá» trá»ng","field"=>"login_name");
         }
         else
@@ -85,10 +85,10 @@
             if ($this->collabolator_model->isExist(array('field'=>'login_name','value'=>$input['login_name'])))
             {
-                $result['errors'][]="TÃªn ÄÄng nháº­p ÄÃ£ ÄÆ°á»£c sá»­ dá»¥ng";
+                $result['errors'][]=array("content"=>"TÃªn ÄÄng nháº­p ÄÃ£ ÄÆ°á»£c sá»­ dá»¥ng","field"=>"login_name");
             }
         }
         if (strlen($input['cellphone'])==0)
         {
-            $result['errors'][]="Sá» Äiá»n thoáº¡i khÃŽng ÄÆ°á»£c Äá» trá»ng";
+            $result['errors'][]=array("content"=>"Sá» Äiá»n thoáº¡i khÃŽng ÄÆ°á»£c Äá» trá»ng","field"=>"cellphone");
         }
         else
@@ -96,14 +96,17 @@
             if ($this->collabolator_model->isExist(array('field'=>'cellphone','value'=>$input['cellphone'])))
             {
-                $result['errors'][]="Sá» Äiá»n thoáº¡i ÄÃ£ ÄÆ°á»£c sá»­ dá»¥ng";
+                $result['errors'][]=array("content"=>"Sá» Äiá»n thoáº¡i ÄÃ£ ÄÆ°á»£c sá»­ dá»¥ng","field"=>"cellphone");
             }
         }
         if (strlen($input['passwd'])==0)
         {
-            $result['errors'][]="Máº­t kháº©u khÃŽng ÄÆ°á»£c Äá» trá»ng";
-        }
-        if ($input['passwd'] != $input['passwd2'])
-        {
-            $result['errors'][]="Máº­t kháº©u khÃŽng trÃ¹ng nhau";
+            $result['errors'][]=array("content"=>"Máº­t kháº©u khÃŽng ÄÆ°á»£c Äá» trá»ng","field"=>"passwd");
+        }
+        else
+        {
+            if ($input['passwd'] != $input['passwd2'])
+            {
+                $result['errors'][]=array("content"=>"Máº­t kháº©u pháº£i trÃ¹ng nhau","field"=>"passwd");
+            }
         }
         if (!isset($result['errors']))
Index: pro-violet-viettel/sourcecode/application/modules/admin/controllers/smstemplate.php
===================================================================
--- pro-violet-viettel/sourcecode/application/modules/admin/controllers/smstemplate.php	(revision 540)
+++ pro-violet-viettel/sourcecode/application/modules/admin/controllers/smstemplate.php	(revision 576)
@@ -75,9 +75,9 @@
         if (strlen($input['sms_content'])==0)
         {
-            $result['errors'][]="Ná»i dung tin nháº¯n khÃŽng ÄÆ°á»£c Äá» trá»ng";
+            $result['errors'][]=array("content"=>"Ná»i dung tin nháº¯n khÃŽng ÄÆ°á»£c Äá» trá»ng","field"=>"sms_content");
         }
         if (strlen($input['sms_reply'])==0)
         {
-            $result['errors'][]="Tin nháº¯n tráº£ vá» khÃŽng ÄÆ°á»£c Äá» trá»ng";
+            $result['errors'][]=array("content"=>"Tin nháº¯n tráº£ vá» khÃŽng ÄÆ°á»£c Äá» trá»ng","field"=>"sms_reply");
         }
         else
@@ -91,7 +91,11 @@
              */
         }
+        if (strlen($input['commandcode'])==0)
+        {
+            $result['errors'][]=array("content"=>"Command code khÃŽng ÄÆ°á»£c Äá» trá»ng","field"=>"commandcode");
+        }
         if (strlen($input['service_id'])==0)
         {
-            $result['errors'][]="MÃ£ dá»ch vá»¥ khÃŽng ÄÆ°á»£c Äá» trá»ng";
+            $result['errors'][]=array("content"=>"Service id khÃŽng ÄÆ°á»£c Äá» trá»ng","field"=>"service_id");
         }
         else
