From 07e79e0b7f5c07cee3ba7c2d14ed0197d873eec7 Mon Sep 17 00:00:00 2001 From: Rodolphe Quiedeville Date: Sun, 9 Nov 2003 15:37:14 +0000 Subject: [PATCH] =?UTF-8?q?Modif=20info=20affich=E9es?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/comm/index.php | 107 +++++++++++++++++++++++++++++------------- 1 file changed, 74 insertions(+), 33 deletions(-) diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php index 749aabceff7..5e6d684d4c4 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -71,7 +71,7 @@ if ($action == 'del_bookmark') print_titre("Espace commercial"); -print ''; +print '
'; print '
'; @@ -80,7 +80,7 @@ print ''; print ''; print "'; -print "
Rechercher une proposition
"; print 'Num. :

\n"; +print "
\n"; $sql = "SELECT p.rowid, p.ref"; $sql .= " FROM llx_propal as p"; @@ -92,7 +92,7 @@ if ( $db->query($sql) ) $i = 0; if ($num > 0 ) { - print ''; + print '
'; print ""; print ""; @@ -107,36 +107,38 @@ if ( $db->query($sql) ) } } -$sql = "SELECT p.rowid, p.ref"; -$sql .= " FROM llx_propal as p"; -$sql .= " WHERE p.fk_statut = 1"; +/* + * Commandes à valider + */ +$sql = "SELECT c.rowid, c.ref, s.nom, s.idp FROM llx_commande as c, llx_societe as s"; +$sql .= " WHERE c.fk_soc = s.idp AND c.fk_statut = 0"; if ($socidp) -{ - $sql .= " AND p.fk_soc = $socidp"; +{ + $sql .= " AND c.fk_soc = $socidp"; } -if ( $db->query($sql) ) +if ( $db->query($sql) ) { $num = $db->num_rows(); - $i = 0; - if ($num > 0 ) + if ($num) { - print '
Propositions commerciales brouillons
'; - print ""; - print ""; + $i = 0; + print '
Propositions commerciales ouvertes
'; + print ''; + print ''; while ($i < $num) { - $obj = $db->fetch_object( $i); $var=!$var; - print ""; + $obj = $db->fetch_object($i); + print ""; + print ''; $i++; } print "
'.translate("Commandes à valider").'
rowid."\">".$obj->ref."
rowid\">$obj->ref'.$obj->nom.'

"; } } - /* * * @@ -152,7 +154,7 @@ if ( $db->query($sql) ) $num = $db->num_rows(); $i = 0; - print ""; + print "
"; print ""; print ""; print "\n"; @@ -184,30 +186,69 @@ $sql .= " ORDER BY a.datea DESC"; if ( $db->query($sql) ) { - print '
Bookmark
'; - print ''; - print ''; - print "\n"; - - $i = 0; - while ($i < $db->num_rows() ) + $num = $db->num_rows(); + if ($num > 0) { - $obj = $db->fetch_object($i); - $var=!$var; + print '
Actions à faire
'; + print ''; + print ''; + print "\n"; - print ""; - print ""; - print ''; - $i++; + $i = 0; + while ($i < $num ) + { + $obj = $db->fetch_object($i); + $var=!$var; + + print ""; + print ""; + print ''; + $i++; + } + print "
Actions à faire
".strftime("%d %b %Y",$obj->da)."id\">$obj->libelle $obj->label'.$obj->sname.'
".strftime("%d %b %Y",$obj->da)."id\">$obj->libelle $obj->label'.$obj->sname.'

"; } $db->free(); - print "
"; } else { print $db->error(); } +$sql = "SELECT s.nom, s.idp, p.rowid, 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"; +} + +$sql .= " ORDER BY p.rowid DESC"; +$sql .= $db->plimit(5, 0); + +if ( $db->query($sql) ) +{ + $num = $db->num_rows(); + $i = 0; + if ($num > 0 ) + { + print ''; + print ''; + + while ($i < $num) + { + $obj = $db->fetch_object( $i); + $var=!$var; + print ""; + print "\n"; + print "\n"; + print "\n"; + $i++; + } + print "
Propositions commerciales ouvertes
rowid."\">".$obj->ref."idp\">$obj->nom"; + print strftime("%d %B %Y",$obj->dp)."".price($obj->price)."

"; + } +} + + /* * Dernières propales * @@ -266,8 +307,8 @@ if ( $db->query($sql) ) } -print ''; +print ''; print ''; $db->close();