Merge branch '3.1' of ssh://git@github.com/Dolibarr/dolibarr.git into…

… 3.1
Dolibarr · Oct 26, 2011 · aa76070 · aa76070
2 parents 68005ff + b2981d4
commit aa76070
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
@@ -1293,11 +1293,14 @@ function fetchObjectLinked($sourceid='',$sourcetype='',$targetid='',$targettype=
 		            if ($objecttype == 'delivery')			{ $classpath = 'livraison/class'; $subelement = 'livraison'; $module = 'livraison_bon'; }
 		            if ($objecttype == 'invoice_supplier')	{ $classpath = 'fourn/class'; }
 		            if ($objecttype == 'order_supplier')	{ $classpath = 'fourn/class'; }
-		            if ($objecttype == 'fichinter')			{ $classpath = 'fichinter/class'; $subelement ='fichinter'; $module ='ficheinter'; }
+		            if ($objecttype == 'fichinter')			{ $classpath = 'fichinter/class'; $subelement = 'fichinter'; $module = 'ficheinter'; }
+
+		            // TODO ajout temporaire - MAXIME MANGIN
+		            if ($objecttype == 'contratabonnement')	{ $classpath = 'contrat/class'; $subelement = 'contrat'; $module = 'contratabonnement'; }
 
 		            $classfile = strtolower($subelement); $classname = ucfirst($subelement);
-		            if ($objecttype == 'invoice_supplier') { $classfile = 'fournisseur.facture'; $classname='FactureFournisseur'; }
-		            if ($objecttype == 'order_supplier')   { $classfile = 'fournisseur.commande'; $classname='CommandeFournisseur'; }
+		            if ($objecttype == 'invoice_supplier') { $classfile = 'fournisseur.facture'; $classname = 'FactureFournisseur'; }
+		            if ($objecttype == 'order_supplier')   { $classfile = 'fournisseur.commande'; $classname = 'CommandeFournisseur'; }
 
 		            if ($conf->$module->enabled && $element != $this->element)
 		            {