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

FIX #9971

Browse Source
This commit is contained in:
Laurent Destailleur 2018-11-08 20:05:01 +01:00
parent 76ac3bd457
commit 9a31a61c9d
4 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/class/html.formprojet.class.php
View File

@ -631,7 +631,7 @@ class FormProjets
$sellist .= '>'; $sellist .= '>';
if ($useshortlabel) if ($useshortlabel)
{ {
$finallabel = ($langs->transnoentitiesnoconv("OppStatusShort".$obj->code) != "OppStatusShort".$obj->code ? $langs->transnoentitiesnoconv("OppStatusShort".$obj->code) : $obj->label); $finallabel = ($langs->transnoentitiesnoconv("OppStatus".$obj->code) != "OppStatus".$obj->code ? $langs->transnoentitiesnoconv("OppStatus".$obj->code) : $obj->label);
} }
else else
{ {

4
htdocs/core/class/translate.class.php
View File

@ -562,10 +562,6 @@ class Translate
elseif (preg_match('/^PaymentTypeShort([0-9A-Z]+)$/i',$key,$reg)) elseif (preg_match('/^PaymentTypeShort([0-9A-Z]+)$/i',$key,$reg))
{ {
$newstr=$this->getLabelFromKey($db,$reg[1],'c_paiement','code','libelle','',1); $newstr=$this->getLabelFromKey($db,$reg[1],'c_paiement','code','libelle','',1);
}
elseif (preg_match('/^OppStatusShort([0-9A-Z]+)$/i',$key,$reg))
{
$newstr=$this->getLabelFromKey($db,$reg[1],'c_lead_status','code','label');
} }
elseif (preg_match('/^OppStatus([0-9A-Z]+)$/i',$key,$reg)) elseif (preg_match('/^OppStatus([0-9A-Z]+)$/i',$key,$reg))
{ {

2
htdocs/core/lib/company.lib.php
View File

@ -802,7 +802,7 @@ function show_projects($conf, $langs, $db, $object, $backtopage='', $nocreatelin
print '</td>'; print '</td>';
// Opp status // Opp status
print '<td align="center">'; print '<td align="center">';
if ($obj->opp_status_code) print $langs->trans("OppStatusShort".$obj->opp_status_code); if ($obj->opp_status_code) print $langs->trans("OppStatus".$obj->opp_status_code);
print '</td>'; print '</td>';
// Opp percent // Opp percent
print '<td align="right">'; print '<td align="right">';

2
htdocs/projet/list.php
View File

@ -804,7 +804,7 @@ while ($i < min($num,$limit))
if (! empty($arrayfields['p.fk_opp_status']['checked'])) if (! empty($arrayfields['p.fk_opp_status']['checked']))
{ {
print '<td class="center">'; print '<td class="center">';
if ($obj->opp_status_code) print $langs->trans("OppStatusShort".$obj->opp_status_code); if ($obj->opp_status_code) print $langs->trans("OppStatus".$obj->opp_status_code);
print '</td>'; print '</td>';
if (! $i) $totalarray['nbfield']++; if (! $i) $totalarray['nbfield']++;
} }