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

Fix: Pb alignement tableau si module porjet dsactiv

Browse Source
This commit is contained in:
Laurent Destailleur 2005-07-14 23:52:56 +00:00
parent 52d7b41494
commit 7d6a0a5116
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/comm/propal.php
View File

@ -28,7 +28,7 @@
\brief Page liste des propales (vision commercial) \brief Page liste des propales (vision commercial)
*/ */
require('./pre.inc.php'); require("./pre.inc.php");
$langs->load('companies'); $langs->load('companies');
$langs->load('propal'); $langs->load('propal');
@ -47,9 +47,7 @@ require_once('../propal.class.php');
require_once('../actioncomm.class.php'); require_once('../actioncomm.class.php');
require_once(DOL_DOCUMENT_ROOT.'/lib/CMailFile.class.php'); require_once(DOL_DOCUMENT_ROOT.'/lib/CMailFile.class.php');
/* // Sécurité accés client
* Sécurité accés client
*/
if ($user->societe_id > 0) if ($user->societe_id > 0)
{ {
$action = ''; $action = '';
@ -433,7 +431,7 @@ if ($_GET['propalid'])
$societe->fetch($obj->idp); $societe->fetch($obj->idp);
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
$rowspan=7; $rowspan=6;
print '<tr><td>'.$langs->trans('Company').'</td><td colspan="3">'; print '<tr><td>'.$langs->trans('Company').'</td><td colspan="3">';
if ($societe->client == 1) if ($societe->client == 1)
{ {
@ -501,14 +499,14 @@ if ($_GET['propalid'])
} }
print '</td>'; print '</td>';
if ($conf->projet->enabled && $propal->projetidp) if ($conf->projet->enabled)
$rowspan++; $rowspan++;
print '<td valign="top" colspan="2" width="50%" rowspan="'.$rowspan.'">'.$langs->trans('Note').' :<br>'. nl2br($propal->note).'</td></tr>'; print '<td valign="top" colspan="2" width="50%" rowspan="'.$rowspan.'">'.$langs->trans('Note').' :<br>'. nl2br($propal->note).'</td></tr>';
print '<tr><td>'.$langs->trans('Project').'</td>';
if ($conf->projet->enabled) if ($conf->projet->enabled)
{ {
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">'; print '<td colspan="2">';
@ -547,8 +545,8 @@ if ($_GET['propalid'])
} }
} }
} }
}
print '</tr>'; print '</tr>';
}
print '<tr><td height="10" nowrap>'.$langs->trans('GlobalDiscount').'</td>'; print '<tr><td height="10" nowrap>'.$langs->trans('GlobalDiscount').'</td>';
if ($propal->brouillon == 1 && $user->rights->propale->creer) if ($propal->brouillon == 1 && $user->rights->propale->creer)
@ -563,7 +561,7 @@ if ($_GET['propalid'])
} }
else else
{ {
print '<td colspan="3">'.$propal->remise_percent.' %</td>'; print '<td colspan="3">'.$propal->remise_percent.'%</td>';
} }
print '</tr>'; print '</tr>';

10
htdocs/compta/propal.php
View File

@ -34,9 +34,9 @@ $user->getrights('propale');
if (!$user->rights->propale->lire) if (!$user->rights->propale->lire)
accessforbidden(); accessforbidden();
if ($conf->projet->enabled) require_once '../project.class.php';
if ($conf->commande->enabled) require_once '../commande/commande.class.php'; if ($conf->commande->enabled) require_once '../commande/commande.class.php';
require_once(DOL_DOCUMENT_ROOT."/lib/CMailFile.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/CMailFile.class.php");
require_once("../project.class.php");
require_once("../propal.class.php"); require_once("../propal.class.php");
//require_once("../actioncomm.class.php"); //require_once("../actioncomm.class.php");
@ -141,7 +141,7 @@ if ($_GET["propalid"])
$societe->fetch($obj->idp); $societe->fetch($obj->idp);
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
$rowspan=7; $rowspan=6;
print '<tr><td>'.$langs->trans('Company').'</td><td colspan="3">'; print '<tr><td>'.$langs->trans('Company').'</td><td colspan="3">';
if ($societe->client == 1) if ($societe->client == 1)
{ {
@ -209,14 +209,14 @@ if ($_GET["propalid"])
} }
print '</td>'; print '</td>';
if ($conf->projet->enabled && $propal->projetidp) if ($conf->projet->enabled)
$rowspan++; $rowspan++;
print '<td valign="top" colspan="2" width="50%" rowspan="'.$rowspan.'">'.$langs->trans('Note').' :<br>'. nl2br($propal->note).'</td></tr>'; print '<td valign="top" colspan="2" width="50%" rowspan="'.$rowspan.'">'.$langs->trans('Note').' :<br>'. nl2br($propal->note).'</td></tr>';
print '<tr><td>'.$langs->trans('Project').'</td>';
if ($conf->projet->enabled) if ($conf->projet->enabled)
{ {
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">'; print '<td colspan="2">';
@ -255,8 +255,8 @@ if ($_GET["propalid"])
} }
} }
} }
}
print '</tr>'; print '</tr>';
}
print '<tr><td height="10" nowrap>'.$langs->trans('GlobalDiscount').'</td>'; print '<tr><td height="10" nowrap>'.$langs->trans('GlobalDiscount').'</td>';
if ($propal->brouillon == 1 && $user->rights->propale->creer) if ($propal->brouillon == 1 && $user->rights->propale->creer)