From c2397fad60d61f5939bf57775c9a3e7e8a95815b Mon Sep 17 00:00:00 2001
From: Inovea Conseil <inoveaconseil@users.noreply.github.com>
Date: Sat, 10 Mar 2018 23:49:43 +0100
Subject: [PATCH 1/2] Fix #8092

---
 htdocs/societe/card.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index d3f629952b1..b5d643abc98 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -10,6 +10,7 @@
  * Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
  * Copyright (C) 2015       Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2015       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) 2018       Nicolas ZABOURI	    <info@inovea-conseil.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -295,7 +296,8 @@ if (empty($reshook))
         if (! $error)
         {
             $result = $object->insertExtraFields();
-            if ($result < 0) $error++;
+            if ($result < 0) $errors = $object->errors;
+
         }
         if ($error) $action = 'edit_extras';
     }

From 03f7df88c622708db3d8f95b18317d29f3e4823c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 11 Mar 2018 00:05:32 +0100
Subject: [PATCH 2/2] Update card.php

---
 htdocs/societe/card.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index b5d643abc98..42abde0e09b 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -292,12 +292,15 @@ if (empty($reshook))
         // Fill array 'array_options' with data from update form
         $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
         $ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute'));
-        if ($ret < 0) $error++;
+        if ($ret < 0) { $error++; }
         if (! $error)
         {
             $result = $object->insertExtraFields();
-            if ($result < 0) $errors = $object->errors;
-
+            if ($result < 0) 
+	    {
+		    $error++;
+		    $errors = $object->errors;
+	    }
         }
         if ($error) $action = 'edit_extras';
     }