From afebf86bf159deaa8a0727dc289897383f9a1a97 Mon Sep 17 00:00:00 2001
From: simnandez <jmenent@2byte.es>
Date: Wed, 26 Feb 2014 16:55:42 +0100
Subject: [PATCH] Fix: Loading actions extrafields fails.

Conflicts:
	htdocs/comm/action/fiche.php
---
 ChangeLog                    | 1 +
 htdocs/comm/action/fiche.php | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4ac20917630..f561168c23b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -88,6 +88,7 @@ Fix: Signature was not added for email sent from thirdparty page.
 Fix: Action event SHIPPING_VALIDATE is not implemented
 Fix: The customer code was set to uppercase when using numbering module leopard. We
      must keep data safe of any change.
+Fix: Loading actions extrafields fails.
 
 ***** ChangeLog for 3.5 compared to 3.4.* *****
 For users:
diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php
index 0f2d9b8447c..f017009fe79 100644
--- a/htdocs/comm/action/fiche.php
+++ b/htdocs/comm/action/fiche.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005      Simon TOSSER         <simon@kornog-computing.com>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2010      Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2010-2013 Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2013      Florian Henry        <florian.henry@open-concept.pro>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -863,7 +863,6 @@ if ($id > 0)
 		if (empty($reshook) && ! empty($extrafields->attribute_label))
 		{
 			print $object->showOptionals($extrafields,'edit');
-
 		}
 
 		print '</table>';