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

Fix: Field name in export

Browse Source
This commit is contained in:
Laurent Destailleur 2010-12-22 23:03:42 +00:00
parent c45b61359a
commit d336a6460d
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/comm/action/class/actioncomm.class.php
View File

@ -610,7 +610,7 @@ class ActionComm extends CommonObject
*/ */
function build_exportfile($format,$type,$cachedelay,$filename,$filters) function build_exportfile($format,$type,$cachedelay,$filename,$filters)
{ {
global $conf,$langs,$dolibarr_main_url_root; global $conf,$langs,$dolibarr_main_url_root,$mysoc;
require_once (DOL_DOCUMENT_ROOT ."/lib/xcal.lib.php"); require_once (DOL_DOCUMENT_ROOT ."/lib/xcal.lib.php");
require_once (DOL_DOCUMENT_ROOT ."/lib/date.lib.php"); require_once (DOL_DOCUMENT_ROOT ."/lib/date.lib.php");
@ -642,7 +642,7 @@ class ActionComm extends CommonObject
if ($cachedelay) if ($cachedelay)
{ {
$nowgmt = dol_now('gmt'); $nowgmt = dol_now();
if (filemtime($outputfile) > ($nowgmt - $cachedelay)) if (filemtime($outputfile) > ($nowgmt - $cachedelay))
{ {
dol_syslog("ActionComm::build_exportfile file ".$outputfile." is not older than now - cachedelay (".$nowgmt." - ".$cachedelay."). Build is canceled"); dol_syslog("ActionComm::build_exportfile file ".$outputfile." is not older than now - cachedelay (".$nowgmt." - ".$cachedelay."). Build is canceled");
@ -778,13 +778,15 @@ class ActionComm extends CommonObject
if ($logind) $more=$langs->transnoentities("ActionsDoneBy").' '.$langs->convToOutputCharset($logind); if ($logind) $more=$langs->transnoentities("ActionsDoneBy").' '.$langs->convToOutputCharset($logind);
if ($more) if ($more)
{ {
$title=$langs->convToOutputCharset('Dolibarr actions - ').$more; $title=$langs->convToOutputCharset('Dolibarr actions '.$mysoc->name).' - '.$more;
$desc=$more.$langs->convToOutputCharset(' - built by Dolibarr'); $desc=$more;
$desc.=$langs->convToOutputCharset(' ('.$mysoc->name.' - built by Dolibarr)');
} }
else else
{ {
$title=$langs->convToOutputCharset('Dolibarr actions'); $title=$langs->convToOutputCharset('Dolibarr actions '.$mysoc->name);
$desc=$langs->transnoentities('ListOfActions').$langs->convToOutputCharset(' - built by Dolibarr'); $desc=$langs->transnoentities('ListOfActions');
$desc.=$langs->convToOutputCharset(' ('.$mysoc->name.' - built by Dolibarr)');
} }
// Write file // Write file