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

Fix scrutinizer

Browse Source
This commit is contained in:
Laurent Destailleur 2020-03-06 14:09:00 +01:00
parent c4a9824685
commit dc0e96a6e5
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
htdocs/core/customreports.php
View File

@ -312,7 +312,7 @@ foreach ($object->fields as $key => $val) {
$arrayofmesures['t.'.$key.'-max'] = $langs->trans($val['label']).' <span class="opacitymedium">('.$langs->trans("Maximum").')</span>'; $arrayofmesures['t.'.$key.'-max'] = $langs->trans($val['label']).' <span class="opacitymedium">('.$langs->trans("Maximum").')</span>';
} }
} }
// Add measure from extrafields // Add extrafields to Measures
if ($object->isextrafieldmanaged) { if ($object->isextrafieldmanaged) {
foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) { foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
if (!empty($extrafields->attributes[$object->table_element]['totalizable'][$key])) { if (!empty($extrafields->attributes[$object->table_element]['totalizable'][$key])) {
@ -348,12 +348,13 @@ foreach ($object->fields as $key => $val) {
$arrayofgroupby['t.'.$key] = array('label' => $val['label'], 'position' => (int) $val['position']); $arrayofgroupby['t.'.$key] = array('label' => $val['label'], 'position' => (int) $val['position']);
} }
} }
// Add measure from extrafields }
if ($object->isextrafieldmanaged) { // Add extrafields to Group by
foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) { if ($object->isextrafieldmanaged) {
if ($extrafields->attributes[$object->table_element]['type'][$key] == 'separate') continue; foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
$arrayofgroupby['te.'.$key] = array('label' => $extrafields->attributes[$object->table_element]['label'][$key], 'position' => (int) $extrafields->attributes[$object->table_element]['pos'][$key]); if ($extrafields->attributes[$object->table_element]['type'][$key] == 'separate') continue;
} if (!empty($extrafields->attributes[$object->table_element]['totalizable'][$key])) continue;
$arrayofgroupby['te.'.$key] = array('label' => $extrafields->attributes[$object->table_element]['label'][$key], 'position' => (int) $extrafields->attributes[$object->table_element]['pos'][$key]);
} }
} }
@ -387,13 +388,14 @@ foreach ($object->fields as $key => $val) {
$arrayofxaxis['t.'.$key] = array('label' => $val['label'], 'position' => (int) $val['position']); $arrayofxaxis['t.'.$key] = array('label' => $val['label'], 'position' => (int) $val['position']);
} }
} }
// Add measure from extrafields }
if ($object->isextrafieldmanaged) { // Add extrafields to X-Axis
foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) { if ($object->isextrafieldmanaged) {
if ($extrafields->attributes[$object->table_element]['type'][$key] == 'separate') continue; foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
$arrayofxaxis['te.'.$key] = array('label' => $extrafields->attributes[$object->table_element]['label'][$key], 'position' => (int) $extrafields->attributes[$object->table_element]['pos'][$key]); if ($extrafields->attributes[$object->table_element]['type'][$key] == 'separate') continue;
} if (!empty($extrafields->attributes[$object->table_element]['totalizable'][$key])) continue;
} $arrayofxaxis['te.'.$key] = array('label' => $extrafields->attributes[$object->table_element]['label'][$key], 'position' => (int) $extrafields->attributes[$object->table_element]['pos'][$key]);
}
} }
$arrayofxaxis = dol_sort_array($arrayofxaxis, 'position', 'asc', 1); $arrayofxaxis = dol_sort_array($arrayofxaxis, 'position', 'asc', 1);
@ -425,7 +427,7 @@ if ($mode == 'grid') {
if ($object->isextrafieldmanaged) { if ($object->isextrafieldmanaged) {
foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) { foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
if (!empty($extrafields->attributes[$object->table_element]['totalizable'][$key])) { if (!empty($extrafields->attributes[$object->table_element]['totalizable'][$key])) {
$arrayofyaxis['te.'.$key] = array('label' => $extrafields->attributes[$object->table_element]['label'][$key], 'position' => (int) $extrafields->attributes[$object->table_element]['pos'][$key]); $arrayofyaxis['te.'.$key] = array('label' => $extrafields->attributes[$object->table_element]['label'][$key], 'position' => (int) $extrafields->attributes[$object->table_element]['pos'][$key]);
} }
} }
} }

3
htdocs/core/tpl/contacts.tpl.php
View File

@ -177,7 +177,8 @@ foreach(array('internal', 'external') as $source)
$i = 0; $i = 0;
while ($i < $num) while ($i < $num)
{ {
$entry = ''; $entry = new stdClass();
$entry->id = $tab[$i]['rowid']; $entry->id = $tab[$i]['rowid'];
$entry->type = $tab[$i]['libelle']; $entry->type = $tab[$i]['libelle'];