lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8133 from atm-quentin/6.0

Browse Source 
FIX unset categorie
This commit is contained in:
Laurent Destailleur 2018-02-08 13:09:52 +01:00 committed by GitHub
commit 371b168db1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
htdocs/societe/card.php
View File

@ -519,7 +519,8 @@ if (empty($reshook))
$error=$object->error; $errors=$object->errors; $error=$object->error; $errors=$object->errors;
} }
} }
// Customer categories association // Customer categories association
$custcats = GETPOST( 'custcats', 'array' ); $custcats = GETPOST( 'custcats', 'array' );
$object->setCategories($custcats, 'customer'); $object->setCategories($custcats, 'customer');
@ -527,7 +528,7 @@ if (empty($reshook))
// Supplier categories association // Supplier categories association
$suppcats = GETPOST('suppcats', 'array'); $suppcats = GETPOST('suppcats', 'array');
$object->setCategories($suppcats, 'supplier'); $object->setCategories($suppcats, 'supplier');
// Logo/Photo save // Logo/Photo save
$dir = $conf->societe->multidir_output[$conf->entity]."/".$object->id."/logos/"; $dir = $conf->societe->multidir_output[$conf->entity]."/".$object->id."/logos/";
$file_OK = is_uploaded_file($_FILES['photo']['tmp_name']); $file_OK = is_uploaded_file($_FILES['photo']['tmp_name']);
@ -634,15 +635,16 @@ if (empty($reshook))
{ {
$error = $object->error; $errors = $object->errors; $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 // Supplier categories association
$categories = GETPOST( 'custcats', 'array' ); $categories = GETPOST('suppcats', 'array');
$object->setCategories($categories, 'customer'); $object->setCategories($categories, 'supplier');
}
// Supplier categories association
$categories = GETPOST('suppcats', 'array');
$object->setCategories($categories, 'supplier');
// Logo/Photo save // Logo/Photo save
$dir = $conf->societe->multidir_output[$object->entity]."/".$object->id."/logos"; $dir = $conf->societe->multidir_output[$object->entity]."/".$object->id."/logos";
$file_OK = is_uploaded_file($_FILES['photo']['tmp_name']); $file_OK = is_uploaded_file($_FILES['photo']['tmp_name']);