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

Look: Modif esthtique mineure

Browse Source
This commit is contained in:
Laurent Destailleur 2006-03-26 14:56:21 +00:00
parent a4806eddeb
commit f590cda386
3 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/comm/index.php
View File

@ -157,7 +157,8 @@ if ($conf->propal->enabled && $user->rights->propale->lire)
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'><td nowrap>'."<a href=\"".DOL_URL_ROOT."/comm/propal.php?propalid=".$obj->rowid."\">".img_object($langs->trans("ShowPropal"),"propal")." ".$obj->ref.'</a></td>'; print '<tr '.$bc[$var].'><td nowrap>'."<a href=\"".DOL_URL_ROOT."/comm/propal.php?propalid=".$obj->rowid."\">".img_object($langs->trans("ShowPropal"),"propal")." ".$obj->ref.'</a></td>';
print '<td><a href="fiche.php?socid='.$obj->idp.'">'.dolibarr_trunc($obj->nom,18).'</a></td><td align="right">'.price($obj->price).'</td></tr>'; print '<td><a href="fiche.php?socid='.$obj->idp.'">'.dolibarr_trunc($obj->nom,18).'</a></td>';
print '<td align="right" nowrap="nowrap">'.price($obj->price).'</td></tr>';
$i++; $i++;
$total += $obj->price; $total += $obj->price;
} }

30
htdocs/comm/propal.php
View File

@ -489,14 +489,14 @@ if ($_GET['propalid'] > 0)
* Fiche propal * Fiche propal
* *
*/ */
$sql = 'SELECT s.nom, s.idp, p.price, p.fk_projet, p.remise, p.tva, p.total, p.ref, p.fk_statut, p.fk_cond_reglement, p.fk_mode_reglement, '.$db->pdate('p.datep').' as dp, p.note,'; $sql = 'SELECT s.nom, s.idp, p.price, p.fk_projet, p.remise, p.tva, p.total, p.ref, p.fk_statut, p.fk_cond_reglement, p.fk_mode_reglement, '.$db->pdate('p.datep').' as dp, p.note,';
$sql.= ' x.firstname, x.name, x.fax, x.phone, x.email, p.fk_user_author, p.fk_user_valid, p.fk_user_cloture, p.datec, p.date_valid, p.date_cloture'; $sql.= ' x.firstname, x.name, x.fax, x.phone, x.email, p.fk_user_author, p.fk_user_valid, p.fk_user_cloture, p.datec, p.date_valid, p.date_cloture';
$sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s, '.MAIN_DB_PREFIX.'propal as p, '.MAIN_DB_PREFIX.'socpeople as x'; $sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s, '.MAIN_DB_PREFIX.'propal as p, '.MAIN_DB_PREFIX.'socpeople as x';
$sql.= ' WHERE p.fk_soc = s.idp AND p.fk_soc_contact = x.idp AND p.rowid = '.$propal->id; $sql.= ' WHERE p.fk_soc = s.idp AND p.fk_soc_contact = x.idp AND p.rowid = '.$propal->id;
if ($socidp) $sql .= ' AND s.idp = '.$socidp; if ($socidp) $sql .= ' AND s.idp = '.$socidp;
$resql = $db->query($sql); $resql = $db->query($sql);
if ($resql) if ($resql)
{ {
if ($db->num_rows($resql)) if ($db->num_rows($resql))
{ {
@ -967,20 +967,20 @@ if ($_GET['propalid'] > 0)
} }
print '</table>'; print '</table>';
} }
} }
else else
{ {
dolibarr_print_error($db); dolibarr_print_error($db);
} }
print '</div>'; print '</div>';
print "\n";
/* /*
* Formulaire cloture (signé ou non) * Formulaire cloture (signé ou non)
*/ */
if ($_GET['action'] == 'statut') if ($_GET['action'] == 'statut')
{ {
print '<form action="propal.php?propalid='.$propal->id.'" method="post">'; print '<form action="propal.php?propalid='.$propal->id.'" method="post">';
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';

2
htdocs/theme/eldy/eldy.css.php
View File

@ -375,7 +375,7 @@ div.tabBar {
padding-left: 12px; padding-left: 12px;
padding-right: 12px; padding-right: 12px;
padding-bottom: 12px; padding-bottom: 12px;
margin: 0px 0px 50px 0px; margin: 0px 0px 10px 0px;
-moz-border-radius-topleft:6px; -moz-border-radius-topleft:6px;
-moz-border-radius-topright:6px; -moz-border-radius-topright:6px;
-moz-border-radius-bottomleft:6px; -moz-border-radius-bottomleft:6px;