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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2018-07-03 12:48:26 +02:00
commit 2a8f98be65
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/index.php
View File

@ -539,7 +539,8 @@ if ($showweather)
$boxwork.='<td class="nohover hideonsmartphone center valignmiddle">';
$text='';
if ($totallate > 0) $text=$langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate").' ('.$langs->transnoentitiesnoconv("NActionsLate",$totallate.(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? '%' : '')).')';
$text.='. '.$langs->trans("LateDesc");
else $text=$langs->transnoentitiesnoconv("NoItemLate");
$text.='. '.$langs->transnoentitiesnoconv("LateDesc");
//$text.=$form->textwithpicto('',$langs->trans("LateDesc"));
$options='height="64px"';
$boxwork.=showWeather($totallate,$text,$options);

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

@ -507,6 +507,7 @@ NoneF=None
NoneOrSeveral=None or several
Late=Late
LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
NoItemLate=No late item
Photo=Picture
Photos=Pictures
AddPhoto=Add picture