*** empty log message ***

This commit is contained in:
Rodolphe Quiedeville 2002-12-19 23:17:19 +00:00
parent 5f5719d768
commit cf825325ea
4 changed files with 63 additions and 41 deletions

View File

@ -66,44 +66,53 @@ $sql = "SELECT c.amount, cc.libelle";
$sql .= " FROM llx_chargesociales as c, c_chargesociales as cc";
$sql .= " WHERE c.fk_type = cc.id AND c.paye=0";
if ( $db->query($sql) ) {
if ( $db->query($sql) )
{
$num = $db->num_rows();
if ($num) {
print "<TABLE border=\"0\" width=\"100%\" cellspacing=\"0\" cellpadding=\"4\">";
print "<TR class=\"liste_titre\">";
print "<TD colspan=\"2\">Charges à payer</td>";
print "</TR>\n";
$i = 0;
while ($i < $num) {
$obj = $db->fetch_object( $i);
$var = !$var;
print "<tr $bc[$var]>";
print '<td>'.$obj->libelle.'</td>';
print '<td align="right">'.price($obj->amount).'</td>';
print '</tr>';
$i++;
if ($num)
{
print "<TABLE border=\"0\" width=\"100%\" cellspacing=\"0\" cellpadding=\"4\">";
print "<TR class=\"liste_titre\">";
print "<TD colspan=\"2\">Charges à payer</td>";
print "</TR>\n";
$i = 0;
while ($i < $num)
{
$obj = $db->fetch_object( $i);
$var = !$var;
print "<tr $bc[$var]>";
print '<td>'.$obj->libelle.'</td>';
print '<td align="right">'.price($obj->amount).'</td>';
print '</tr>';
$i++;
}
print '</table><br>';
}
print '</table><br>';
}
} else {
}
else
{
print $db->error();
}
/*
* Propales
*/
print '<TABLE border="0" cellspacing="0" cellpadding="3" width="100%">';
print "<TR class=\"liste_titre\">";
print '<td colspan="2">'.translate("Propositions commerciales").'</td>';
print "</TR>\n";
$sql = "SELECT count(*) FROM llx_propal WHERE fk_statut = 2";
if (valeur($sql)) {
$var=!$var;
print "<tr $bc[$var]><td><a href=\"propal.php3?viewstatut=2\">A facturer</a></td><td align=\"right\">".valeur($sql)."</td></tr>";
if ($user->comm > 0 && $conf->commercial )
{
print '<TABLE border="0" cellspacing="0" cellpadding="3" width="100%">';
print "<TR class=\"liste_titre\">";
print '<td colspan="2">'.translate("Propositions commerciales").'</td>';
print "</TR>\n";
$sql = "SELECT count(*) FROM llx_propal WHERE fk_statut = 2";
if (valeur($sql))
{
$var=!$var;
print "<tr $bc[$var]><td><a href=\"propal.php3?viewstatut=2\">A facturer</a></td><td align=\"right\">".valeur($sql)."</td></tr>";
}
print "</table><br>";
}
print "</table><br>";
/*
* Factures
*/

View File

@ -49,7 +49,10 @@ function llxHeader($head = "") {
$menu->add("/compta/facture.php3","Factures");
$menu->add_submenu("paiement.php3","Paiements");
$menu->add("/compta/propal.php3","Propales");
if ($user->comm > 0 && $conf->commercial )
{
$menu->add("/compta/propal.php3","Propales");
}
$menu->add("charges/index.php3","Charges");
$menu->add_submenu("sociales/","Prest. Sociales");

View File

@ -107,8 +107,15 @@ function top_menu($head) {
print '<TD width="15%" class="menu" align="center">';
print '<A class="menu" href="/product/">Produits</A></TD>';
print '<td width="15%" class="menu" align="center">';
if ($conf->produit->enabled )
{
print '<A class="menu" href="/product/">Produits</a>';
}
else
{
print '-';
}
print '</td><td width="15%" class="menu" align="center">';
if ($conf->webcal->enabled) {
print '<a class="menu" href="'.$conf->webcal->url.'">Calendrier</a>';
};

View File

@ -33,18 +33,21 @@ function llxHeader($head = "") {
$menu = new Menu();
$menu->add("/societe.php", "Sociétés","company");
$menu->add_submenu("../soc.php3?&action=create", "Nouvelle société");
if ($conf->societe )
{
$menu->add("/societe.php", "Sociétés","company");
$menu->add_submenu("../soc.php3?&action=create", "Nouvelle société");
}
if ($conf->commercial )
{
$menu->add("/comm/index.php3", "Commercial");
$menu->add_submenu("/comm/clients.php3", "Clients");
$menu->add_submenu("/comm/propal.php3", "Propales");
}
$menu->add_submenu("/comm/clients.php3", "Clients");
$menu->add_submenu("/comm/propal.php3", "Propales");
if ($user->compta > 0)
{
$menu->add("/compta/", "Comptabilité");
@ -57,8 +60,6 @@ function llxHeader($head = "") {
$menu->add("/fichinter/", "Fiches d'intervention");
}
$menu->add("/fourn/index.php3", "Fournisseurs");
if ($conf->produit->enabled )
{
$menu->add("/product/", "Produits");
@ -76,6 +77,8 @@ function llxHeader($head = "") {
$menu->add("/compta/dons/", "Dons");
$menu->add("/fourn/index.php3", "Fournisseurs");
$menu->add("/user/", "Utilisateurs");
$menu->add("/info.php3", "Configuration");