| '.$langs->trans('Margins').' | '; print ''.$langs->trans('SellingPrice').' | '; diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 68087c31e80..dfa724e7c64 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -951,7 +951,13 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r { $morehtmlleft.='|||||||||||||||||||||||||||||||||||||||||||||||||||
| '.$langs->trans("Ref").' | '; + print $form->showrefnav($act, 'id', $linkback, ($user->societe_id?0:1), 'id', 'ref', ''); + print ' | |||||||||||||||||||||||||||||||||||||||||||||||||||
| '.$langs->trans("Ref").' | '; - print $form->showrefnav($act, 'id', $linkback, ($user->societe_id?0:1), 'id', 'ref', ''); - print ' | ||
| '.$langs->trans("Type").' | '.$act->type.' | ||
| '.$langs->trans("Type").' | '.$act->type.' | ||
| '.$langs->trans("Title").' | '.$act->label.' | ||
| '.$langs->trans("EventOnFullDay").' | '.yn($act->fulldayevent, 3).' | ||
| '.$langs->trans("DateActionStart").' | '; + if (! $act->fulldayevent) print dol_print_date($act->datep,'dayhour'); + else print dol_print_date($act->datep,'day'); + if ($act->percentage == 0 && $act->datep && $act->datep < ($now - $delay_warning)) print img_warning($langs->trans("Late")); + print ' | '; + print '||
| '.$langs->trans("DateActionEnd").' | '; + if (! $act->fulldayevent) print dol_print_date($act->datef,'dayhour'); + else print dol_print_date($act->datef,'day'); + if ($act->percentage > 0 && $act->percentage < 100 && $act->datef && $act->datef < ($now- $delay_warning)) print img_warning($langs->trans("Late")); + print ' | ||
| '.$langs->trans("Status").' / '.$langs->trans("Percentage").' | '; + print $act->getLibStatut(4); + print ' | ||
| '.$langs->trans("Location").' | '.$act->location.' | ||
| '.$langs->trans("ActionAffectedTo").' | ';
+ $listofuserid=array();
+ if (empty($donotclearsession))
+ {
+ if ($act->userownerid > 0) $listofuserid[$act->userownerid]=array('id'=>$act->userownerid,'transparency'=>$act->transparency); // Owner first
+ if (! empty($act->userassigned)) // Now concat assigned users
+ {
+ // Restore array with key with same value than param 'id'
+ $tmplist1=$act->userassigned; $tmplist2=array();
+ foreach($tmplist1 as $key => $val)
+ {
+ if ($val['id'] && $val['id'] != $act->userownerid) $listofuserid[$val['id']]=$val;
+ }
+ }
+ $_SESSION['assignedtouser']=json_encode($listofuserid);
+ }
+ else
+ {
+ if (!empty($_SESSION['assignedtouser']))
+ {
+ $listofuserid=json_decode($_SESSION['assignedtouser'], true);
+ }
+ }
+ print ' ';
+ print $form->select_dolusers_forevent('view', 'assignedtouser', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+ print ' ';
+ if (in_array($user->id,array_keys($listofuserid)))
+ {
+ print '';
+ print $langs->trans("MyAvailability").': '.(($act->userassigned[$user->id]['transparency'] > 0)?$langs->trans("Busy"):$langs->trans("Available")); // We show nothing if event is assigned to nobody
+ print ' ';
+ }
+ print ' | ||
';
-
- print '';
+
+ print '';
print '';
-
+
// Alias name (commercial, trademark or alias name)
- print '
';
-
- print '
';
-
- dol_fiche_end();
-
- $object = $savobject;
- }
+
+ print '| '.$langs->trans('AliasNames').' | '; + print ' | ||
| ' . $langs->trans('AliasNames') . ' | '; print $socstatic->name_alias; print " | ||
'; + // Show list of resource links - foreach ($object->available_resources as $modresources => $resources) - { + foreach ($object->available_resources as $modresources => $resources) + { $resources=(array) $resources; // To be sure $resources is an array foreach($resources as $resource_obj) { @@ -327,13 +407,12 @@ else // If we have a specific template we use it if(file_exists(dol_buildpath($path.'/core/tpl/resource_'.$element_prop['element'].'_add.tpl.php'))) { - $res=include dol_buildpath($path.'/core/tpl/resource_'.$element_prop['element'].'_add.tpl.php'); + $res=include dol_buildpath($path.'/core/tpl/resource_'.$element_prop['element'].'_add.tpl.php'); } else { - $res=include DOL_DOCUMENT_ROOT . '/core/tpl/resource_add.tpl.php'; + $res=include DOL_DOCUMENT_ROOT . '/core/tpl/resource_add.tpl.php'; } - //var_dump($element_id); if ($mode != 'add' || $resource_obj != $resource_type) { diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index e8692055b31..1d860f5f378 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -2452,6 +2452,9 @@ div.refidno { font-size: px; line-height: 21px; } +div.refidno form { + display: inline-block; +} div.pagination { float: right; diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 3b8c7f38097..1db2b6fe7a3 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -2342,6 +2342,9 @@ div.refidno { font-size: px; line-height: 21px; } +div.refidno form { + display: inline-block; +} div.pagination { float: right;