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

Merge remote-tracking branch 'origin/3.7' into develop

Browse Source 
Conflicts:
	htdocs/compta/facture.php
	htdocs/product/stock/product.php
This commit is contained in:
Laurent Destailleur 2015-04-08 20:43:51 +02:00
commit ca7a7a9038
3 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
htdocs/core/class/stats.class.php
View File

@ -203,11 +203,14 @@ abstract class Stats
dol_syslog(get_class($this).'::'.__FUNCTION__." save cache file ".$newpathofdestfile." onto disk."); dol_syslog(get_class($this).'::'.__FUNCTION__." save cache file ".$newpathofdestfile." onto disk.");
if (! dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp); if (! dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
$fp = fopen($newpathofdestfile, 'w'); $fp = fopen($newpathofdestfile, 'w');
fwrite($fp, json_encode($data)); if ($fp)
fclose($fp); {
if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK; fwrite($fp, json_encode($data));
@chmod($newpathofdestfile, octdec($newmask)); fclose($fp);
if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
@chmod($newpathofdestfile, octdec($newmask));
}
else dol_syslog("Failed to write cache file", LOG_ERR);
$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$nowgmt; $this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$nowgmt;
} }
@ -309,11 +312,13 @@ abstract class Stats
dol_syslog(get_class($this).'::'.__FUNCTION__." save cache file ".$newpathofdestfile." onto disk."); dol_syslog(get_class($this).'::'.__FUNCTION__." save cache file ".$newpathofdestfile." onto disk.");
if (! dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp); if (! dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
$fp = fopen($newpathofdestfile, 'w'); $fp = fopen($newpathofdestfile, 'w');
fwrite($fp, json_encode($data)); if ($fp)
fclose($fp); {
if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK; fwrite($fp, json_encode($data));
@chmod($newpathofdestfile, octdec($newmask)); fclose($fp);
if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
@chmod($newpathofdestfile, octdec($newmask));
}
$this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$nowgmt; $this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$nowgmt;
} }

2
htdocs/projet/tasks.php
View File

@ -413,7 +413,7 @@ else
} }
print '<table id="tablelines" class="noborder" width="100%">'; print '<table id="tablelines" class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre nodrag nodrop">';
// print '<td>'.$langs->trans("Project").'</td>'; // print '<td>'.$langs->trans("Project").'</td>';
print '<td width="100">'.$langs->trans("RefTask").'</td>'; print '<td width="100">'.$langs->trans("RefTask").'</td>';
print '<td>'.$langs->trans("LabelTask").'</td>'; print '<td>'.$langs->trans("LabelTask").'</td>';