diff --git a/ChangeLog b/ChangeLog index 2a591271165..31da6b2b4a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,6 +32,7 @@ For users: - New: Add box "last contracts". - New: Works even if Web hosting provider has disabled glob function. - New: Can now send supplier order by mail. +- New: task #10076 : Show content of message in notification module. - Fix: Format number was wrong for ar_AR language. - Fix: Can change password if has only permission change password. - Fix: Project PDF document show the tasks. @@ -54,6 +55,7 @@ For developers: - Qual: Mutualize code of menu managers. - Better isolation of modules files and dolibarr core files. - task #8682 : Remove functions unix_timestamp +- The makepack tool nos make pack with UID 500. WARNING: - A lot of class files (*.class.php) has moved into subdirectories. So If you use diff --git a/htdocs/admin/tools/update.php b/htdocs/admin/tools/update.php index 27b6e4565f9..3fc2be6d2a3 100644 --- a/htdocs/admin/tools/update.php +++ b/htdocs/admin/tools/update.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2007-2010 Laurent Destailleur * Copyright (C) 2009 Regis Houssin * * This program is free software; you can redistribute it and/or modify @@ -36,8 +36,10 @@ if ($_GET["msg"]) $message='
'.$_GET["msg"].'
'; $urldolibarr='http://www.dolibarr.org/downloads/cat_view/62-stable-versions'; -$urldolibarrmodules='http://www.dolibarr.org/downloads/cat_view/65-modulesaddon'; -$urldolibarrthemes='http://www.dolibarr.org/'; +//$urldolibarrmodules='http://www.dolibarr.org/downloads/cat_view/65-modulesaddon'; +$urldolibarrmodules='http://www.dolistore.com/'; +//$urldolibarrthemes='http://www.dolibarr.org/'; +$urldolibarrthemes='http://www.dolistore.com/'; $dolibarrroot=preg_replace('/([\\/]+)$/i','',DOL_DOCUMENT_ROOT); $dolibarrroot=preg_replace('/([^\\/]+)$/i','',$dolibarrroot); @@ -84,15 +86,17 @@ print $langs->trans("RestoreLock",$dolibarrroot.'install.lock').'
'; print '
'; print '
'; +$fullurl=''.$urldolibarrmodules.''; print $langs->trans("AddExtensionThemeModuleOrOther").'
'; print '
'; print $langs->trans("ThisIsProcessToFollow").'
'; print ''.$langs->trans("StepNb",1).': '; -$fullurl=''.$urldolibarrmodules.''; -print $langs->trans("DownloadPackageFromWebSite",$fullurl).'
'; +print $langs->trans("FindPackageFromWebSite",$fullurl).'
'; print ''.$langs->trans("StepNb",2).': '; -print $langs->trans("UnpackPackageInDolibarrRoot",$dolibarrroot).'
'; +print $langs->trans("DownloadPackageFromWebSite",$fullurl).'
'; print ''.$langs->trans("StepNb",3).': '; +print $langs->trans("UnpackPackageInDolibarrRoot",$dolibarrroot).'
'; +print ''.$langs->trans("StepNb",4).': '; print $langs->trans("SetupIsReadyForUse").'
'; print ''; diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index f73daeb885b..93e2e610324 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -234,7 +234,8 @@ MenuHandlers=Menu handlers MenuAdmin=Menu editor ThisIsProcessToFollow=This is setup to process: StepNb=Step %s -DownloadPackageFromWebSite=Download package from web site %s. +FindPackageFromWebSite=Find a package that provides feature you want (for example on web site %s). +DownloadPackageFromWebSite=Download package. UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr's root directory %s SetupIsReadyForUse=Install is finished and Dolibarr is ready to use with this new component. CurrentVersion=Dolibarr current version diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 98e9bad9490..5be72632ded 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -234,7 +234,8 @@ MenuHandlers= Gestionnaires menu MenuAdmin= Edition menu ThisIsProcessToFollow= Voici la procédure à suivre: StepNb= Etape %s -DownloadPackageFromWebSite= Télécharger le package (par exemple depuis le site %s). +FindPackageFromWebSite=Recherche le package qui répond à votre besoin (par exemple sur le site web %s). +DownloadPackageFromWebSite= Télécharger le package. UnpackPackageInDolibarrRoot= Décompresser le package dans le répertoire racine de Dolibarr %s par dessus les fichiers existants (sans déplacer ou effacer cet existant sous peine de perdre sa configuration ou les modules non officiels installés) SetupIsReadyForUse= L'installation est terminée et Dolibarr est prêt à être utilisé avec le nouveau composant. CurrentVersion= Version en cours de Dolibarr