lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	htdocs/install/upgrade2.php
This commit is contained in:
Laurent Destailleur 2020-05-14 16:20:04 +02:00
commit 49cfc1afd8
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/install/upgrade2.php
View File

@ -3605,10 +3605,9 @@ function migrate_mode_reglement($db, $langs, $conf)
* @param DoliDB $db Database handler * @param DoliDB $db Database handler
* @param Translate $langs Object langs * @param Translate $langs Object langs
* @param Conf $conf Object conf * @param Conf $conf Object conf
* @param string $versionto Version target
* @return void * @return void
*/ */
function migrate_clean_association($db, $langs, $conf, $versionto) function migrate_clean_association($db, $langs, $conf)
{ {
$result = $db->DDLDescTable(MAIN_DB_PREFIX."categorie_association"); $result = $db->DDLDescTable(MAIN_DB_PREFIX."categorie_association");
if ($result) // result defined for version 3.2 or - if ($result) // result defined for version 3.2 or -