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

Fix: Problme alignement tableau

Browse Source
This commit is contained in:
Laurent Destailleur 2005-07-18 21:23:55 +00:00
parent f42d246491
commit 23b833a26e
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
htdocs/comm/propal.php
View File

@ -460,39 +460,48 @@ if ($_GET['propalid'])
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';
// Receiver // Destinataire
$langs->load('mails'); $langs->load('mails');
print '<tr>'; print '<tr>';
print '<td>'.$langs->trans('MailTo').'</td>'; print '<td>'.$langs->trans('MailTo').'</td>';
print '<td colspan="3">';
$dests=$societe->contact_array($societe->id); $dests=$societe->contact_array($societe->id);
$numdest = count($dests); $numdest = count($dests);
if ($numdest==0) if ($numdest==0)
{ {
print '<td colspan="3">';
print '<font class="error">Cette societe n\'a pas de contact, veuillez en créer un avant de faire votre proposition commerciale</font><br>'; print '<font class="error">Cette societe n\'a pas de contact, veuillez en créer un avant de faire votre proposition commerciale</font><br>';
print '<a href="'.DOL_URL_ROOT.'/contact/fiche.php?socid='.$societe->id.'&amp;action=create&amp;backtoreferer=1">'.$langs->trans('AddContact').'</a>'; print '<a href="'.DOL_URL_ROOT.'/contact/fiche.php?socid='.$societe->id.'&amp;action=create&amp;backtoreferer=1">'.$langs->trans('AddContact').'</a>';
print '</td>';
} }
else else
{ {
if ($propal->statut == 0 && $user->rights->propale->creer) if ($propal->statut == 0 && $user->rights->propale->creer)
{ {
print '<td colspan="2">';
print '<form action="propal.php?propalid='.$propal->id.'" method="post">'; print '<form action="propal.php?propalid='.$propal->id.'" method="post">';
print '<input type="hidden" name="action" value="set_contact">'; print '<input type="hidden" name="action" value="set_contact">';
$form->select_contacts($societe->id, $propal->contactid, 'contactidp'); $form->select_contacts($societe->id, $propal->contactid, 'contactidp');
print '</td><td>';
print '<input type="submit" value="'.$langs->trans('Modify').'">'; print '<input type="submit" value="'.$langs->trans('Modify').'">';
print '</form>'; print '</form>';
print '</td>';
} }
else else
{ {
if (!empty($propal->contactid)) if (!empty($propal->contactid))
{ {
print '<td colspan="3">';
require_once(DOL_DOCUMENT_ROOT.'/contact.class.php'); require_once(DOL_DOCUMENT_ROOT.'/contact.class.php');
$contact=new Contact($db); $contact=new Contact($db);
$contact->fetch($propal->contactid); $contact->fetch($propal->contactid);
print '<a href="'.DOL_URL_ROOT.'/contact/fiche.php?id='.$propal->contactid.'" title="'.$langs->trans('ShowContact').'">'; print '<a href="'.DOL_URL_ROOT.'/contact/fiche.php?id='.$propal->contactid.'" title="'.$langs->trans('ShowContact').'">';
print $contact->firstname.' '.$contact->name; print $contact->firstname.' '.$contact->name;
print '</a>'; print '</a>';
print '</td>';
}
else {
print '<td colspan="3">&nbsp;</td>';
} }
} }
} }
@ -508,9 +517,9 @@ if ($_GET['propalid'])
print '<tr><td>'.$langs->trans('Project').'</td>'; print '<tr><td>'.$langs->trans('Project').'</td>';
$langs->load('projects'); $langs->load('projects');
$numprojet = $societe->has_projects(); $numprojet = $societe->has_projects();
print '<td colspan="2">';
if (! $numprojet) if (! $numprojet)
{ {
print '<td colspan="2">';
print $langs->trans("NoProject").'</td><td>'; print $langs->trans("NoProject").'</td><td>';
print '<a href=../projet/fiche.php?socidp='.$societe->id.'&action=create>'.$langs->trans('AddProject').'</a>'; print '<a href=../projet/fiche.php?socidp='.$societe->id.'&action=create>'.$langs->trans('AddProject').'</a>';
print '</td>'; print '</td>';
@ -519,10 +528,11 @@ if ($_GET['propalid'])
{ {
if ($propal->statut == 0 && $user->rights->propale->creer) if ($propal->statut == 0 && $user->rights->propale->creer)
{ {
print '<td colspan="3">'; print '<td colspan="2">';
print '<form action="propal.php?propalid='.$propal->id.'" method="post">'; print '<form action="propal.php?propalid='.$propal->id.'" method="post">';
print '<input type="hidden" name="action" value="set_project">'; print '<input type="hidden" name="action" value="set_project">';
$form->select_projects($societe->id, $propal->projetidp, 'projetidp'); $form->select_projects($societe->id, $propal->projetidp, 'projetidp');
print '</td><td>';
print '<input type="submit" value="'.$langs->trans('Modify').'">'; print '<input type="submit" value="'.$langs->trans('Modify').'">';
print '</form>'; print '</form>';
print '</td>'; print '</td>';
@ -683,7 +693,7 @@ if ($_GET['propalid'])
} }
print '</tr>'; print '</tr>';
} }
// Update ligne de facture // Update ligne de propal
// \todo // \todo