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

Merge pull request #12035 from atm-john/develop_fix_missing_dolgetstatus

Browse Source 
Fix : LibStatut missing dolgetstatus usage
This commit is contained in:
Laurent Destailleur 2019-10-07 13:08:33 +02:00 committed by GitHub
commit 1060ac4608
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 49 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/core/lib/functions.lib.php
View File

@ -8101,6 +8101,11 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st
$return = ''; $return = '';
$dolGetBadgeParams = array();
if(!empty($params['badgeParams'])){
$dolGetBadgeParams = $params['badgeParams'];
}
// image's filename are still in French // image's filename are still in French
$statusImg=array( $statusImg=array(
'status0' => 'statut0' 'status0' => 'statut0'
@ -8156,13 +8161,13 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st
$statusLabelShort = !empty($statusLabelShort)?$statusLabelShort:$statusLabel; $statusLabelShort = !empty($statusLabelShort)?$statusLabelShort:$statusLabel;
if ($displayMode == 3) { if ($displayMode == 3) {
$return = dolGetBadge($statusLabel, '', $statusType, 'dot'); $return = dolGetBadge($statusLabel, '', $statusType, 'dot', $url, $dolGetBadgeParams);
} }
elseif ($displayMode === 5) { elseif ($displayMode === 5) {
$return = dolGetBadge($statusLabelShort, $html, $statusType); $return = dolGetBadge($statusLabelShort, $html, $statusType, '', $url, $dolGetBadgeParams);
} }
else { else {
$return = dolGetBadge($statusLabel, $html, $statusType); $return = dolGetBadge($statusLabel, $html, $statusType, '', $url, $dolGetBadgeParams);
} }
} }

77
htdocs/fourn/class/fournisseur.commande.class.php
View File

@ -625,18 +625,17 @@ class CommandeFournisseur extends CommonOrder
/** /**
* Return label of a status * Return label of a status
* *
* @param int $statut Id statut * @param int $status Id statut
* @param int $mode 0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto * @param int $mode 0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto
* @param int $billed 1=Billed * @param int $billed 1=Billed
* @return string Label of status * @return string Label of status
*/ */
public function LibStatut($statut, $mode = 0, $billed = 0) public function LibStatut($status, $mode = 0, $billed = 0)
{ {
// phpcs:enable // phpcs:enable
global $conf, $langs; global $conf, $langs;
if (empty($this->statuts) || empty($this->statutshort)) if (empty($this->statuts) || empty($this->statutshort)){
{
$langs->load('orders'); $langs->load('orders');
$this->statuts[0] = 'StatusSupplierOrderDraft'; $this->statuts[0] = 'StatusSupplierOrderDraft';
@ -662,55 +661,33 @@ class CommandeFournisseur extends CommonOrder
$this->statutshort[9] = 'StatusSupplierOrderRefusedShort'; $this->statutshort[9] = 'StatusSupplierOrderRefusedShort';
} }
$billedtext=''; $statustrans = array(
//if ($statut==5 && $this->billed == 1) $statut = 8; 0 => 'status0',
if ($billed == 1) $billedtext=$langs->trans("Billed"); 1 => 'status1',
2 => 'status3',
3 => 'status3',
4 => 'status3',
5 => 'status6',
6 => 'status5',
7 => 'status5',
if ($mode == 0) 9 => 'status5',
{ );
return $langs->trans($this->statuts[$statut]);
$statusClass = 'status0';
if(!empty($statustrans[$status])){
$statusClass = $statustrans[$status];
} }
elseif ($mode == 1)
{ $billedtext = '';
return $langs->trans($this->statutshort[$statut]); if($mode == 4 && $billed){
} $billedtext = ' - '.$langs->trans("Billed");
elseif ($mode == 2)
{
return $langs->trans($this->statuts[$statut]);
}
elseif ($mode == 3)
{
if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]), 'statut0');
elseif ($statut==1) return img_picto($langs->trans($this->statuts[$statut]), 'statut1');
elseif ($statut==2) return img_picto($langs->trans($this->statuts[$statut]), 'statut3');
elseif ($statut==3) return img_picto($langs->trans($this->statuts[$statut]), 'statut3');
elseif ($statut==4) return img_picto($langs->trans($this->statuts[$statut]), 'statut3');
elseif ($statut==5) return img_picto($langs->trans($this->statuts[$statut]), 'statut6');
elseif ($statut==6 || $statut==7) return img_picto($langs->trans($this->statuts[$statut]), 'statut5');
elseif ($statut==9) return img_picto($langs->trans($this->statuts[$statut]), 'statut5');
}
elseif ($mode == 4)
{
if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]), 'statut0').' '.$langs->trans($this->statuts[$statut]).($billedtext?' - '.$billedtext:'');
elseif ($statut==1) return img_picto($langs->trans($this->statuts[$statut]), 'statut1').' '.$langs->trans($this->statuts[$statut]).($billedtext?' - '.$billedtext:'');
elseif ($statut==2) return img_picto($langs->trans($this->statuts[$statut]), 'statut3').' '.$langs->trans($this->statuts[$statut]).($billedtext?' - '.$billedtext:'');
elseif ($statut==3) return img_picto($langs->trans($this->statuts[$statut]), 'statut3').' '.$langs->trans($this->statuts[$statut]).($billedtext?' - '.$billedtext:'');
elseif ($statut==4) return img_picto($langs->trans($this->statuts[$statut]), 'statut3').' '.$langs->trans($this->statuts[$statut]).($billedtext?' - '.$billedtext:'');
elseif ($statut==5) return img_picto($langs->trans($this->statuts[$statut]), 'statut6').' '.$langs->trans($this->statuts[$statut]).($billedtext?' - '.$billedtext:'');
elseif ($statut==6 || $statut==7) return img_picto($langs->trans($this->statuts[$statut]), 'statut5').' '.$langs->trans($this->statuts[$statut]).($billedtext?' - '.$billedtext:'');
elseif ($statut==9) return img_picto($langs->trans($this->statuts[$statut]), 'statut5').' '.$langs->trans($this->statuts[$statut]).($billedtext?' - '.$billedtext:'');
}
elseif ($mode == 5)
{
if ($statut==0) return '<span class="hideonsmartphone">'.$langs->trans($this->statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]), 'statut0');
elseif ($statut==1) return '<span class="hideonsmartphone">'.$langs->trans($this->statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]), 'statut1');
elseif ($statut==2) return '<span class="hideonsmartphone">'.$langs->trans($this->statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]), 'statut3');
elseif ($statut==3) return '<span class="hideonsmartphone">'.$langs->trans($this->statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]), 'statut3');
elseif ($statut==4) return '<span class="hideonsmartphone">'.$langs->trans($this->statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]), 'statut3');
elseif ($statut==5) return '<span class="hideonsmartphone">'.$langs->trans($this->statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]), 'statut6');
elseif ($statut==6 || $statut==7) return '<span class="hideonsmartphone">'.$langs->trans($this->statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]), 'statut5');
elseif ($statut==9) return '<span class="hideonsmartphone">'.$langs->trans($this->statutshort[$statut]).' </span>'.img_picto($langs->trans($this->statuts[$statut]), 'statut5');
} }
$statusLong = $langs->trans($this->statuts_long[$status]).$billedtext;
$statusShort = $langs->trans($this->statutshort[$status]);
return dolGetStatus($statusLong, $statusShort, '', $statusClass, $mode);
} }

49
htdocs/projet/class/project.class.php
View File

@ -942,48 +942,27 @@ class Project extends CommonObject
/** /**
* Renvoi status label for a status * Renvoi status label for a status
* *
* @param int $statut id statut * @param int $status id status
* @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto * @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
* @return string Label * @return string Label
*/ */
public function LibStatut($statut, $mode = 0) public function LibStatut($status, $mode = 0)
{ {
// phpcs:enable // phpcs:enable
global $langs; global $langs;
if ($mode == 0) { $statustrans = array(
return $langs->trans($this->statuts_long[$statut]); 0 => 'status0',
} elseif ($mode == 1) { 1 => 'status4',
return $langs->trans($this->statuts_short[$statut]); 2 => 'status6',
} elseif ($mode == 2) { );
if ($statut == 0)
return img_picto($langs->trans($this->statuts_long[$statut]), 'statut0') . ' ' . $langs->trans($this->statuts_short[$statut]); $statusClass = 'status0';
elseif ($statut == 1) if(!empty($statustrans[$status])){
return img_picto($langs->trans($this->statuts_long[$statut]), 'statut4') . ' ' . $langs->trans($this->statuts_short[$statut]); $statusClass = $statustrans[$status];
elseif ($statut == 2)
return img_picto($langs->trans($this->statuts_long[$statut]), 'statut6') . ' ' . $langs->trans($this->statuts_short[$statut]);
} elseif ($mode == 3) {
if ($statut == 0)
return img_picto($langs->trans($this->statuts_long[$statut]), 'statut0');
elseif ($statut == 1)
return img_picto($langs->trans($this->statuts_long[$statut]), 'statut4');
elseif ($statut == 2)
return img_picto($langs->trans($this->statuts_long[$statut]), 'statut6');
} elseif ($mode == 4) {
if ($statut == 0)
return img_picto($langs->trans($this->statuts_long[$statut]), 'statut0') . ' ' . $langs->trans($this->statuts_long[$statut]);
elseif ($statut == 1)
return img_picto($langs->trans($this->statuts_long[$statut]), 'statut4') . ' ' . $langs->trans($this->statuts_long[$statut]);
if ($statut == 2)
return img_picto($langs->trans($this->statuts_long[$statut]), 'statut6') . ' ' . $langs->trans($this->statuts_long[$statut]);
} elseif ($mode == 5) {
if ($statut == 0)
return $langs->trans($this->statuts_short[$statut]) . ' ' . img_picto($langs->trans($this->statuts_long[$statut]), 'statut0');
elseif ($statut == 1)
return $langs->trans($this->statuts_short[$statut]) . ' ' . img_picto($langs->trans($this->statuts_long[$statut]), 'statut4');
elseif ($statut == 2)
return $langs->trans($this->statuts_short[$statut]) . ' ' . img_picto($langs->trans($this->statuts_long[$statut]), 'statut6');
} }
return dolGetStatus($langs->trans($this->statuts_long[$status]), $langs->trans($this->statuts_short[$status]), '', $statusClass, $mode);
} }
/** /**