';
-if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
$totalarray['nbfield']++;
}
@@ -924,7 +925,7 @@ if (!empty($arrayfields['u.statut']['checked'])) {
$totalarray['nbfield']++;
}
// Action column
-if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
$totalarray['nbfield']++;
}
@@ -946,6 +947,7 @@ if (isset($extrafields->attributes[$object->table_element]['computed']) && is_ar
// --------------------------------------------------------------------
$i = 0;
$savnbfield = $totalarray['nbfield'];
+$totalarray = array('val'=>array('u.salary'=>0));
$totalarray['nbfield'] = 0;
$imaxinloop = ($limit ? min($num, $limit) : $num);
while ($i < $imaxinloop) {
@@ -954,7 +956,9 @@ while ($i < $imaxinloop) {
break; // Should not happen
}
- if (empty($obj->country_code)) $obj->country_code = ''; // TODO Add join in select with country table to get country_code
+ if (empty($obj->country_code)) {
+ $obj->country_code = ''; // TODO Add join in select with country table to get country_code
+ }
// Store properties in $object
$object->setVarsFromFetchObj($obj);
@@ -1005,7 +1009,7 @@ while ($i < $imaxinloop) {
$j = 0;
print '
';
// Action column
- if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+ if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
print '
';
if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
$selected = 0;
@@ -1015,6 +1019,9 @@ while ($i < $imaxinloop) {
print '';
}
print '
';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
}
// Login
if (!empty($arrayfields['u.login']['checked'])) {
@@ -1210,6 +1217,16 @@ while ($i < $imaxinloop) {
if (!$i) {
$totalarray['nbfield']++;
}
+ if (!$i) {
+ $totalarray['pos'][$totalarray['nbfield']] = 'u.salary';
+ }
+ if (!isset($totalarray['val'])) {
+ $totalarray['val'] = array();
+ }
+ if (!isset($totalarray['val']['u.salary'])) {
+ $totalarray['val']['u.salary'] = 0;
+ }
+ $totalarray['val']['u.salary'] += $obj->salary;
}
// Date last login
@@ -1259,7 +1276,7 @@ while ($i < $imaxinloop) {
}
}
// Action column
- if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+ if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
print '
';
if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
$selected = 0;
@@ -1269,9 +1286,9 @@ while ($i < $imaxinloop) {
print '';
}
print '
';
- }
- if (!$i) {
- $totalarray['nbfield']++;
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
}
print '
'."\n";
@@ -1298,7 +1315,7 @@ if ($num == 0) {
$db->free($resql);
$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
-$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
print '