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

…evelop
Dolibarr · Aug 12, 2015 · 8122ed9 · 8122ed9
2 parents ba67cf9 + 4a124c6
commit 8122ed9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php
@@ -410,6 +410,7 @@ function connect($host, $login, $passwd, $name, $port=0)
 			$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;
 	}

diff --git a/htdocs/societe/checkvat/checkVatPopup.php b/htdocs/societe/checkvat/checkVatPopup.php
@@ -49,8 +49,10 @@
 }
 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>';