diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 1cf3beb327e3f4f2f920b977c729f970cbd4fe02..90519eeb71029adb07b45b99b8a7d9b446e9b867 100644 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -55,7 +55,7 @@ $VERSION="1.0 (build $REVISION)"; ($DIR=$0) =~ s/([^\/\\]+)$//; ($PROG=$1) =~ s/\.([^\.]*)$//; $Extension=$1; $DIR||='.'; $DIR =~ s/([^\/\\])[\\\/]+$/$1/; -$SOURCE="$DIR/../../dolibarr"; +$SOURCE="$DIR/.."; $DESTI="$SOURCE/build"; # Detect OS type diff --git a/htdocs/install/check.php b/htdocs/install/check.php index 6b490acd6cdfea46d996f8ef126071ef02924021..ac715ff851a416383157fcdb6a2e446c69578248 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -273,7 +273,9 @@ else { $versionfrom=$migarray['from']; $versionto=$migarray['to']; - print '<tr><td nowrap="nowrap"><b>'.$langs->trans("Upgrade").' '.$versionfrom.' -> '.$versionto.'</b></td><td>'; + $newversionfrom=eregi_replace('\.[0-9]+$','.*',$versionfrom); + $newversionto=eregi_replace('\.[0-9]+$','.*',$versionto); + print '<tr><td nowrap="nowrap"><b>'.$langs->trans("Upgrade").' '.$newversionfrom.' -> '.$newversionto.'</b></td><td>'; print $langs->trans("UpgradeDesc").'</td>'; print '<td align="center">'; if ($allowupgrade)