Merge branch 'stable-3.1'

Marius Burkard

2016-07-10 e1ceb050e19c7574bca146a8da7047ee4ff456b5

 interface/web/client/client_list.php

@@ -17,10 +17,22 @@

$app->uses('listform_actions');

$app->listform_actions->SQLOrderBy = 'ORDER BY client.company_name, client.contact_name, client.client_id';
$app->listform_actions->SQLExtWhere = "client.limit_client = 0";
$app->listform_actions->SQLExtSelect = ', client.country as countryiso';
$app->listform_actions->onLoad();
class list_action extends listform_actions {
   function onShow() {
      global $app;
		
      if(is_file(ISPC_WEB_PATH.'/robot/lib/robot_config.inc.php')){
         $app->tpl->setVar('has_robot', true);
      }
		
      parent::onShow();
   }

}

$list = new list_action;
$list->SQLOrderBy = 'ORDER BY client.company_name, client.contact_name, client.client_id';
$list->SQLExtWhere = "client.limit_client = 0";
$list->SQLExtSelect = ', LOWER(client.country) as countryiso';
$list->onLoad();
?>