Fix: print of a function that already contains the print.
This commit is contained in:
parent
14dfbfc40c
commit
3c6b1f17d1
@ -914,7 +914,7 @@ else
|
|||||||
|
|
||||||
// Login Dolibarr
|
// Login Dolibarr
|
||||||
print '<tr><td>'.$langs->trans("LinkedToDolibarrUser").'</td><td class="valeur">';
|
print '<tr><td>'.$langs->trans("LinkedToDolibarrUser").'</td><td class="valeur">';
|
||||||
print $form->select_users($object->user_id,'userid',1);
|
print $form->select_dolusers($object->user_id,'userid',1);
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|||||||
@ -155,7 +155,7 @@ $filter='s.client in (1,2,3)';
|
|||||||
print $form->select_company($id,'memberid',$filter,1);
|
print $form->select_company($id,'memberid',$filter,1);
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
print '<tr><td>'.$langs->trans("User").'</td><td>';
|
print '<tr><td>'.$langs->trans("User").'</td><td>';
|
||||||
print $form->select_users($userid,'userid',1);
|
print $form->select_dolusers($userid,'userid',1);
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
print '<tr><td align="center" colspan="2"><input type="submit" name="submit" class="button" value="'.$langs->trans("Refresh").'"></td></tr>';
|
print '<tr><td align="center" colspan="2"><input type="submit" name="submit" class="button" value="'.$langs->trans("Refresh").'"></td></tr>';
|
||||||
print '</table>';
|
print '</table>';
|
||||||
|
|||||||
@ -142,7 +142,7 @@ print "</tr>";
|
|||||||
print '<tr class="impair"><td>'.$langs->trans("ResponsibleUser").'</td>';
|
print '<tr class="impair"><td>'.$langs->trans("ResponsibleUser").'</td>';
|
||||||
print '<td align="left">';
|
print '<td align="left">';
|
||||||
print '<input type="hidden" name="nom0" value="PRELEVEMENT_USER">';
|
print '<input type="hidden" name="nom0" value="PRELEVEMENT_USER">';
|
||||||
print $form->select_users($conf->global->PRELEVEMENT_USER,'value0',1);
|
print $form->select_dolusers($conf->global->PRELEVEMENT_USER,'value0',1);
|
||||||
print '</td>';
|
print '</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
|
||||||
|
|||||||
@ -235,7 +235,7 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
|
|||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
// User
|
// User
|
||||||
print '<tr><td align="left">'.$langs->trans("CreatedBy").'</td><td align="left">';
|
print '<tr><td align="left">'.$langs->trans("CreatedBy").'</td><td align="left">';
|
||||||
print $form->select_users($userid,'userid',1);
|
print $form->select_dolusers($userid,'userid',1);
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
// Year
|
// Year
|
||||||
print '<tr><td align="left">'.$langs->trans("Year").'</td><td align="left">';
|
print '<tr><td align="left">'.$langs->trans("Year").'</td><td align="left">';
|
||||||
|
|||||||
@ -257,7 +257,7 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
|
|||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
// User
|
// User
|
||||||
print '<tr><td align="left">'.$langs->trans("CreatedBy").'</td><td align="left">';
|
print '<tr><td align="left">'.$langs->trans("CreatedBy").'</td><td align="left">';
|
||||||
print $form->select_users($userid,'userid',1);
|
print $form->select_dolusers($userid,'userid',1);
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
// Year
|
// Year
|
||||||
print '<tr><td align="left">'.$langs->trans("Year").'</td><td align="left">';
|
print '<tr><td align="left">'.$langs->trans("Year").'</td><td align="left">';
|
||||||
|
|||||||
@ -281,7 +281,7 @@ if ($action == 'create')
|
|||||||
|
|
||||||
print "<tr>";
|
print "<tr>";
|
||||||
print '<td class="fieldrequired">'.$langs->trans("Person").'</td><td>';
|
print '<td class="fieldrequired">'.$langs->trans("Person").'</td><td>';
|
||||||
print $form->select_users(GETPOST('fk_user','int'),'fk_user',1);
|
print $form->select_dolusers(GETPOST('fk_user','int'),'fk_user',1);
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
|
|
||||||
print "<tr>";
|
print "<tr>";
|
||||||
@ -376,7 +376,7 @@ else if ($id)
|
|||||||
// Who
|
// Who
|
||||||
print "<tr>";
|
print "<tr>";
|
||||||
print '<td class="fieldrequired">'.$langs->trans("Person").'</td><td>';
|
print '<td class="fieldrequired">'.$langs->trans("Person").'</td><td>';
|
||||||
print $form->select_users(GETPOST('fk_user','int')?GETPOST('fk_user','int'):$object->fk_user,'fk_user',0);
|
print $form->select_dolusers(GETPOST('fk_user','int')?GETPOST('fk_user','int'):$object->fk_user,'fk_user',0);
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
|
|
||||||
// Date
|
// Date
|
||||||
|
|||||||
@ -220,7 +220,7 @@ print $form->select_company($socid,'socid',$filter,1,1);
|
|||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
// User
|
// User
|
||||||
print '<tr><td>'.$langs->trans("User").'/'.$langs->trans("SalesRepresentative").'</td><td>';
|
print '<tr><td>'.$langs->trans("User").'/'.$langs->trans("SalesRepresentative").'</td><td>';
|
||||||
print $form->select_users($userid,'userid',1);
|
print $form->select_dolusers($userid,'userid',1);
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
// Year
|
// Year
|
||||||
print '<tr><td>'.$langs->trans("Year").'</td><td>';
|
print '<tr><td>'.$langs->trans("Year").'</td><td>';
|
||||||
|
|||||||
@ -235,7 +235,7 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
|
|||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
// User
|
// User
|
||||||
print '<tr><td>'.$langs->trans("CreatedBy").'</td><td>';
|
print '<tr><td>'.$langs->trans("CreatedBy").'</td><td>';
|
||||||
print $form->select_users($userid,'userid',1);
|
print $form->select_dolusers($userid,'userid',1);
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
// Year
|
// Year
|
||||||
print '<tr><td>'.$langs->trans("Year").'</td><td>';
|
print '<tr><td>'.$langs->trans("Year").'</td><td>';
|
||||||
|
|||||||
@ -850,12 +850,12 @@ if ($action == 'create')
|
|||||||
|
|
||||||
// Commercial suivi
|
// Commercial suivi
|
||||||
print '<tr><td width="20%" nowrap><span class="fieldrequired">'.$langs->trans("TypeContact_contrat_internal_SALESREPFOLL").'</span></td><td>';
|
print '<tr><td width="20%" nowrap><span class="fieldrequired">'.$langs->trans("TypeContact_contrat_internal_SALESREPFOLL").'</span></td><td>';
|
||||||
print $form->select_users(GETPOST("commercial_suivi_id")?GETPOST("commercial_suivi_id"):$user->id,'commercial_suivi_id',1,'');
|
print $form->select_dolusers(GETPOST("commercial_suivi_id")?GETPOST("commercial_suivi_id"):$user->id,'commercial_suivi_id',1,'');
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
|
|
||||||
// Commercial signature
|
// Commercial signature
|
||||||
print '<tr><td width="20%" nowrap><span class="fieldrequired">'.$langs->trans("TypeContact_contrat_internal_SALESREPSIGN").'</span></td><td>';
|
print '<tr><td width="20%" nowrap><span class="fieldrequired">'.$langs->trans("TypeContact_contrat_internal_SALESREPSIGN").'</span></td><td>';
|
||||||
print $form->select_users(GETPOST("commercial_signature_id")?GETPOST("commercial_signature_id"):$user->id,'commercial_signature_id',1,'');
|
print $form->select_dolusers(GETPOST("commercial_signature_id")?GETPOST("commercial_signature_id"):$user->id,'commercial_signature_id',1,'');
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
|
|
||||||
print '<tr><td><span class="fieldrequired">'.$langs->trans("Date").'</span></td><td>';
|
print '<tr><td><span class="fieldrequired">'.$langs->trans("Date").'</span></td><td>';
|
||||||
|
|||||||
@ -133,7 +133,7 @@ if($cp_events == 1)
|
|||||||
print $langs->trans('MotifCP').' : ';
|
print $langs->trans('MotifCP').' : ';
|
||||||
print $holiday->selectEventCP();
|
print $holiday->selectEventCP();
|
||||||
print ' '.$langs->trans('UserCP').' : ';
|
print ' '.$langs->trans('UserCP').' : ';
|
||||||
print $form->select_users('',"userCP",1,"",0,'');
|
print $form->select_dolusers('',"userCP",1,"",0,'');
|
||||||
print ' <input type="submit" value="'.$langs->trans("addEventToUserCP").'" name="bouton" class="button"/>';
|
print ' <input type="submit" value="'.$langs->trans("addEventToUserCP").'" name="bouton" class="button"/>';
|
||||||
|
|
||||||
print '</form><br>';
|
print '</form><br>';
|
||||||
|
|||||||
@ -279,7 +279,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->socie
|
|||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
|
|
||||||
print '<tr><td>'.$langs->trans("AffectedTo").'</td><td>';
|
print '<tr><td>'.$langs->trans("AffectedTo").'</td><td>';
|
||||||
print $form->select_users($user->id,'userid',1);
|
print $form->select_dolusers($user->id,'userid',1);
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
|
|
||||||
// Date start
|
// Date start
|
||||||
|
|||||||
@ -318,7 +318,7 @@ if ($id > 0 || ! empty($ref))
|
|||||||
print '<td class="nowrap">';
|
print '<td class="nowrap">';
|
||||||
$contactoftask=$object->getListContactId('internal');
|
$contactoftask=$object->getListContactId('internal');
|
||||||
print img_object('','user');
|
print img_object('','user');
|
||||||
print $form->select_users($_POST["userid"]?$_POST["userid"]:$user->id,'userid',0,'',0,'',$contactoftask);
|
print $form->select_dolusers($_POST["userid"]?$_POST["userid"]:$user->id,'userid',0,'',0,'',$contactoftask);
|
||||||
print '</td>';
|
print '</td>';
|
||||||
|
|
||||||
// Note
|
// Note
|
||||||
@ -407,7 +407,7 @@ if ($id > 0 || ! empty($ref))
|
|||||||
print '<td>';
|
print '<td>';
|
||||||
if ($_GET['action'] == 'editline' && $_GET['lineid'] == $task_time->rowid)
|
if ($_GET['action'] == 'editline' && $_GET['lineid'] == $task_time->rowid)
|
||||||
{
|
{
|
||||||
print $form->select_users($task_time->fk_user,'userid_line');
|
print $form->select_dolusers($task_time->fk_user,'userid_line');
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user