Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into

develop
This commit is contained in:
Laurent Destailleur
2025-11-25 21:00:16 +01:00
8 changed files with 56 additions and 33 deletions

View File

@@ -494,7 +494,7 @@ if ($action == 'encrypt') {
$sql .= " AND te.".$attributekey." IS NOT NULL";
$sql .= " AND te.".$attributekey." <> ''";
if ($extrafields->attributes[$elementtype]['entityid'][$attributekey] == $conf->entity) {
$sql .= " AND t.entity = ".getEntity($arrayofelement['table_element'], 0);
$sql .= " AND t.entity = ".getEntity($arrayofelement['element'], 0);
}
//print $sql;