diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php index de0b53f9015..dacc4c0d241 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/fiche.php @@ -271,6 +271,7 @@ if ($_GET["action"] == 'create') $soc->fetch($obj->idp); print '
\n"; + print "\n"; + print "\n"; + if ($propalid) { /* diff --git a/htdocs/contrat/liste.php b/htdocs/contrat/liste.php index 2eb7dc545f7..c0fab12dc0e 100644 --- a/htdocs/contrat/liste.php +++ b/htdocs/contrat/liste.php @@ -68,7 +68,7 @@ $sql.= ' sum('.$db->ifsql("cd.statut=4 AND cd.date_fin_validite > sysdate()",1,0 $sql.= ' sum('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NULL OR cd.date_fin_validite <= sysdate())",1,0).') as nb_late,'; $sql.= ' sum('.$db->ifsql("cd.statut=5",1,0).') as nb_closed,'; $sql.= " c.rowid as cid, c.ref, c.datec, c.statut, s.nom, s.idp as sidp"; -$sql.= " FROM ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."societe as s"; +$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as c"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."contratdet as cd ON c.rowid = cd.fk_contrat"; $sql.= " WHERE c.fk_soc = s.idp "; if ($search_nom) $sql.= " AND s.nom like '%".$search_nom."%'";