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

Merge branch 'develop' of https://github.com/FHenry/dolibarr into

Browse Source 
FHenry-develop

Conflicts:
	htdocs/core/class/extrafields.class.php
This commit is contained in:
Laurent Destailleur 2013-11-05 19:53:49 +01:00
commit addedb6f15
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/contact/class/contact.class.php
View File

@ -953,24 +953,24 @@ class Contact extends CommonObject
} }
elseif ($mode == 2) elseif ($mode == 2)
{ {
if ($statut==0) return img_picto($langs->trans('Disabled'),'statut1').' '.$langs->trans('Disabled'); if ($statut==0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
elseif ($statut==1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled'); elseif ($statut==1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
} }
elseif ($mode == 3) elseif ($mode == 3)
{ {
if ($statut==0) return img_picto($langs->trans('Disabled'),'statut1'); if ($statut==0) return img_picto($langs->trans('Disabled'),'statut5');
elseif ($statut==1) return img_picto($langs->trans('Enabled'),'statut4'); elseif ($statut==1) return img_picto($langs->trans('Enabled'),'statut4');
} }
elseif ($mode == 4) elseif ($mode == 4)
{ {
if ($statut==0) return img_picto($langs->trans('Disabled'),'statut1').' '.$langs->trans('StatusContactDraft'); if ($statut==0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('StatusContactDraft');
elseif ($statut==1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled'); elseif ($statut==1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
} }
elseif ($mode == 5) elseif ($mode == 5)
{ {
if ($statut==0) return '<span class="hideonsmartphone">'.$langs->trans('Disabled').' </span>'.img_picto($langs->trans('Disabled'),'statut1'); if ($statut==0) return '<span class="hideonsmartphone">'.$langs->trans('Disabled').' </span>'.img_picto($langs->trans('Disabled'),'statut5');
elseif ($statut==1) return '<span class="hideonsmartphone">'.$langs->trans('Enabled').' </span>'.img_picto($langs->trans('Enabled'),'statut4'); elseif ($statut==1) return '<span class="hideonsmartphone">'.$langs->trans('Enabled').' </span>'.img_picto($langs->trans('Enabled'),'statut4');
} }

3
htdocs/core/class/extrafields.class.php
View File

@ -702,7 +702,8 @@ class ExtraFields
} }
if (count($InfoFieldList) > 4 && ! empty($InfoFieldList[4])) if (count($InfoFieldList) > 4 && ! empty($InfoFieldList[4]))
{ {
if (strpos($InfoFieldList[4], 'extra')!==false) { if (strpos($InfoFieldList[4], 'extra.') !== false)
{
$keyList='main.'.$InfoFieldList[2].' as rowid'; $keyList='main.'.$InfoFieldList[2].' as rowid';
} else { } else {
$keyList=$InfoFieldList[2].' as rowid'; $keyList=$InfoFieldList[2].' as rowid';