Uniformize code to prepare mass update

This commit is contained in:
Laurent Destailleur 2014-02-27 10:37:23 +01:00
parent d4d69e41b1
commit f7fe25e408
7 changed files with 8 additions and 8 deletions

View File

@ -115,7 +115,7 @@ dol_htmloutput_errors($this->control->tpl['error'],$this->control->tpl['errors']
<?php echo $this->control->tpl['showend']; ?>
<?php if (! $user->societe_id) { ?>
<?php if (empty($user->societe_id)) { ?>
<div class="tabsAction">
<?php if ($user->rights->adherent->creer) { ?>

View File

@ -1487,7 +1487,7 @@ if ($action == 'create' && $user->rights->commande->creer) {
print '</td></tr>';
// Note privee
if (! $user->societe_id) {
if (empty($user->societe_id)) {
print '<tr>';
print '<td class="border" valign="top">' . $langs->trans('NotePrivate') . '</td>';
print '<td valign="top" colspan="2">';

View File

@ -468,7 +468,7 @@ if ($action == 'create' && empty($mesgs))
print '</textarea></td></tr>';
// Private note
if (! $user->societe_id)
if (empty($user->societe_id))
{
print '<tr>';
print '<td class="border" valign="top">'.$langs->trans('NotePrivate').'</td>';

View File

@ -301,7 +301,7 @@ if ($action == 'create')
print '</td></tr>';
// Private note
if (! $user->societe_id)
if (empty($user->societe_id))
{
print '<tr>';
print '<td class="border" valign="top">'.$langs->trans('NotePrivate').'</td>';
@ -397,7 +397,7 @@ else if ($id)
print "</td></tr>";
// Private note
if (! $user->societe_id)
if (empty($user->societe_id))
{
print '<tr><td valign="top">'.$langs->trans("NotePrivate").'</td>';
print '<td valign="top" colspan="3">';

View File

@ -134,7 +134,7 @@ dol_htmloutput_errors($this->control->tpl['error'],$this->control->tpl['errors']
<?php echo $this->control->tpl['showend']; ?>
<?php if (! $user->societe_id) { ?>
<?php if (empty($user->societe_id)) { ?>
<div class="tabsAction">
<?php if ($user->rights->societe->contact->creer) { ?>

View File

@ -882,7 +882,7 @@ if ($action == 'create')
print $doleditor->Create(1);
if (! $user->societe_id)
if (empty($user->societe_id))
{
print '<tr><td>'.$langs->trans("NotePrivate").'</td><td valign="top">';
$doleditor=new DolEditor('note_private', $note_private, '', '100', 'dolibarr_notes', 'In', 1, true, true, ROWS_3, 70);

View File

@ -69,7 +69,7 @@ else $typeofdata='textarea:12:100';
<div class="table-key-border-col"<?php echo ' style="width: '.$colwidth.'%"'; ?>><?php echo $form->editfieldkey("NotePublic", $note_public, $value_public, $object, $permission, $typeofdata, $moreparam); ?></div>
<div class="table-val-border-col"><?php echo $form->editfieldval("NotePublic", $note_public, $value_public, $object, $permission, $typeofdata, '', null, null, $moreparam); ?></div>
</div>
<?php if (! $user->societe_id) { ?>
<?php if (empty($user->societe_id)) { ?>
<div class="table-border-row">
<div class="table-key-border-col"<?php echo ' style="width: '.$colwidth.'%"'; ?>><?php echo $form->editfieldkey("NotePrivate", $note_private, $value_private, $object, $permission, $typeofdata, $moreparam); ?></div>
<div class="table-val-border-col"><?php echo $form->editfieldval("NotePrivate", $note_private, $value_private, $object, $permission, $typeofdata, '', null, null, $moreparam); ?></div>