Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

This commit is contained in:
Laurent Destailleur 2015-08-13 00:51:49 +02:00
commit 8122ed9ec3
2 changed files with 3 additions and 0 deletions

View File

@ -410,6 +410,7 @@ class DoliDBPgsql extends DoliDB
$this->database_name = $name;
pg_set_error_verbosity($this->db, PGSQL_ERRORS_VERBOSE); // Set verbosity to max
}
pg_query($this->db, "set datestyle = 'ISO, YMD';");
return $this->db;
}

View File

@ -49,8 +49,10 @@ if (! $_REQUEST["vatNumber"])
}
else
{
$_REQUEST["vatNumber"] = preg_replace('/\^\w/', '', $_REQUEST["vatNumber"]);
$countryCode=substr($_REQUEST["vatNumber"],0,2);
$vatNumber=substr($_REQUEST["vatNumber"],2);
print '<b>'.$langs->trans("Country").'</b>: '.$countryCode.'<br>';
print '<b>'.$langs->trans("VATIntraShort").'</b>: '.$vatNumber.'<br>';
print '<br>';