Sec: Les notes privées sont invisibles aux utilisateurs externes

This commit is contained in:
Laurent Destailleur 2006-08-18 22:03:47 +00:00
parent cfb72166c6
commit 870cc75f6e
8 changed files with 104 additions and 80 deletions

View File

@ -171,6 +171,8 @@ if ($_GET['propalid'])
print "</td></tr>"; print "</td></tr>";
// Note privée // Note privée
if (! $user->societe_id)
{
print '<tr><td valign="top">'.$langs->trans("NotePrivate").' :</td>'; print '<tr><td valign="top">'.$langs->trans("NotePrivate").' :</td>';
print '<td valign="top" colspan="3">'; print '<td valign="top" colspan="3">';
if ($_GET["action"] == 'edit') if ($_GET["action"] == 'edit')
@ -186,6 +188,8 @@ if ($_GET['propalid'])
print ($propal->note?nl2br($propal->note):"&nbsp;"); print ($propal->note?nl2br($propal->note):"&nbsp;");
} }
print "</td></tr>"; print "</td></tr>";
}
print "</table>"; print "</table>";
print '</div>'; print '</div>';

View File

@ -148,6 +148,8 @@ if ($_GET["id"])
print "</td></tr>"; print "</td></tr>";
// Note privée // Note privée
if (! $user->societe_id)
{
print '<tr><td valign="top">'.$langs->trans("NotePrivate").' :</td>'; print '<tr><td valign="top">'.$langs->trans("NotePrivate").' :</td>';
print '<td valign="top" colspan="3">'; print '<td valign="top" colspan="3">';
if ($_GET["action"] == 'edit') if ($_GET["action"] == 'edit')
@ -163,6 +165,8 @@ if ($_GET["id"])
print ($commande->note?nl2br($commande->note):"&nbsp;"); print ($commande->note?nl2br($commande->note):"&nbsp;");
} }
print "</td></tr>"; print "</td></tr>";
}
print "</table>"; print "</table>";

View File

@ -1021,6 +1021,8 @@ if ($_GET['action'] == 'create')
print '</textarea></td></tr>'; print '</textarea></td></tr>';
// Note privée // Note privée
if (! $user->societe_id)
{
print '<tr>'; print '<tr>';
print '<td class="border" valign="top">'.$langs->trans('NotePrivate').'</td>'; print '<td class="border" valign="top">'.$langs->trans('NotePrivate').'</td>';
print '<td valign="top" colspan="2">'; print '<td valign="top" colspan="2">';
@ -1038,6 +1040,7 @@ if ($_GET['action'] == 'create')
print $contrat->note; print $contrat->note;
} }
print '</textarea></td></tr>'; print '</textarea></td></tr>';
}
/* /*
\todo \todo

View File

@ -137,6 +137,8 @@ if ($_GET["facid"])
print "</td></tr>"; print "</td></tr>";
// Note privée // Note privée
if (! $user->societe_id)
{
print '<tr><td valign="top">'.$langs->trans("NotePrivate").' :</td>'; print '<tr><td valign="top">'.$langs->trans("NotePrivate").' :</td>';
print '<td valign="top" colspan="3">'; print '<td valign="top" colspan="3">';
if ($_GET["action"] == 'edit') if ($_GET["action"] == 'edit')
@ -152,6 +154,8 @@ if ($_GET["facid"])
print ($fac->note?nl2br($fac->note):"&nbsp;"); print ($fac->note?nl2br($fac->note):"&nbsp;");
} }
print "</td></tr>"; print "</td></tr>";
}
print "</table>"; print "</table>";

View File

@ -419,8 +419,11 @@ if ($_GET["action"] == 'create')
print '<tr><td>'.$langs->trans("NotePublic").'</td><td valign="top">'; print '<tr><td>'.$langs->trans("NotePublic").'</td><td valign="top">';
print '<textarea name="note_public" wrap="soft" cols="70" rows="'.ROWS_3.'"></textarea></td></tr>'; print '<textarea name="note_public" wrap="soft" cols="70" rows="'.ROWS_3.'"></textarea></td></tr>';
if (! $user->societe_id)
{
print '<tr><td>'.$langs->trans("NotePrivate").'</td><td valign="top">'; print '<tr><td>'.$langs->trans("NotePrivate").'</td><td valign="top">';
print '<textarea name="note" wrap="soft" cols="70" rows="'.ROWS_3.'"></textarea></td></tr>'; print '<textarea name="note" wrap="soft" cols="70" rows="'.ROWS_3.'"></textarea></td></tr>';
}
print '<tr><td colspan="2" align="center"><input type="submit" class="button" value="'.$langs->trans("Create").'"></td></tr>'; print '<tr><td colspan="2" align="center"><input type="submit" class="button" value="'.$langs->trans("Create").'"></td></tr>';

View File

@ -169,6 +169,8 @@ if ($_GET["id"])
print "</td></tr>"; print "</td></tr>";
// Note privée // Note privée
if (! $user->societe_id)
{
print '<tr><td valign="top">'.$langs->trans("NotePrivate").' :</td>'; print '<tr><td valign="top">'.$langs->trans("NotePrivate").' :</td>';
print '<td valign="top" colspan="3">'; print '<td valign="top" colspan="3">';
if ($_GET["action"] == 'edit') if ($_GET["action"] == 'edit')
@ -184,6 +186,8 @@ if ($_GET["id"])
print ($contrat->note?nl2br($contrat->note):"&nbsp;"); print ($contrat->note?nl2br($contrat->note):"&nbsp;");
} }
print "</td></tr>"; print "</td></tr>";
}
print "</table>"; print "</table>";

View File

@ -256,7 +256,7 @@ if ($_GET["action"] == 'create')
print '</td></tr>'; print '</td></tr>';
} }
if ($commande->note) if ($commande->note && ! $user->societe_id)
{ {
print '<tr><td colspan="3">'.$langs->trans("NotePrivate").': '.nl2br($commande->note)."</td></tr>"; print '<tr><td colspan="3">'.$langs->trans("NotePrivate").': '.nl2br($commande->note)."</td></tr>";
} }

View File

@ -156,13 +156,15 @@ if ($_GET["id"] > 0)
print '<tr><td>'.$langs->trans("AmountTTC").'</td><td align="right">'.price($commande->total_ttc).'</td>'; print '<tr><td>'.$langs->trans("AmountTTC").'</td><td align="right">'.price($commande->total_ttc).'</td>';
print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td><td>&nbsp;</td></tr>'; print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td><td>&nbsp;</td></tr>';
if (! $user->societe_id)
{
print '<tr><td valign="top">'.$langs->trans("NotePrivate").'</td>'; print '<tr><td valign="top">'.$langs->trans("NotePrivate").'</td>';
print '<td colspan="3">'; print '<td colspan="3">';
if ($user->rights->fournisseur->commande->creer) print '<textarea cols="60" rows="'.ROWS_4.'" name="note">'; if ($user->rights->fournisseur->commande->creer) print '<textarea cols="60" rows="'.ROWS_4.'" name="note">';
print nl2br($commande->note); print nl2br($commande->note);
if ($user->rights->fournisseur->commande->creer) print '</textarea>'; if ($user->rights->fournisseur->commande->creer) print '</textarea>';
print '</td></tr>'; print '</td></tr>';
}
print '<tr><td valign="top">'.$langs->trans("NotePublic").'</td>'; print '<tr><td valign="top">'.$langs->trans("NotePublic").'</td>';
print '<td colspan="3">'; print '<td colspan="3">';