Merge pull request #8133 from atm-quentin/6.0

FIX unset categorie
Dolibarr · Feb 8, 2018 · 371b168 · 371b168
2 parents c988d3f + 3f17c92
commit 371b168
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
@@ -519,15 +519,16 @@
                             $error=$object->error; $errors=$object->errors;
                         }
                     }
-
+
+
 					// Customer categories association
 					$custcats = GETPOST( 'custcats', 'array' );
 					$object->setCategories($custcats, 'customer');
 
 					// Supplier categories association
 					$suppcats = GETPOST('suppcats', 'array');
 					$object->setCategories($suppcats, 'supplier');
-
+					
                     // Logo/Photo save
                     $dir     = $conf->societe->multidir_output[$conf->entity]."/".$object->id."/logos/";
                     $file_OK = is_uploaded_file($_FILES['photo']['tmp_name']);
@@ -634,15 +635,16 @@
                 {
                     $error = $object->error; $errors = $object->errors;
                 }
+				// Prevent thirdparty's emptying if a user hasn't rights $user->rights->categorie->lire (in such a case, post of 'custcats' is not defined)
+				if(!empty($user->rights->categorie->lire)){ 
+					// Customer categories association
+					$categories = GETPOST( 'custcats', 'array' );
+					$object->setCategories($categories, 'customer');
 
-				// Customer categories association
-				$categories = GETPOST( 'custcats', 'array' );
-				$object->setCategories($categories, 'customer');
-
-				// Supplier categories association
-				$categories = GETPOST('suppcats', 'array');
-				$object->setCategories($categories, 'supplier');
-
+					// Supplier categories association
+					$categories = GETPOST('suppcats', 'array');
+					$object->setCategories($categories, 'supplier');
+				}
                 // Logo/Photo save
                 $dir     = $conf->societe->multidir_output[$object->entity]."/".$object->id."/logos";
                 $file_OK = is_uploaded_file($_FILES['photo']['tmp_name']);