diff --git a/inc-calcul-squel.php3 b/inc-calcul-squel.php3
index 0617146599541597cfde3e5e141013167e847afd..726d49e1af34f40e185d1199a67f26b342c3059c 100644
--- a/inc-calcul-squel.php3
+++ b/inc-calcul-squel.php3
@@ -1204,7 +1204,11 @@ function calculer_champ($id_champ, $id_boucle, $nom_var)
 		break;
 	
 	case 'ON_OFF':
-		$code = 'calcul_on_off($contexte)';
+		$id_on_off = $GLOBALS['tables_doublons'][$boucles[$id_boucle]->type_requete];
+		if ($id_on_off) 
+			$code = "(\$GLOBALS['$id_on_off'] == \$contexte['$id_on_off']) ? 'on' : 'off'";
+		else 
+			$code = "'off'";
 		break;
 
 	//
diff --git a/inc-calcul.php3 b/inc-calcul.php3
index 38e8c68d7ca275ddf8b78f14a470f186303de515..c8a6fcf43524bdc70297461354eec84534e6f821 100644
--- a/inc-calcul.php3
+++ b/inc-calcul.php3
@@ -293,20 +293,6 @@ function calcul_introduction ($type, $texte, $chapo='', $descriptif='') {
 	}
 }
 
-function calcul_on_off($contexte, $on = 'on', $off = 'off') {
-	global $id_article, $id_breve, $id_rubrique, $id_mot, $id_auteur, $id_syndic, $id_syndic_article;
-
-	if ($id_article) $on_off = ($id_article == $contexte['id_article']);
-	else if ($id_breve) $on_off = ($id_breve == $contexte['id_breve']);
-	else if ($id_rubrique) $on_off = ($id_rubrique == $contexte['id_rubrique']);
-	else if ($id_mot) $on_off = ($id_mot == $contexte['id_mot']);
-	else if ($id_auteur) $on_off = ($id_auteur == $contexte['id_auteur']);
-	else if ($id_syndic) $on_off = ($id_syndic == $contexte['id_syndic']);
-	else if ($id_syndic_article) $on_off = ($id_syndic_article == $contexte['id_syndic_article']);
-
-	return $on_off ? $on : $off;
-}
-
 
 //////////////////////////////////////////////////////////////////////////////
 //
diff --git a/inc-champ-squel.php3 b/inc-champ-squel.php3
index 59ca98a8560fb1c5b97011ac28a6913fd23dfcc9..6993ce1aa61dc1e870b3f9533ab65a18f9a0eea1 100755
--- a/inc-champ-squel.php3
+++ b/inc-champ-squel.php3
@@ -402,7 +402,6 @@ function init_champs_squel() {
 		'syndic_articles' => "syndic_articles",
 		'types_documents' => "id_document"
 	);
-
 }
 
 init_champs_squel();