diff --git a/dev/generate-commande.php b/dev/generate-commande.php
index 826c3f7d247..168b7ae18b1 100644
--- a/dev/generate-commande.php
+++ b/dev/generate-commande.php
@@ -42,18 +42,39 @@ include_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php");
 define (GEN_NUMBER_COMMANDE, 10);
 
 
-$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product"; $productsid = array();
-if ($db->query($sql)) {
-  $num = $db->num_rows(); $i = 0;	
-  while ($i < $num) {      $row = $db->fetch_row($i);      $productsid[$i] = $row[0];      $i++; } }
-
 $sql = "SELECT idp FROM ".MAIN_DB_PREFIX."societe"; $societesid = array();
-if ($db->query($sql)) { $num = $db->num_rows(); $i = 0;	
-while ($i < $num) { $row = $db->fetch_row($i);      $societesid[$i] = $row[0];      $i++; } } else { print "err"; }
+if ($db->query($sql)) { $num = $db->num_rows(); $i = 0;
+	while ($i < $num) {
+		$row = $db->fetch_row($i);      $societesid[$i] = $row[0];      $i++;
+	}
+}
+else { print "err"; }
 
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."commande"; $commandesid = array();
-if ($db->query($sql)) { $num = $db->num_rows(); $i = 0;	
-while ($i < $num) { $row = $db->fetch_row($i);      $commandesid[$i] = $row[0];      $i++; } } else { print "err"; }
+if ($db->query($sql)) {
+	$num = $db->num_rows(); $i = 0;
+	while ($i < $num) {
+		$row = $db->fetch_row($i);      $commandesid[$i] = $row[0];      $i++;
+	}
+}
+else { print "err"; }
+
+
+$prodids = array();
+$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product WHERE envente=1";
+$resql = $db->query($sql);
+if ($resql) 
+{
+  $num_prods = $db->num_rows($resql);
+  $i = 0;
+  while ($i < $num_prods)
+    {
+      $i++;
+      
+      $row = $db->fetch_row($resql);
+      $prodids[$i] = $row[0];
+    }
+}
 
 
 $dates = array (mktime(12,0,0,1,3,2003),
@@ -115,6 +136,7 @@ print "G
 for ($s = 0 ; $s < GEN_NUMBER_COMMANDE ; $s++)
 {
     print "Commande $s";
+
     $com = new Commande($db);
     
     $com->socidp         = 4;
@@ -124,13 +146,19 @@ for ($s = 0 ; $s < GEN_NUMBER_COMMANDE ; $s++)
     $com->projetid       = 0;
     $com->remise_percent = 0;
     
-    $pidrand = rand(1, sizeof($productsid)-1);
-    $com->add_product($productsid[rand(1, sizeof($productsid)-1)],rand(1,11),rand(1,6),rand(0,20));
-    $id = $com->create($user);
-    $com->fetch($id);
-    print " " . strftime("%d %B %Y",$com->date_commande);
-    print " " .  $com->valid($user);
-    print "\n";
+	$nbp = rand(2, 5);
+	$xnbp = 0;
+	while ($xnbp < $nbp)
+	{
+	    // \TODO Utiliser addline plutot que add_product
+		$prodid = rand(1, $num_prods);
+	    $com->add_product($prodids[$prodid],rand(1,11),rand(1,6),rand(0,20));
+	}
+	
+    $com->create($user);
+	$com->valid($user);
+
+	print "\n";
 }
 
 ?>
diff --git a/dev/generate-facture.php b/dev/generate-facture.php
index 086d58f242b..9b2744f65d6 100644
--- a/dev/generate-facture.php
+++ b/dev/generate-facture.php
@@ -41,10 +41,6 @@ require_once(DOL_DOCUMENT_ROOT."/societe.class.php");
 
 define (GEN_NUMBER_FACTURE, 5);
 
-/*
- *
- *
- */
 
 $sql = "SELECT min(rowid) FROM ".MAIN_DB_PREFIX."user";
 $resql = $db->query($sql);
@@ -89,27 +85,31 @@ if ($resql)
 $i=0;
 while ($i < GEN_NUMBER_FACTURE)
 {
-  $i++;
-  $socid = rand(1, $num_socs);
-
-  $facture = new Facture($db, $socids[$socid]);
-  $facture->number = 'provisoire';
-  $facture->date = time();
-  $facture->cond_reglement_id = 3;
-  $facture->mode_reglement_id = 3;
-
-  $nbp = rand(1, 9);
-  $xnbp = 0;
-
-  while ($xnbp < $nbp)
-    {
-      $prodid = rand(1, $num_prods);
-      $facture->add_product($prodids[$prodid], rand(1,5), 0);
-      $xnbp++;
-    }
-
-  $facture->create($user);
-  $facture->set_valid($facture->id,$user,$socid);
+	print "Facture $s";
+	
+	$i++;
+	$socid = rand(1, $num_socs);
+	
+	$facture = new Facture($db, $socids[$socid]);
+	$facture->number = 'provisoire';
+	$facture->date = time();
+	$facture->cond_reglement_id = 3;
+	$facture->mode_reglement_id = 3;
+	
+	$nbp = rand(2, 5);
+	$xnbp = 0;
+	while ($xnbp < $nbp)
+	{
+	    // \TODO Utiliser addline plutot que add_product
+		$prodid = rand(1, $num_prods);
+		$facture->add_product($prodids[$prodid], rand(1,5), 0);
+		$xnbp++;
+	}
+	
+	$facture->create($user);
+	$facture->set_valid($facture->id,$user,$socid);
+	
+	print "\n";
 }
 
 
diff --git a/dev/generate-propale.php b/dev/generate-propale.php
index 46b673b96a7..f41be4c6a2b 100644
--- a/dev/generate-propale.php
+++ b/dev/generate-propale.php
@@ -37,16 +37,8 @@ require_once(DOL_DOCUMENT_ROOT."/propal.class.php");
 require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php");
 require_once(DOL_DOCUMENT_ROOT."/societe.class.php");
 
-/*
- * Parametre
- */
-
 define (GEN_NUMBER_PROPAL, 2);
 
-/*
- *
- *
- */
 
 $sql = "SELECT min(rowid) FROM ".MAIN_DB_PREFIX."user";
 $resql = $db->query($sql);
@@ -115,6 +107,8 @@ if (defined("PROPALE_ADDON") && is_readable(DOL_DOCUMENT_ROOT ."/includes/module
 $i=0;
 while ($i < GEN_NUMBER_PROPAL)
 {
+    print "Propale $s";
+
 	$i++;
 	$socid = rand(1, $num_socs);
 	
@@ -134,9 +128,8 @@ while ($i < GEN_NUMBER_PROPAL)
 	
 	$propal->create($user);
 	
-	$nbp = rand(1, 9);
+	$nbp = rand(2, 5);
 	$xnbp = 0;
-	
 	while ($xnbp < $nbp)
 	{
 		$prodid = rand(1, $num_prods);
@@ -144,6 +137,7 @@ while ($i < GEN_NUMBER_PROPAL)
 		$xnbp++;
 	}
 
+	print "\n";
 }