Merge branch 'patch-2' into 'stable-3.1'

Till Brehm

2016-06-28 d44c3fa38bb0e29718ad7d4009342faf9d2a32a7

 interface/lib/classes/validate_client.inc.php

@@ -161,6 +161,8 @@

         // Test if the country of the VAT-ID matches the country of the customer
         if($country != ''){
            // Greece
            if($country == 'GR') $country = 'EL';
            if(strtoupper($cc) != $country){
               $errmsg = $validator['errmsg'];
               if(isset($app->tform->wordbook[$errmsg])) {