FIX Look and feel v11

This commit is contained in:
Laurent Destailleur 2020-02-08 18:18:41 +01:00
parent 0a912f4e8a
commit c2830f9e79

View File

@ -818,10 +818,7 @@ llxHeader('', $langs->trans("Intervention"));
if ($action == 'create') if ($action == 'create')
{ {
/* // Create new intervention
* Mode creation
* Creation d'une nouvelle fiche d'intervention
*/
$soc = new Societe($db); $soc = new Societe($db);
@ -831,11 +828,12 @@ if ($action == 'create')
if ($socid) $res = $soc->fetch($socid); if ($socid) $res = $soc->fetch($socid);
if (GETPOST('origin') && GETPOST('originid')) if (GETPOST('origin', 'alphanohtml') && GETPOST('originid', 'int'))
{ {
// Parse element/subelement (ex: project_task) // Parse element/subelement (ex: project_task)
$element = $subelement = GETPOST('origin'); $regs = array();
if (preg_match('/^([^_]+)_([^_]+)/i', GETPOST('origin'), $regs)) $element = $subelement = GETPOST('origin', 'alphanohtml');
if (preg_match('/^([^_]+)_([^_]+)/i', GETPOST('origin', 'alphanohtml'), $regs))
{ {
$element = $regs[1]; $element = $regs[1];
$subelement = $regs[2]; $subelement = $regs[2];
@ -843,7 +841,7 @@ if ($action == 'create')
if ($element == 'project') if ($element == 'project')
{ {
$projectid = GETPOST('originid'); $projectid = GETPOST('originid', 'int');
} }
else else
{ {
@ -941,7 +939,7 @@ if ($action == 'create')
$numprojet = $formproject->select_projects($soc->id, $projectid, 'projectid'); $numprojet = $formproject->select_projects($soc->id, $projectid, 'projectid');
if ($numprojet == 0) if ($numprojet == 0)
{ {
print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$soc->id.'&action=create"><span class="valignmiddle text-plus-circle">'.$langs->trans("AddProject").'</span><span class="fa fa-plus-circle valignmiddle"></span></a>'; print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$soc->id.'&action=create"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddProject").'"></span></a>';
} }
print '</td></tr>'; print '</td></tr>';
} }
@ -954,7 +952,7 @@ if ($action == 'create')
$numcontrat = $formcontract->select_contract($soc->id, GETPOST('contratid', 'int'), 'contratid', 0, 1); $numcontrat = $formcontract->select_contract($soc->id, GETPOST('contratid', 'int'), 'contratid', 0, 1);
if ($numcontrat == 0) if ($numcontrat == 0)
{ {
print ' &nbsp; <a href="'.DOL_URL_ROOT.'/contrat/card.php?socid='.$soc->id.'&action=create"><span class="valignmiddle text-plus-circle">'.$langs->trans("AddContract").'</span><span class="fa fa-plus-circle valignmiddle"></span></a>'; print ' &nbsp; <a href="'.DOL_URL_ROOT.'/contrat/card.php?socid='.$soc->id.'&action=create"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddContract").'"></span></a>';
} }
print '</td></tr>'; print '</td></tr>';
} }