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

Fix missing info admin picto. Fix colspan.

Browse Source
This commit is contained in:
Laurent Destailleur 2017-01-23 10:23:24 +01:00
parent daf40ed573
commit 7622d3b2fb
2 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
htdocs/comm/card.php
View File

@ -484,24 +484,28 @@ if ($id > 0)
print '</tr></table>'; print '</tr></table>';
print '</td><td>'; print '</td><td>';
if ($action == 'editlevel') if ($action == 'editlevel')
{
$formcompany->form_prospect_level($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->fk_prospectlevel,'prospect_level_id',1); $formcompany->form_prospect_level($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->fk_prospectlevel,'prospect_level_id',1);
else }
print $object->getLibProspLevel(); else
print "</td>"; {
print '</tr>'; print $object->getLibProspLevel();
}
// Status print "</td>";
$object->loadCacheOfProspStatus(); print '</tr>';
print '<tr><td>'.$langs->trans("StatusProsp").'</td><td colspan="3">'.$object->getLibProspCommStatut(4, $object->cacheprospectstatus[$object->stcomm_id]['label']);
print ' &nbsp; &nbsp; '; // Status
print '<div class="floatright">'; $object->loadCacheOfProspStatus();
foreach($object->cacheprospectstatus as $key => $val) print '<tr><td>'.$langs->trans("StatusProsp").'</td><td>'.$object->getLibProspCommStatut(4, $object->cacheprospectstatus[$object->stcomm_id]['label']);
{ print ' &nbsp; &nbsp; ';
$titlealt='default'; print '<div class="floatright">';
if (! empty($val['code']) && ! in_array($val['code'], array('ST_NO', 'ST_NEVER', 'ST_TODO', 'ST_PEND', 'ST_DONE'))) $titlealt=$val['label']; foreach($object->cacheprospectstatus as $key => $val)
if ($object->stcomm_id != $val['id']) print '<a class="pictosubstatus" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&stcomm='.$val['code'].'&action=setstcomm">'.img_action($titlealt,$val['code']).'</a>'; {
} $titlealt='default';
print '</div></td></tr>'; if (! empty($val['code']) && ! in_array($val['code'], array('ST_NO', 'ST_NEVER', 'ST_TODO', 'ST_PEND', 'ST_DONE'))) $titlealt=$val['label'];
if ($object->stcomm_id != $val['id']) print '<a class="pictosubstatus" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&stcomm='.$val['code'].'&action=setstcomm">'.img_action($titlealt,$val['code']).'</a>';
}
print '</div></td></tr>';
print "</table>"; print "</table>";
} }

4
htdocs/core/class/html.formcompany.class.php
View File

@ -138,7 +138,7 @@ class FormCompany
*/ */
function form_prospect_level($page, $selected='', $htmlname='prospect_level_id', $empty=0) function form_prospect_level($page, $selected='', $htmlname='prospect_level_id', $empty=0)
{ {
global $langs; global $user, $langs;
print '<form method="post" action="'.$page.'">'; print '<form method="post" action="'.$page.'">';
print '<input type="hidden" name="action" value="setprospectlevel">'; print '<input type="hidden" name="action" value="setprospectlevel">';
@ -171,7 +171,7 @@ class FormCompany
print Form::selectarray($htmlname, $options, $selected); print Form::selectarray($htmlname, $options, $selected);
} }
else dol_print_error($this->db); else dol_print_error($this->db);
if (! empty($htmlname) && $user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">'; print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
print '</form>'; print '</form>';
} }