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

Fix: mise en page

Browse Source
This commit is contained in:
Regis Houssin 2006-04-24 16:33:54 +00:00
parent 46752dd38d
commit 05fa07bc4d
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/comm/addpropal.php
View File

@ -162,7 +162,7 @@ if ($_GET["action"] == 'create')
if ($conf->global->PROPAL_ADD_SHIPPING_DATE) if ($conf->global->PROPAL_ADD_SHIPPING_DATE)
{ {
print '<tr><td>'.$langs->trans("DateDelivery").'</td>'; print '<tr><td>'.$langs->trans("DateDelivery").'</td>';
print '<td>'; print '<td colspan="2">';
if ($conf->global->DATE_LIVRAISON_WEEK_DELAY != "") if ($conf->global->DATE_LIVRAISON_WEEK_DELAY != "")
{ {
$tmpdte = time() + ((7 * $conf->global->DATE_LIVRAISON_WEEK_DELAY) * 24 * 60 * 60); $tmpdte = time() + ((7 * $conf->global->DATE_LIVRAISON_WEEK_DELAY) * 24 * 60 * 60);
@ -181,7 +181,8 @@ if ($_GET["action"] == 'create')
// Adresse de livraison // Adresse de livraison
if ($conf->global->PROPAL_ADD_DELIVERY_ADDRESS) if ($conf->global->PROPAL_ADD_DELIVERY_ADDRESS)
{ {
print '<tr><td>'.$langs->trans('DeliveryAddress').'</td><td>'; print '<tr><td>'.$langs->trans('DeliveryAddress').'</td>';
print '<td colspan="3">';
$numaddress = $html->select_adresse_livraison($soc->adresse_livraison_id, $_GET['socidp'],'adresse_livraison_id'); $numaddress = $html->select_adresse_livraison($soc->adresse_livraison_id, $_GET['socidp'],'adresse_livraison_id');
if ($numaddress==0) if ($numaddress==0)
{ {

1
htdocs/comm/propal.php
View File

@ -589,6 +589,7 @@ if ($_GET['propalid'] > 0)
if ($conf->projet->enabled) $rowspan++; if ($conf->projet->enabled) $rowspan++;
if ($conf->global->PROPAL_ADD_SHIPPING_DATE) $rowspan++; if ($conf->global->PROPAL_ADD_SHIPPING_DATE) $rowspan++;
if ($conf->global->PROPAL_ADD_DELIVERY_ADDRESS) $rowspan++;
// Notes // Notes
print '<td valign="top" colspan="2" width="50%" rowspan="'.$rowspan.'">'.$langs->trans('NotePublic').' :<br>'. nl2br($propal->note_public).'</td>'; print '<td valign="top" colspan="2" width="50%" rowspan="'.$rowspan.'">'.$langs->trans('NotePublic').' :<br>'. nl2br($propal->note_public).'</td>';