Merge branch 'mergebranch' into 'master'

Marius Burkard

2016-01-04 a4e127a6af97041b2c067f888f8c73a8aec682f1

 interface/web/client/list/client.list.php

@@ -114,5 +114,16 @@
   ),
   'width' => "",
   'value' => "");
	
if(is_file(ISPC_WEB_PATH.'/robot/lib/robot_config.inc.php')){
   $liste["item"][] = array( 'field'  => "validation_status",
   'datatype' => "VARCHAR",
   'formtype' => "SELECT",
   'op'  => "=",
   'prefix' => "",
   'suffix' => "",
   'width'  => "",
   'value'  => array('accept' => 'accept', 'review' => 'review', 'reject' => 'reject'));
}

?>