From 1cbd2a1b1cfe4f480bd347525d55429c91a59ad3 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Thu, 25 Oct 2012 08:43:26 +0200
Subject: [PATCH] Fix: broken feature

---
 htdocs/core/ajax/saveinplace.php | 16 ++++++++--------
 htdocs/fourn/facture/fiche.php   |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/htdocs/core/ajax/saveinplace.php b/htdocs/core/ajax/saveinplace.php
index da4642c19b8..2854c30f0fa 100644
--- a/htdocs/core/ajax/saveinplace.php
+++ b/htdocs/core/ajax/saveinplace.php
@@ -66,21 +66,21 @@ if (! empty($field) && ! empty($element) && ! empty($table_element) && ! empty($
 		$subelement = $regs[2];
 	}
 
-	if ($element == 'propal') $element = 'propale';
-	else if ($element == 'fichinter') $element = 'ficheinter';
-	else if ($element == 'product') $element = 'produit';
-	else if ($element == 'member') $element = 'adherent';
+	if ($element == 'propal') $newelement = 'propale';
+	else if ($element == 'fichinter') $newelement = 'ficheinter';
+	else if ($element == 'product') $newelement = 'produit';
+	else if ($element == 'member') $newelement = 'adherent';
 	else if ($element == 'order_supplier') {
-		$element = 'fournisseur';
+		$newelement = 'fournisseur';
 		$subelement = 'commande';
 	}
 	else if ($element == 'invoice_supplier') {
-		$element = 'fournisseur';
+		$newelement = 'fournisseur';
 		$subelement = 'facture';
 	}
 
-	if (! empty($user->rights->$element->creer) || ! empty($user->rights->$element->write)
-	|| (isset($subelement) && (! empty($user->rights->$element->$subelement->creer) || ! empty($user->rights->$element->$subelement->write)))
+	if (! empty($user->rights->$newelement->creer) || ! empty($user->rights->$newelement->write)
+	|| (isset($subelement) && (! empty($user->rights->$newelement->$subelement->creer) || ! empty($user->rights->$newelement->$subelement->write)))
 	|| ($element == 'payment' && $user->rights->facture->paiement)
 	|| ($element == 'payment_supplier' && $user->rights->fournisseur->facture->creer))
 	{
diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php
index 9aca380a9fa..4ffc87831f8 100644
--- a/htdocs/fourn/facture/fiche.php
+++ b/htdocs/fourn/facture/fiche.php
@@ -1522,7 +1522,7 @@ else
         }
 
         // Other options
-        $parameters=array();
+        $parameters=array('colspan' => ' colspan="3"');
         $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
 
         print '</table>';
@@ -2053,4 +2053,4 @@ else
 // End of page
 llxFooter();
 $db->close();
-?>
\ No newline at end of file
+?>