diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php index 6e4b37498b1..442cd42dcca 100644 --- a/htdocs/core/class/html.formother.class.php +++ b/htdocs/core/class/html.formother.class.php @@ -364,7 +364,7 @@ class FormOther $sql_usr.= " FROM ".MAIN_DB_PREFIX."user as u"; $sql_usr.= " WHERE u.entity IN (0,".$conf->entity.")"; if (empty($user->rights->user->user->lire)) $sql_usr.=" AND u.fk_societe = ".($user->societe_id?$user->societe_id:0); - // Add existing sales representatives of company + // Add existing sales representatives of thirdparty of external user if (empty($user->rights->user->user->lire) && $user->societe_id) { $sql_usr.=" UNION "; diff --git a/htdocs/holiday/index.php b/htdocs/holiday/index.php index 109153357ea..34443bfaa98 100644 --- a/htdocs/holiday/index.php +++ b/htdocs/holiday/index.php @@ -269,6 +269,7 @@ print "\n"; print ''; print ''; print ''; +print ''; // DATE CREATE print ''; @@ -322,10 +323,13 @@ print ' '; print ''; $holiday->selectStatutCP($search_statut); print ''; + // ACTION -print ''; +print ''; print ''; -print "\n"; +print ''; + +print "\n"; // Lines @@ -364,7 +368,7 @@ if (! empty($holiday->holiday)) print ''; $nbopenedday=num_open_day($infos_CP['date_debut'], $infos_CP['date_fin'], 0, 1, $infos_CP['halfday']); print $nbopenedday.' '.$langs->trans('DurationDays'); - print ''.$holidaystatic->LibStatut($infos_CP['statut'],5).''; + print ''.$holidaystatic->LibStatut($infos_CP['statut'],5).''; print ''."\n"; } @@ -374,7 +378,7 @@ if (! empty($holiday->holiday)) if($holiday_payes == '2') { print ''; - print ''.$langs->trans('None').''; + print ''.$langs->trans('None').''; print ''; } diff --git a/htdocs/langs/en_US/ecm.lang b/htdocs/langs/en_US/ecm.lang index 12b65fc1dd5..6fcb80bac2a 100644 --- a/htdocs/langs/en_US/ecm.lang +++ b/htdocs/langs/en_US/ecm.lang @@ -53,4 +53,4 @@ CannotRemoveDirectoryContainsFiles=Removed not possible because it contains some ECMFileManager=File manager ECMSelectASection=Select a directory on left tree... DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Refresh" button first to synchronize disk and database to get content of this directory. - \ No newline at end of file +