diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 908044433e7..dcbf0075007 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -1390,7 +1390,7 @@ class ActionComm extends CommonObject
if ($this->type_code != 'AC_OTH_AUTO') $labeltype = $langs->trans('ActionAC_MANUAL');
}
- $tooltip = ''.$langs->trans('Action').'';
+ $tooltip = img_picto('', $this->picto).' '.$langs->trans('Action').'';
if (!empty($this->ref))
$tooltip .= '
'.$langs->trans('Ref').': '.$this->ref;
if (!empty($label))
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index ded439748e5..e4058a873d3 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -1353,7 +1353,7 @@ class Account extends CommonObject
global $conf, $langs, $user;
$result = '';
- $label = ''.$langs->trans("BankAccount").'';
+ $label = img_picto('', $this->picto).' '.$langs->trans("BankAccount").'';
$label .= '
'.$langs->trans('Label').': '.$this->label;
$label .= '
'.$langs->trans('AccountNumber').': '.$this->number;
$label .= '
'.$langs->trans('IBAN').': '.$this->iban;
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 567a1ab8951..fa2ef4e1387 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -1303,7 +1303,7 @@ class BonPrelevement extends CommonObject
$result = '';
- $labeltoshow = 'Withdraw';
+ $labeltoshow = 'PaymentByDirectDebit';
if ($this->type == 'bank-transfer') {
$labeltoshow = 'PaymentByBankTransfer';
}
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 37bbfc9f3f4..afa4c89460e 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3011,7 +3011,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
$pictowithouttext = preg_replace('/(\.png|\.gif|\.svg)$/', '', $picto);
if (empty($srconly) && in_array($pictowithouttext, array(
'1downarrow', '1uparrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected',
- 'accountancy', 'add', 'address', 'bank_account', 'barcode', 'bank', 'bill', 'bookmark', 'bom', 'building',
+ 'accountancy', 'account', 'action', 'add', 'address', 'bank_account', 'barcode', 'bank', 'bill', 'bookmark', 'bom', 'building',
'cash-register', 'category', 'check', 'clock', 'close_title', 'company', 'contact', 'contract', 'cubes',
'delete', 'dolly', 'dollyrevert', 'edit', 'ellipsis-h', 'email', 'external-link-alt', 'external-link-square-alt',
'filter', 'file-code', 'file-export', 'file-import', 'file-upload', 'folder', 'folder-open', 'globe', 'globe-americas', 'grip', 'grip_title',
@@ -3036,7 +3036,9 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
'jabber', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'youtube', 'google-plus-g', 'whatsapp',
'chevron-left', 'chevron-right', 'chevron-down', 'chevron-top',
'home', 'hrm', 'companies', 'products', 'commercial', 'invoicing', 'pencil-ruler', 'preview', 'project', 'projectpub', 'supplier_invoice', 'members', 'ticket', 'generic',
- 'error', 'warning', 'supplier_proposal', 'supplier_order', 'supplier_invoice',
+ 'error', 'warning',
+ 'recruitmentcandidature', 'recruitmentjobposition',
+ 'supplier_proposal', 'supplier_order', 'supplier_invoice',
'title_setup', 'title_accountancy', 'title_bank', 'title_hrm', 'title_agenda'
)
)) {
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 1cfeba0d33e..8770a0ab1a2 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -1556,7 +1556,7 @@ class ExpenseReport extends CommonObject
if ($short) return $url;
- $label = img_picto('', $this->picto).' '.$langs->trans("ShowExpenseReport").'';
+ $label = img_picto('', $this->picto).' '.$langs->trans("ExpenseReport").'';
if (!empty($this->ref))
$label .= '
'.$langs->trans('Ref').': '.$this->ref;
if (!empty($this->total_ht))
diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php
index 16ddf710d6e..9910855f463 100644
--- a/htdocs/livraison/class/livraison.class.php
+++ b/htdocs/livraison/class/livraison.class.php
@@ -718,7 +718,8 @@ class Livraison extends CommonObject
$result = '';
$picto = 'sending';
- $label = $langs->trans("ShowReceiving").': '.$this->ref;
+ $label = img_picto('', $this->picto).' '.$langs->trans("ShowReceiving").':
';
+ $label .= ''.$langs->trans("Status").': '.$this->ref;
$url = DOL_URL_ROOT.'/livraison/card.php?id='.$this->id;
diff --git a/htdocs/opensurvey/class/opensurveysondage.class.php b/htdocs/opensurvey/class/opensurveysondage.class.php
index 71288266b45..f8f6cb0f885 100644
--- a/htdocs/opensurvey/class/opensurveysondage.class.php
+++ b/htdocs/opensurvey/class/opensurveysondage.class.php
@@ -418,9 +418,8 @@ class Opensurveysondage extends CommonObject
if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
$result = '';
- $companylink = '';
- $label = ''.$langs->trans("ShowSurvey").'';
+ $label = img_picto('', $this->picto).' '.$langs->trans("ShowSurvey").'';
$label .= '
';
$label .= ''.$langs->trans('Ref').': '.$this->ref.'
';
$label .= ''.$langs->trans('Title').': '.$this->title.'
';
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 28a342e7439..30a2a0c242b 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -1021,7 +1021,7 @@ class Project extends CommonObject
}
$label = '';
- if ($option != 'nolink') $label = ''.$langs->trans("Project").'';
+ if ($option != 'nolink') $label = img_picto('', $this->picto).' '.$langs->trans("Project").'';
$label .= ($label ? '
' : '').''.$langs->trans('Ref').': '.$this->ref; // The space must be after the : to not being explode when showing the title in img_picto
$label .= ($label ? '
' : '').''.$langs->trans('Label').': '.$this->title; // The space must be after the : to not being explode when showing the title in img_picto
if (isset($this->public)) {
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index abbb918132a..8020477702a 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -648,7 +648,7 @@ class Task extends CommonObject
if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
$result = '';
- $label = ''.$langs->trans("ShowTask").'';
+ $label = img_picto('', $this->picto).' '.$langs->trans("ShowTask").'';
if (!empty($this->ref))
$label .= '
'.$langs->trans('Ref').': '.$this->ref;
if (!empty($this->label))
diff --git a/htdocs/reception/class/reception.class.php b/htdocs/reception/class/reception.class.php
index 2673c7a0da4..7b2f4927a22 100644
--- a/htdocs/reception/class/reception.class.php
+++ b/htdocs/reception/class/reception.class.php
@@ -1071,7 +1071,7 @@ class Reception extends CommonObject
{
global $conf, $langs;
$result = '';
- $label = ''.$langs->trans("Reception").'';
+ $label = img_picto('', $this->picto).' '.$langs->trans("Reception").'';
$label .= '
'.$langs->trans('Ref').': '.$this->ref;
$label .= '
'.$langs->trans('RefSupplier').': '.($this->ref_supplier ? $this->ref_supplier : $this->ref_client);
diff --git a/htdocs/recruitment/class/recruitmentcandidature.class.php b/htdocs/recruitment/class/recruitmentcandidature.class.php
index 4ceea690f06..036d6bb1610 100644
--- a/htdocs/recruitment/class/recruitmentcandidature.class.php
+++ b/htdocs/recruitment/class/recruitmentcandidature.class.php
@@ -710,7 +710,7 @@ class RecruitmentCandidature extends CommonObject
$result = '';
- $label = ''.$langs->trans("RecruitmentCandidature").'';
+ $label = img_picto('', $this->picto).' '.$langs->trans("RecruitmentCandidature").'';
$label .= '
';
$label .= ''.$langs->trans('Ref').': '.$this->ref;
$label .= '
'.$langs->trans('Email').': '.$this->email;
diff --git a/htdocs/recruitment/class/recruitmentjobposition.class.php b/htdocs/recruitment/class/recruitmentjobposition.class.php
index 81defec97e9..0f28b34be6a 100644
--- a/htdocs/recruitment/class/recruitmentjobposition.class.php
+++ b/htdocs/recruitment/class/recruitmentjobposition.class.php
@@ -798,7 +798,7 @@ class RecruitmentJobPosition extends CommonObject
$result = '';
- $label = ''.$langs->trans("PositionToBeFilled").'';
+ $label = img_picto('', $this->picto).' '.$langs->trans("PositionToBeFilled").'';
$label .= '
';
$label .= ''.$langs->trans('Ref').': '.$this->ref;
$label .= '
'.$langs->trans('Label').': '.$this->label;
diff --git a/htdocs/resource/class/dolresource.class.php b/htdocs/resource/class/dolresource.class.php
index 294f36e5589..0fc5d256541 100644
--- a/htdocs/resource/class/dolresource.class.php
+++ b/htdocs/resource/class/dolresource.class.php
@@ -922,7 +922,7 @@ class Dolresource extends CommonObject
global $conf, $langs;
$result = '';
- $label = ''.$langs->trans("ShowResource").'';
+ $label = img_picto('', $this->picto).' '.$langs->trans("ShowResource").'';
$label .= '
';
$label .= ''.$langs->trans('Ref').': '.$this->ref;
/*if (isset($this->status)) {
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 4c02eec9508..e9e0a35e623 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -2468,7 +2468,7 @@ class SupplierProposal extends CommonObject
$url = '';
$result = '';
- $label = ''.$langs->trans("SupplierProposal").'';
+ $label = img_picto('', $this->picto).' '.$langs->trans("SupplierProposal").'';
if (!empty($this->ref)) $label .= '
'.$langs->trans('Ref').': '.$this->ref;
if (!empty($this->ref_fourn)) $label .= '
'.$langs->trans('RefSupplier').': '.$this->ref_fourn;
if (!empty($this->total_ht)) $label .= '
'.$langs->trans('AmountHT').': '.price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index bf24fa83626..6096e1d2d59 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -1268,9 +1268,8 @@ class Ticket extends CommonObject
if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
$result = '';
- $companylink = '';
- $label = ''.$langs->trans("Ticket").'';
+ $label = img_picto('', $this->picto).' '.$langs->trans("Ticket").'';
$label .= '
';
$label .= ''.$langs->trans('Ref').': '.$this->ref.'
';
$label .= ''.$langs->trans('TicketTrackId').': '.$this->track_id.'
';
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 1dfd090eb5c..3672462fe0f 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -2244,7 +2244,7 @@ class User extends CommonObject
// Info Login
$label .= '';
- $label .= ''.$langs->trans("User").'
';
+ $label .= img_picto('', $this->picto).' '.$langs->trans("User").'
';
$label .= ''.$langs->trans('Name').': '.$this->getFullName($langs, '');
if (!empty($this->login)) $label .= '
'.$langs->trans('Login').': '.$this->login;
if (!empty($this->job)) $label .= '
'.$langs->trans("Job").': '.$this->job;
diff --git a/test/phpunit/FilesLibTest.php b/test/phpunit/FilesLibTest.php
index 669f739646e..7c8ab5f3cc0 100644
--- a/test/phpunit/FilesLibTest.php
+++ b/test/phpunit/FilesLibTest.php
@@ -365,13 +365,10 @@ class FilesLibTest extends PHPUnit\Framework\TestCase
print __METHOD__." result=".$result."\n";
$this->assertTrue($result, 'move with forced mask');
- $conf->global->MAIN_ENABLE_LOG_TO_HTML=1; $conf->syslog->enabled=1; $_REQUEST['logtohtml']=1;
- $conf->logbuffer=array();
-
// To test a delete that should success
$result=dol_delete_file($conf->admin->dir_temp.'/file3.csv');
- print __METHOD__." result delete=".var_export($result, true)."\n";
- $this->assertTrue($result, 'delete file '.join("\n", $conf->logbuffer));
+ print __METHOD__." result=".$result."\n";
+ $this->assertTrue($result, 'delete file');
// Again to test there is error when deleting a non existing file with option disableglob
$result=dol_delete_file($conf->admin->dir_temp.'/file3.csv', 1, 1);
@@ -398,7 +395,6 @@ class FilesLibTest extends PHPUnit\Framework\TestCase
* testDolCompressUnCompress
*
* @return void
- * @depends testDolCopyMoveDelete
*/
public function testDolCompressUnCompress()
{