From 9d5b36b27b737597dd4d5bed26b5a559dfc15e49 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 17 Jan 2013 14:36:08 +0100
Subject: [PATCH 1/2] Fix: error set on non object

---
 htdocs/admin/fournisseur.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/admin/fournisseur.php b/htdocs/admin/fournisseur.php
index 774009e2353..e92ef38ee97 100644
--- a/htdocs/admin/fournisseur.php
+++ b/htdocs/admin/fournisseur.php
@@ -357,7 +357,6 @@ foreach ($dirmodels as $reldir)
                         // Info
                         $htmltooltip='';
                         $htmltooltip.=''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
-                        $facture->type=0;
                         $nextval=$module->getNextValue($mysoc,$commande);
                         if ("$nextval" != $langs->trans("NotAvailable"))	// Keep " on nextval
                         {

From c16269d04e4073a54ae2918914c75d31f791be86 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 17 Jan 2013 17:59:47 +0100
Subject: [PATCH 2/2] Fix: load at wrong place

Conflicts:
	htdocs/core/class/html.formother.class.php
---
 htdocs/core/class/html.formother.class.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 676ad72faea..e544a6db99a 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -822,8 +822,8 @@ class FormOther
         $arrayboxtoactivatelabel=array();
         if (! empty($user->conf->$confuserzone))
         {
-        	foreach($boxactivated as $box)
-        	{
+        	foreach($boxactivated as $box)
+        	{
         		if (! empty($boxidactivatedforuser[$box->id])) continue;	// Already visible for user
         		$arrayboxtoactivatelabel[$box->id]=$box->boxlabel;			// We keep only boxes not shown for user, to show into combo list
         	}
@@ -861,7 +861,9 @@ class FormOther
 
         if ($nbboxactivated)
         {
-        	$emptybox=new ModeleBoxes($db);
+        	$langs->load("boxes");
+
+        	$emptybox=new ModeleBoxes($db);
 
             print '<table width="100%" class="notopnoleftnoright">';
             print '<tr><td class="notopnoleftnoright">'."\n";