Commit 326d8dc9 authored by Feu's avatar Feu
Browse files

fixes

parent f234f3a2
......@@ -243,7 +243,7 @@ if ( count($conds) >= 1 )
"Chiffre d'affaire: ".($sum/100)." Euros<br/>" .
"Prix countant total estimé* : ".($sumcoutant/100)." Euros");
$frm = new form ("cptacptpdf","compta.php",true,"POST","PDF");
$frm = new form ("cptacptpdf","ventes.php",true,"POST","PDF");
$frm->add_hidden("action","pdf");
$i=0;
foreach($conds as $value)
......
......@@ -144,7 +144,7 @@ function classlink ( $obj, $obj1=null,$obj2=null )
function wikilink ( $name, $title )
{
global $topdir;
return "<a href=\"".$topdir."article.php?name=$name\"><img src=\"".$topdir."page.png\" class=\"icon\" alt=\"Article\" /> ".htmlentities($title,ENT_NOQUOTES,"UTF-8")."</a>";
return "<a href=\"".$topdir."article.php?name=$name\"><img src=\"".$topdir."images/icons/16/page.png\" class=\"icon\" alt=\"Article\" /> ".htmlentities($title,ENT_NOQUOTES,"UTF-8")."</a>";
}
......
......@@ -157,7 +157,7 @@ if ( $site->user->is_valid() && ($site->user->utbm || $site->user->ae) )
"UNION ALL SELECT COUNT(*) " .
"FROM `utl_etu_utbm` " .
"INNER JOIN `utilisateurs` ON `utl_etu_utbm`.`id_utilisateur` = `utilisateurs`.`id_utilisateur` " .
"WHERE `surnom_utbm`!='' AND `surnom_utbm` REGEXP '^".$sqlpattern."' $force_sql");
"WHERE `surnom_utbm`!='' AND (`surnom_utbm`!=`alias_utl` OR `alias_utl` IS NULL) AND `surnom_utbm` REGEXP '^".$sqlpattern."' $force_sql");
$nbutils = 0;
while ( list($c) = $req->get_row() ) $nbutils += $c;
......@@ -177,7 +177,7 @@ if ( $site->user->is_valid() && ($site->user->utbm || $site->user->ae) )
"UNION SELECT `surnom_utbm`, '4' as `method`, `utilisateurs`.* " .
"FROM `utl_etu_utbm` " .
"INNER JOIN `utilisateurs` ON `utl_etu_utbm`.`id_utilisateur` = `utilisateurs`.`id_utilisateur` " .
"WHERE `surnom_utbm`!='' AND `surnom_utbm`!=`alias_utl` AND `surnom_utbm` REGEXP '^".$sqlpattern."' $force_sql " .
"WHERE `surnom_utbm`!='' AND (`surnom_utbm`!=`alias_utl` OR `alias_utl` IS NULL) AND `surnom_utbm` REGEXP '^".$sqlpattern."' $force_sql " .
"ORDER BY 1 LIMIT 3");
$this->buffer .= "<h2>Personnes</h2>";
......
......@@ -1640,7 +1640,7 @@ L'équipe info AE";
"UNION SELECT `surnom_utbm`, '4' as `method`, `utilisateurs`.* " .
"FROM `utl_etu_utbm` " .
"INNER JOIN `utilisateurs` ON `utl_etu_utbm`.`id_utilisateur` = `utilisateurs`.`id_utilisateur` " .
"WHERE `surnom_utbm`!='' AND `surnom_utbm`!=`alias_utl` AND `surnom_utbm` REGEXP '^".$sqlpattern."' $extrasql " .
"WHERE `surnom_utbm`!='' AND (`surnom_utbm`!=`alias_utl` OR `alias_utl` IS NULL) AND `surnom_utbm` REGEXP '^".$sqlpattern."' $extrasql " .
"ORDER BY 1";
if ( !is_null($limit) && $limit > 0 )
......@@ -1658,7 +1658,7 @@ L'équipe info AE";
if ( $row["method"] > 2 )
$values[$row['id_utilisateur']] = $row['prenom_utl']." ".$row['nom_utl']." : ".$row[0];
elseif ( $row["method"] == 1 )
else//if ( $row["method"] == 1 )
$values[$row['id_utilisateur']] = $row[0];
}
......
......@@ -465,7 +465,7 @@ if ( $_REQUEST["page"] == "edit" && $can_edit )
$subfrm3->add_entity_smartselect ("id_ville_parents","Ville parents (France)", $ville_parents);
$subfrm3->add_entity_smartselect ("id_pays_parents","ou pays parents", $pays_parents);
$subfrm3->add_text_field("tel_parents","T&eacute;l&eactue;phone parents",$user->tel_parents);
$subfrm3->add_text_field("tel_parents","T&eacute;l&eacute;phone parents",$user->tel_parents);
$frm->add ( $subfrm3, false, false, false, false, false, true, false );
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment