diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php index ecac6604199..e4ca1a253f3 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -75,36 +75,38 @@ print ''; print '
'; -print '
'; -print ''; -print ''; -print "'; -print "
Rechercher une proposition
"; -print 'Num. :
\n"; +if ($conf->propal->enabled) { + print '
'; + print ''; + print ''; + print "'; + print "
Rechercher une proposition
"; + print 'Num. :

\n"; -$sql = "SELECT p.rowid, p.ref"; -$sql .= " FROM llx_propal as p"; -$sql .= " WHERE p.fk_statut = 0"; - -if ( $db->query($sql) ) -{ - $num = $db->num_rows(); - $i = 0; - if ($num > 0 ) - { - print '
'; - print ""; - print ""; - - while ($i < $num) + $sql = "SELECT p.rowid, p.ref"; + $sql .= " FROM llx_propal as p"; + $sql .= " WHERE p.fk_statut = 0"; + + if ( $db->query($sql) ) { - $obj = $db->fetch_object( $i); - $var=!$var; - print ""; - $i++; + $num = $db->num_rows(); + $i = 0; + if ($num > 0 ) + { + print '
Propositions commerciales brouillons
rowid."\">".$obj->ref."
'; + print ""; + print ""; + + while ($i < $num) + { + $obj = $db->fetch_object( $i); + $var=!$var; + print ""; + $i++; + } + print "
Propositions commerciales brouillons
rowid."\">".$obj->ref."

"; + } } - print "

"; - } } /* @@ -248,64 +250,65 @@ if ( $db->query($sql) ) } } - /* * Dernières propales * */ -$sql = "SELECT s.nom, s.idp, p.rowid as propalid, p.price, p.ref,".$db->pdate("p.datep")." as dp, c.label as statut, c.id as statutid"; -$sql .= " FROM llx_societe as s, llx_propal as p, c_propalst as c WHERE p.fk_soc = s.idp AND p.fk_statut = c.id AND p.fk_statut > 1"; -if ($socidp) -{ - $sql .= " AND s.idp = $socidp"; -} +if ($conf->propal->enabled) { -$sql .= " ORDER BY p.rowid DESC"; -$sql .= $db->plimit(5, 0); - -if ( $db->query($sql) ) - { - $num = $db->num_rows(); - - $i = 0; - print ''; - print ''; - $var=True; - - while ($i < $num) - { - $objp = $db->fetch_object( $i); - - $var=!$var; - print ""; - print ''; - print "\n"; - - $now = time(); - $lim = 3600 * 24 * 15 ; - - if ( ($now - $objp->dp) > $lim && $objp->statutid == 1 ) - { - print ""; - } - else - { - print ""; - } - - print "\n"; - print "\n"; - print "\n"; - print "\n"; - $i++; + $sql = "SELECT s.nom, s.idp, p.rowid as propalid, p.price, p.ref,".$db->pdate("p.datep")." as dp, c.label as statut, c.id as statutid"; + $sql .= " FROM llx_societe as s, llx_propal as p, c_propalst as c WHERE p.fk_soc = s.idp AND p.fk_statut = c.id AND p.fk_statut > 1"; + if ($socidp) + { + $sql .= " AND s.idp = $socidp"; } - - print "
Dernières propositions commerciales
'.$objp->ref.'idp\">$objp->nom > 15 jours "; - print strftime("%d %B %Y",$objp->dp)."".price($objp->price)."$objp->statut
"; - $db->free(); - } - + + $sql .= " ORDER BY p.rowid DESC"; + $sql .= $db->plimit(5, 0); + + if ( $db->query($sql) ) + { + $num = $db->num_rows(); + + $i = 0; + print ''; + print ''; + $var=True; + + while ($i < $num) + { + $objp = $db->fetch_object( $i); + + $var=!$var; + print ""; + print ''; + print "\n"; + + $now = time(); + $lim = 3600 * 24 * 15 ; + + if ( ($now - $objp->dp) > $lim && $objp->statutid == 1 ) + { + print ""; + } + else + { + print ""; + } + + print "\n"; + print "\n"; + print "\n"; + print "\n"; + $i++; + } + + print "
Dernières propositions commerciales
'.$objp->ref.'idp\">$objp->nom > 15 jours "; + print strftime("%d %B %Y",$objp->dp)."".price($objp->price)."$objp->statut
"; + $db->free(); + } +} print ''; @@ -314,6 +317,5 @@ print ''; $db->close(); - llxFooter("Dernière modification $Date$ révision $Revision$"); ?>