>From 59e8943ee5dbb742fb7b2f954509a86c163bf4d7 Mon Sep 17 00:00:00 2001
From: graveen <address@hidden>
Date: Sun, 4 Mar 2012 10:17:23 +0100
Subject: [PATCH] - Removed: warnings

---
 htdocs/admin/commande.php    |    4 ++--
 htdocs/admin/facture.php     |    4 ++--
 htdocs/admin/fournisseur.php |    6 +++---
 htdocs/admin/propale.php     |    4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index c54e34e..b4cdebd 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -73,7 +73,7 @@ if ($action == 'specimen')
 
 	// Search template files
 	$file=''; $classname=''; $filefound=0;
-	$dirmodels=array_merge(array('/'),$conf->modules_parts['models']);
+	$dirmodels=array_merge(array('/'),(array)$conf->modules_parts['models']);
 	foreach($dirmodels as $reldir)
 	{
 	    $file=dol_buildpath($reldir."core/modules/commande/doc/pdf_".$modele.".modules.php",0);
@@ -223,7 +223,7 @@ if ($action == 'set_COMMANDE_FREE_TEXT')
  * View
  */
 
-$dirmodels=array_merge(array('/'),$conf->modules_parts['models']);
+$dirmodels=array_merge(array('/'),(array)$conf->modules_parts['models']);
 
 llxHeader();
 
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index dc5af7f..d039f69 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -72,7 +72,7 @@ if ($action == 'specimen')
 
 	// Search template files
 	$file=''; $classname=''; $filefound=0;
-	$dirmodels=array_merge(array('/'),$conf->modules_parts['models']);
+	$dirmodels=array_merge(array('/'),(array)$conf->modules_parts['models']);
 	foreach($dirmodels as $reldir)
 	{
 	    $file=dol_buildpath($reldir."core/modules/facture/doc/pdf_".$modele.".modules.php",0);
@@ -291,7 +291,7 @@ if ($action == 'setforcedate')
  * View
  */
 
-$dirmodels=array_merge(array('/'),$conf->modules_parts['models']);
+$dirmodels=array_merge(array('/'),(array)$conf->modules_parts['models']);
 
 llxHeader("",$langs->trans("BillsSetup"),'EN:Invoice_Configuration|FR:Configuration_module_facture|ES:ConfiguracionFactura');
 
diff --git a/htdocs/admin/fournisseur.php b/htdocs/admin/fournisseur.php
index 088873e..266c7e4 100644
--- a/htdocs/admin/fournisseur.php
+++ b/htdocs/admin/fournisseur.php
@@ -78,7 +78,7 @@ if ($action == 'specimen')  // For orders
     
     // Search template files
     $file=''; $classname=''; $filefound=0;
-    $dirmodels=array_merge(array('/'),$conf->modules_parts['models']);
+    $dirmodels=array_merge(array('/'),(array)$conf->modules_parts['models']);
     foreach($dirmodels as $reldir)
     {
     	$file=dol_buildpath($reldir."core/modules/supplier_order/pdf/pdf_".$modele.".modules.php",0);
@@ -124,7 +124,7 @@ if ($action == 'specimenfacture')   // For invoices
     
 	// Search template files
     $file=''; $classname=''; $filefound=0;
-    $dirmodels=array_merge(array('/'),$conf->modules_parts['models']);
+    $dirmodels=array_merge(array('/'),(array)$conf->modules_parts['models']);
     foreach($dirmodels as $reldir)
     {
     	$file=dol_buildpath($reldir."core/modules/supplier_invoice/pdf/pdf_".$modele.".modules.php",0);
@@ -262,7 +262,7 @@ if ($action == 'set_SUPPLIER_INVOICE_FREE_TEXT')
  * View
  */
 
-$dirmodels=array_merge(array('/'),$conf->modules_parts['models']);
+$dirmodels=array_merge(array('/'),(array)$conf->modules_parts['models']);
 
 llxHeader();
 
diff --git a/htdocs/admin/propale.php b/htdocs/admin/propale.php
index 0679366..6cef3c5 100644
--- a/htdocs/admin/propale.php
+++ b/htdocs/admin/propale.php
@@ -71,7 +71,7 @@ if ($action == 'specimen')
 
 	// Search template files
 	$file=''; $classname=''; $filefound=0;
-	$dirmodels=array_merge(array('/'),$conf->modules_parts['models']);
+	$dirmodels=array_merge(array('/'),(array)$conf->modules_parts['models']);
 	foreach($dirmodels as $reldir)
 	{
 	    $file=dol_buildpath($reldir."core/modules/propale/doc/pdf_".$modele.".modules.php");
@@ -257,7 +257,7 @@ else if ($action == 'setmod')
  * Affiche page
  */
 
-$dirmodels=array_merge(array('/'),$conf->modules_parts['models']);
+$dirmodels=array_merge(array('/'),(array)$conf->modules_parts['models']);
 
 llxHeader('',$langs->trans("PropalSetup"));
 
-- 
1.7.8.msysgit.0