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

Add link to ChangeLog

Browse Source
This commit is contained in:
Laurent Destailleur 2017-10-09 22:52:26 +02:00
parent 3b6f6c4027
commit 0b7aa20464
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/admin/system/dolibarr.php
View File

@ -54,7 +54,7 @@ if ($action == 'getlastversion')
$sfurl = simplexml_load_string($result['content']); $sfurl = simplexml_load_string($result['content']);
} }
/* /*
* View * View
*/ */
@ -107,19 +107,21 @@ if (function_exists('curl_init'))
} }
// Show version // Show version
print $langs->trans("LastStableVersion").' : <b>'. (($version != '0.0')?$version:$langs->trans("Unknown")) .'</b><br>'; print $langs->trans("LastStableVersion").' : <b>'. (($version != '0.0')?$version:$langs->trans("Unknown")) .'</b>';
} }
else else
{ {
print $langs->trans("LastStableVersion").' : <b>' .$langs->trans("UpdateServerOffline").'</b><br>'; print $langs->trans("LastStableVersion").' : <b>' .$langs->trans("UpdateServerOffline").'</b>';
} }
} }
else else
{ {
print $langs->trans("LastStableVersion").' : <a href="'.$_SERVER["PHP_SELF"].'?action=getlastversion" class="button">' .$langs->trans("Check").'</a><br>'; print $langs->trans("LastStableVersion").' : <a href="'.$_SERVER["PHP_SELF"].'?action=getlastversion" class="button">' .$langs->trans("Check").'</a>';
} }
} }
print ' &nbsp; &nbsp; - &nbsp; &nbsp; ';
print '<a href="https://raw.githubusercontent.com/Dolibarr/dolibarr/develop/ChangeLog" target="_blank">'.$langs->trans("SeeChangeLog").'</a>';
print '</td></tr>'."\n"; print '</td></tr>'."\n";
print '<tr class="oddeven"><td>'.$langs->trans("VersionLastUpgrade").' ('.$langs->trans("Database").')</td><td>'.$conf->global->MAIN_VERSION_LAST_UPGRADE.'</td></tr>'."\n"; print '<tr class="oddeven"><td>'.$langs->trans("VersionLastUpgrade").' ('.$langs->trans("Database").')</td><td>'.$conf->global->MAIN_VERSION_LAST_UPGRADE.'</td></tr>'."\n";
print '<tr class="oddeven"><td>'.$langs->trans("VersionLastInstall").'</td><td>'.$conf->global->MAIN_VERSION_LAST_INSTALL.'</td></tr>'."\n"; print '<tr class="oddeven"><td>'.$langs->trans("VersionLastInstall").'</td><td>'.$conf->global->MAIN_VERSION_LAST_INSTALL.'</td></tr>'."\n";
@ -343,7 +345,7 @@ foreach($configfileparameters as $key => $value)
{ {
$newkey = preg_replace('/^\?/','',$key); $newkey = preg_replace('/^\?/','',$key);
if (preg_match('/^\?/',$key) && empty(${$newkey})) if (preg_match('/^\?/',$key) && empty(${$newkey}))
{ {
if ($newkey != 'multicompany_transverse_mode' || empty($conf->multicompany->enabled)) if ($newkey != 'multicompany_transverse_mode' || empty($conf->multicompany->enabled))
continue; // We discard parameters starting with ? continue; // We discard parameters starting with ?

1
htdocs/langs/en_US/admin.lang
View File

@ -1723,6 +1723,7 @@ MultiPriceRuleDesc=When option "Several level of prices per product/service" is
ModelModulesProduct=Templates for product documents ModelModulesProduct=Templates for product documents
ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number. ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
SeeSubstitutionVars=See * note for list of possible substitution variables SeeSubstitutionVars=See * note for list of possible substitution variables
SeeChangeLog=See ChangeLog file (english only)
AllPublishers=All publishers AllPublishers=All publishers
UnknownPublishers=Unknown publishers UnknownPublishers=Unknown publishers
AddRemoveTabs=Add or remove tabs AddRemoveTabs=Add or remove tabs