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

Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/compta/prelevement/create.php
	htdocs/compta/prelevement/fiche-stat.php
This commit is contained in:
Laurent Destailleur
2020-07-27 19:35:34 +02:00
43 changed files with 516 additions and 110 deletions

View File

@@ -177,6 +177,8 @@ class DoliDBPgsql extends DoliDB
if ($type == 'dml')
{
$reg = array();
$line = preg_replace('/\s/', ' ', $line); // Replace tabulation with space
// we are inside create table statement so lets process datatypes