diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index dcc7949340e..d7841677536 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -798,19 +798,19 @@ else
print '';
// Note Public
- print '
| ';
+ print ' |
| ';
$doleditor = new DolEditor('note_public', $object->note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
print $doleditor->Create(1);
print ' |
';
// Note Private
- print ' | ';
+ print ' |
| ';
$doleditor = new DolEditor('note_private', $object->note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
print $doleditor->Create(1);
print ' |
';
// Statut
- print '| '.$langs->trans("Status").' | ';
+ print '
| '.$langs->trans("Status").' | ';
print '';
print $object->getLibStatut(5);
print ' |
';
@@ -1025,16 +1025,16 @@ else
print '';
// Note Public
- print '| '.$langs->trans("NotePublic").' | ';
+ print ' |
| '.$langs->trans("NotePublic").' | ';
print nl2br($object->note_public);
print ' |
';
// Note Private
- print '| '.$langs->trans("NotePrivate").' | ';
+ print ' |
| '.$langs->trans("NotePrivate").' | ';
print nl2br($object->note_private);
// Statut
- print ' |
| '.$langs->trans("Status").' | ';
+ print '
| '.$langs->trans("Status").' | ';
print '';
print $object->getLibStatut(5);
print ' | ';
diff --git a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
old mode 100755
new mode 100644
diff --git a/htdocs/core/modules/expensereport/modules_expensereport.php b/htdocs/core/modules/expensereport/modules_expensereport.php
old mode 100755
new mode 100644
diff --git a/htdocs/core/modules/modExpenseReport.class.php b/htdocs/core/modules/modExpenseReport.class.php
old mode 100755
new mode 100644
diff --git a/htdocs/expensereport/ajax/ajaxprojet.php b/htdocs/expensereport/ajax/ajaxprojet.php
old mode 100755
new mode 100644
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
old mode 100755
new mode 100644
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
old mode 100755
new mode 100644
diff --git a/htdocs/expensereport/export_csv.php b/htdocs/expensereport/export_csv.php
old mode 100755
new mode 100644
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
old mode 100755
new mode 100644
diff --git a/htdocs/expensereport/stats/index.php b/htdocs/expensereport/stats/index.php
old mode 100755
new mode 100644
diff --git a/htdocs/expensereport/synchro_compta.php b/htdocs/expensereport/synchro_compta.php
old mode 100755
new mode 100644
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
old mode 100755
new mode 100644
diff --git a/htdocs/includes/restler/iCache.php b/htdocs/includes/restler/iCache.php
old mode 100755
new mode 100644
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
old mode 100755
new mode 100644
diff --git a/htdocs/theme/eldy/img/logout.png b/htdocs/theme/eldy/img/logout.png
index 26ae717bc1a..e2e2e5d973d 100644
Binary files a/htdocs/theme/eldy/img/logout.png and b/htdocs/theme/eldy/img/logout.png differ
diff --git a/htdocs/theme/eldy/img/printer.png b/htdocs/theme/eldy/img/printer.png
index 3a5e7b2dfa0..6e8bcbf98a5 100644
Binary files a/htdocs/theme/eldy/img/printer.png and b/htdocs/theme/eldy/img/printer.png differ
diff --git a/htdocs/theme/eldy/img/search.png b/htdocs/theme/eldy/img/search.png
index 4c52b1e401e..f0d4e975775 100644
Binary files a/htdocs/theme/eldy/img/search.png and b/htdocs/theme/eldy/img/search.png differ
diff --git a/htdocs/theme/eldy/img/searchclear.png b/htdocs/theme/eldy/img/searchclear.png
index 203a85e10c4..12437f84823 100644
Binary files a/htdocs/theme/eldy/img/searchclear.png and b/htdocs/theme/eldy/img/searchclear.png differ
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 3914a8d11f8..d024f99a87d 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -119,7 +119,8 @@ if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
$conf->global->THEME_ELDY_VERMENU_BACK1='255,255,255'; // vmenu
$conf->global->THEME_ELDY_VERMENU_BACK1b='230,232,232'; // vmenu (not menu)
$conf->global->THEME_ELDY_VERMENU_BACK2='240,240,240';
- $conf->global->THEME_ELDY_BACKTITLE1='140,160,185'; // title of arrays
+ $conf->global->THEME_ELDY_BACKTITLE1='140,160,185'; // title of arrays TO MATCH ELDY
+ //$conf->global->THEME_ELDY_BACKTITLE1='240,240,240'; // title of arrays TO MATCH BOOTSTRAP
$conf->global->THEME_ELDY_BACKTITLE2='230,230,230';
$conf->global->THEME_ELDY_BACKTABCARD1='255,255,255';
$conf->global->THEME_ELDY_BACKTABCARD2='210,210,210'; // card
@@ -557,23 +558,27 @@ margin : 0px auto;
+div#id-top {
+ height: px;
+ background: rgb();
+
+ background-image: linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
+ background-image: -o-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
+ background-image: -moz-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
+ background-image: -webkit-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
+ background-image: -ms-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
+ background-image: -webkit-gradient( linear, left top, left bottom, color-stop(0, rgba(255,255,255,.3)), color-stop(1, rgba(0,0,0,.3)) );
+}
+
div#tmenu_tooltip {
display:none;
height: px;
padding-: 100px;
- background: ;
- box-shadow: 0 0 6px rgba(0, 0, 0, .4) !important;
- background-image: linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(128,128,128,.3) 100%);
- background-image: -o-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(128,128,128,.3) 100%);
- background-image: -moz-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(128,128,128,.3) 100%);
- background-image: -webkit-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(128,128,128,.3) 100%);
- background-image: -ms-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(128,128,128,.3) 100%);
- background-image: -webkit-gradient( linear, left top, left bottom, color-stop(0, rgba(255,255,255,.3)), color-stop(1, rgba(128,128,128,.3)) );
}
@@ -630,7 +635,7 @@ ul.tmenu { /* t r b l */
padding: 0px 0px 0px 0px;
margin: 0px 0px 0px 0px;
list-style: none;
- box-shadow: 0 0 6px rgba(0, 0, 0, .4) !important;
+ /* box-shadow: 0 0 6px rgba(0, 0, 0, .4) !important; */
}
ul.tmenu li {
background: rgb();
@@ -922,6 +927,9 @@ div.login_block {
display: none;
}
+div.login_block a {
+ color: #fff;
+}
div.login_block table {
display: inline;
}
@@ -1720,6 +1728,10 @@ table.noborder, table.formdoc, div.noborder {
border-collapse: separate !important;
border-spacing: 0px;
+ border-top-width: 1px;
+ border-top-color: #CCC;
+ border-top-style: solid;
+
border-right-width: 1px;
border-right-color: #CCC;
border-right-style: solid;
@@ -1788,6 +1800,10 @@ table.liste {
border-collapse: collapse;
border-top-color: #FEFEFE;
+ border-top-width: 1px;
+ border-top-color: #CCC;
+ border-top-style: solid;
+
border-right-width: 1px;
border-right-color: #CCC;
border-right-style: solid;
@@ -1896,6 +1912,22 @@ div.liste_titre .tagtd {
}
div.liste_titre {
min-height: 26px !important; /* We cant use height because it's a div and it should be higher if content is more. but min-height doe not work either for div */
+
+ padding-left: 3px;
+ padding-top: 2px;
+ padding-bottom: 2px;
+
+ border-right-width: 1px;
+ border-right-color: #CCC;
+ border-right-style: solid;
+
+ border-left-width: 1px;
+ border-left-color: #CCC;
+ border-left-style: solid;
+
+ border-top-width: 1px;
+ border-top-color: #CCC;
+ border-top-style: solid;
}
tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, table.dataTable.tr
{
@@ -1903,15 +1935,19 @@ tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, tabl
}
div.liste_titre, tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, table.dataTable thead tr
{
- background: rgb();
- background-repeat: repeat-x;
+ /* TO MATCH BOOTSTRAP */
+ /*background: #ddd;
+ color: #000 !important;*/
+ /* TO MATCH ELDY */
+ background: rgb();
background-image: -o-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%);
background-image: -moz-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%);
background-image: -webkit-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%);
background-image: -ms-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%);
background-image: linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%);
- font-weight: bold;
+
+ font-weight: bold;
color: #;
font-family: ;
@@ -1926,7 +1962,7 @@ tr.liste_titre th, th.liste_titre, tr.liste_titre td, td.liste_titre, form.liste
{
font-family: ;
font-weight: bold;
- text-shadow: 1px 0px 1px #;
+ /* text-shadow: 1px 0px 1px #; */
vertical-align: middle;
}
tr.liste_titre th a, th.liste_titre a, tr.liste_titre td a, td.liste_titre a, form.liste_titre div a, div.liste_titre a {
@@ -1936,16 +1972,13 @@ tr.liste_titre th a, th.liste_titre a, tr.liste_titre td a, td.liste_titre a, fo
text-shadow: none !important;
color: #;
}
-div.liste_titre {
- padding-left: 3px;
-}
tr.liste_titre_sel th, th.liste_titre_sel, tr.liste_titre_sel td, td.liste_titre_sel, form.liste_titre_sel div
{
font-family: ;
font-weight: normal;
border-bottom: 1px solid #FDFFFF;
text-decoration: underline;
- text-shadow: 1px 0px 1px #;
+ /* text-shadow: 1px 0px 1px #; */
}
input.liste_titre {
background: transparent;
@@ -2023,18 +2056,21 @@ div.tabBar .noborder {
tr.box_titre {
height: 26px;
- background: rgb();
- background-repeat: repeat-x;
- background-image: linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
- background-image: -o-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
- background-image: -moz-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
- background-image: -webkit-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
- background-image: -ms-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%);
- background-image: -webkit-gradient( linear, left top, left bottom, color-stop(0, rgba(255,255,255,.3)), color-stop(1, rgba(0,0,0,.3)) );
+ /* TO MATCH BOOTSTRAP */
+ /*background: #ddd;
+ color: #000 !important;*/
- color: #;
- text-shadow: 1px 0px 1px #;
+ /* TO MATCH ELDY */
+ background: rgb();
+ background-image: -o-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%);
+ background-image: -moz-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%);
+ background-image: -webkit-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%);
+ background-image: -ms-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%);
+ background-image: linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%);
+
+ color: #;
+ // text-shadow: 1px 0px 1px #;
font-family: , sans-serif;
font-weight: bold;
border-bottom: 1px solid #FDFFFF;
@@ -2278,24 +2314,25 @@ table.valid {
/* ============================================================================== */
#tooltip {
-position: absolute;
-width: px;
-border-top: solid 1px #BBBBBB;
-border-: solid 1px #BBBBBB;
-border-: solid 1px #444444;
-border-bottom: solid 1px #444444;
-padding: 2px;
-z-index: 3000;
-background-color: #EFCFAA;
-opacity: 1;
--moz-border-radius:6px;
--webkit-border-radius: 6px;
-border-radius: 6px;
+ position: absolute;
+ width: px;
+ border-top: solid 1px #BBBBBB;
+ border-: solid 1px #BBBBBB;
+ border-: solid 1px #444444;
+ border-bottom: solid 1px #444444;
+ padding: 2px;
+ z-index: 3000;
+ background-color: #FFF;
+ opacity: 1;
+ -moz-border-radius:6px;
+ -webkit-border-radius: 6px;
+ border-radius: 6px;
}
#tiptip_content {
- background-color: rgb(252,248,246);
- background-color: rgba(252,248,246,0.95);
+ background-color: rgb(255,255,255);
+ background-color: rgba(255,255,255,0.95);
line-height: 1.4em;
+ min-width: 200px;
}
/* ============================================================================== */
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 1cbeb6e653d..db1758af860 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -723,7 +723,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
print '
';
// Lastname
- print '| '.$langs->trans("Lastname").' | ';
+ print ''.$langs->trans("Lastname").' | ';
print '';
if (! empty($ldap_lastname))
{
@@ -737,7 +737,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
print ' |
';
// Firstname
- print '| '.$langs->trans("Firstname").' | ';
+ print '
| '.$langs->trans("Firstname").' | ';
print '';
if (! empty($ldap_firstname))
{
@@ -751,13 +751,13 @@ if (($action == 'create') || ($action == 'adduserldap'))
print ' |
';
// Position/Job
- print '| '.$langs->trans("PostOrFunction").' | ';
+ print '
| '.$langs->trans("PostOrFunction").' | ';
print '';
print '';
print ' |
';
// Login
- print '| '.$langs->trans("Login").' | ';
+ print '
| '.$langs->trans("Login").' | ';
print '';
if (! empty($ldap_login))
{
@@ -784,7 +784,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
$password=$generated_password;
// Password
- print ' |
| '.$langs->trans("Password").' | ';
+ print '
| '.$langs->trans("Password").' | ';
print '';
if (! empty($ldap_sid))
{
@@ -808,7 +808,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
// Administrator
if (! empty($user->admin))
{
- print ' |
| '.$langs->trans("Administrator").' | ';
+ print '
| '.$langs->trans("Administrator").' | ';
print '';
print $form->selectyesno('admin',GETPOST('admin'),1);
@@ -850,13 +850,13 @@ if (($action == 'create') || ($action == 'adduserldap'))
}
// Type
- print ' |
| '.$langs->trans("Type").' | ';
+ print '
| '.$langs->trans("Type").' | ';
print '';
print $form->textwithpicto($langs->trans("Internal"),$langs->trans("InternalExternalDesc"));
print ' |
';
// Tel
- print '| '.$langs->trans("PhonePro").' | ';
+ print '
| '.$langs->trans("PhonePro").' | ';
print '';
if (! empty($ldap_phone))
{
@@ -870,7 +870,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
print ' |
';
// Tel portable
- print '| '.$langs->trans("PhoneMobile").' | ';
+ print '
| '.$langs->trans("PhoneMobile").' | ';
print '';
if (! empty($ldap_mobile))
{
@@ -884,7 +884,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
print ' |
';
// Fax
- print '| '.$langs->trans("Fax").' | ';
+ print '
| '.$langs->trans("Fax").' | ';
print '';
if (! empty($ldap_fax))
{
@@ -900,7 +900,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
// Skype
if (! empty($conf->skype->enabled))
{
- print ' |
| '.$langs->trans("Skype").' | ';
+ print '
| '.$langs->trans("Skype").' | ';
print '';
if (! empty($ldap_skype))
{
@@ -915,7 +915,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
}
// EMail
- print ' |
| global->USER_MAIL_REQUIRED)?' class="fieldrequired"':'').'>'.$langs->trans("EMail").' | ';
+ print '
| global->USER_MAIL_REQUIRED)?' class="fieldrequired"':'').'>'.$langs->trans("EMail").' | ';
print '';
if (! empty($ldap_mail))
{
@@ -929,7 +929,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
print ' |
';
// Signature
- print '| '.$langs->trans("Signature").' | ';
+ print '
| '.$langs->trans("Signature").' | ';
print '';
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
$doleditor=new DolEditor('signature',GETPOST('signature'),'',138,'dolibarr_mailings','In',true,true,empty($conf->global->FCKEDITOR_ENABLE_USERSIGN)?0:1,ROWS_4,90);
@@ -941,7 +941,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
{
if (empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity && is_object($mc))
{
- print " |
".'| '.$langs->trans("Entity").' | ';
+ print "
".'| '.$langs->trans("Entity").' | ';
print "".$mc->select_entities($conf->entity);
print " |
\n";
}
@@ -952,7 +952,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
}
// Hierarchy
- print '| '.$langs->trans("HierarchicalResponsible").' | ';
+ print '
| '.$langs->trans("HierarchicalResponsible").' | ';
print '';
print $form->select_dolusers($object->fk_user,'fk_user',1,array($object->id),0,'',0,$conf->entity);
print ' | ';
@@ -963,21 +963,21 @@ if (($action == 'create') || ($action == 'adduserldap'))
$langs->load("salaries");
// THM
- print '
| '.$langs->trans("THM").' | ';
+ print '
| '.$langs->trans("THM").' | ';
print '';
print '';
print ' | ';
print "
\n";
// TJM
- print '| '.$langs->trans("TJM").' | ';
+ print '
| '.$langs->trans("TJM").' | ';
print '';
print '';
print ' | ';
print "
\n";
// Salary
- print '| '.$langs->trans("Salary").' | ';
+ print '
| '.$langs->trans("Salary").' | ';
print '';
print '';
print ' | ';
@@ -985,7 +985,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
}
// Weeklyhours
- print '
| '.$langs->trans("WeeklyHours").' | ';
+ print '
| '.$langs->trans("WeeklyHours").' | ';
print '';
print '';
print ' | ';
@@ -994,7 +994,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
// Accountancy code
if ($conf->salaries->enabled)
{
- print '
| '.$langs->trans("AccountancyCode").' | ';
+ print '
| '.$langs->trans("AccountancyCode").' | ';
print '';
print '';
print ' |
';
@@ -1003,14 +1003,14 @@ if (($action == 'create') || ($action == 'adduserldap'))
// User color
if (! empty($conf->agenda->enabled))
{
- print '| '.$langs->trans("ColorUser").' | ';
+ print '
| '.$langs->trans("ColorUser").' | ';
print '';
print $formother->selectColor(GETPOST('color')?GETPOST('color'):$object->color, 'color', 'usercolorconfig', 1, '', 'hideifnotset');
print ' |
';
}
// Note
- print '| ';
+ print ' |
| ';
print $langs->trans("Note");
print ' | ';
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
@@ -1149,7 +1149,7 @@ else
print '';
// Ref
- print '| '.$langs->trans("Ref").' | ';
+ print ' | '.$langs->trans("Ref").' | ';
print '';
print $form->showrefnav($object,'id','',$user->rights->user->user->lire || $user->admin);
print ' | ';
@@ -1163,7 +1163,7 @@ else
if (! empty($conf->agenda->enabled)) $rowspan++;
// Lastname
- print ' | '.$langs->trans("Lastname").' | ';
+ print ' | '.$langs->trans("Lastname").' | ';
print ''.$object->lastname.' | ';
// Photo
@@ -1174,17 +1174,17 @@ else
print ' '."\n";
// Firstname
- print '| '.$langs->trans("Firstname").' | ';
+ print ' | '.$langs->trans("Firstname").' | ';
print ''.$object->firstname.' | ';
print ' '."\n";
// Position/Job
- print '| '.$langs->trans("PostOrFunction").' | ';
+ print ' | '.$langs->trans("PostOrFunction").' | ';
print ''.$object->job.' | ';
print ' '."\n";
// Login
- print '| '.$langs->trans("Login").' | ';
+ print ' | '.$langs->trans("Login").' | ';
if (! empty($object->ldap_sid) && $object->statut==0)
{
print ''.$langs->trans("LoginAccountDisableInDolibarr").' | ';
@@ -1196,7 +1196,7 @@ else
print ' '."\n";
// Password
- print '| '.$langs->trans("Password").' | ';
+ print ' | '.$langs->trans("Password").' | ';
if (! empty($object->ldap_sid))
{
if ($passDoNotExpire)
@@ -1230,7 +1230,7 @@ else
print ' '."\n";
// Administrator
- print '| '.$langs->trans("Administrator").' | ';
+ print ' | | '.$langs->trans("Administrator").' | ';
if (! empty($conf->multicompany->enabled) && $object->admin && ! $object->entity)
{
print $form->textwithpicto(yn($object->admin),$langs->trans("SuperAdministratorDesc"),1,"superadmin");
@@ -1246,7 +1246,7 @@ else
print ' | '."\n";
// Type
- print '| '.$langs->trans("Type").' | ';
+ print ' | | '.$langs->trans("Type").' | ';
$type=$langs->trans("Internal");
if ($object->societe_id) $type=$langs->trans("External");
print $form->textwithpicto($type,$langs->trans("InternalExternalDesc"));
@@ -1256,46 +1256,46 @@ else
// Ldap sid
if ($object->ldap_sid)
{
- print ' | | '.$langs->trans("Type").' | ';
+ print ' | | '.$langs->trans("Type").' | ';
print $langs->trans("DomainUser",$ldap->domainFQDN);
print ' | '."\n";
}
// Tel pro
- print '| '.$langs->trans("PhonePro").' | ';
+ print ' | '.$langs->trans("PhonePro").' | ';
print ''.dol_print_phone($object->office_phone,'',0,0,1).' | ';
print ' '."\n";
// Tel mobile
- print '| '.$langs->trans("PhoneMobile").' | ';
+ print ' | '.$langs->trans("PhoneMobile").' | ';
print ''.dol_print_phone($object->user_mobile,'',0,0,1).' | ';
print ' '."\n";
// Fax
- print '| '.$langs->trans("Fax").' | ';
+ print ' | '.$langs->trans("Fax").' | ';
print ''.dol_print_phone($object->office_fax,'',0,0,1).' | ';
print ' '."\n";
// Skype
if (! empty($conf->skype->enabled))
{
- print '| '.$langs->trans("Skype").' | ';
+ print ' | '.$langs->trans("Skype").' | ';
print ''.dol_print_skype($object->skype,0,0,1).' | ';
print " \n";
}
// EMail
- print '| '.$langs->trans("EMail").' | ';
+ print ' | '.$langs->trans("EMail").' | ';
print ''.dol_print_email($object->email,0,0,1).' | ';
print " \n";
// Signature
- print '| '.$langs->trans('Signature').' | ';
+ print ' | | '.$langs->trans('Signature').' | ';
print dol_htmlentitiesbr($object->signature);
print " | \n";
// Hierarchy
- print '| '.$langs->trans("HierarchicalResponsible").' | ';
+ print ' | '.$langs->trans("HierarchicalResponsible").' | ';
print '';
if (empty($object->fk_user)) print $langs->trans("None");
else {
@@ -1311,21 +1311,21 @@ else
$langs->load("salaries");
// THM
- print ' | | '.$langs->trans("THM").' | ';
+ print ' | '.$langs->trans("THM").' | ';
print '';
print ($object->thm!=''?price($object->thm,'',$langs,1,-1,-1,$conf->currency):'');
print ' | ';
print " \n";
// TJM
- print '| '.$langs->trans("TJM").' | ';
+ print ' | '.$langs->trans("TJM").' | ';
print '';
print ($object->tjm!=''?price($object->tjm,'',$langs,1,-1,-1,$conf->currency):'');
print ' | ';
print " \n";
// Salary
- print '| '.$langs->trans("Salary").' | ';
+ print ' | '.$langs->trans("Salary").' | ';
print '';
print ($object->salary!=''?price($object->salary,'',$langs,1,-1,-1,$conf->currency):'');
print ' | ';
@@ -1333,7 +1333,7 @@ else
}
// Weeklyhours
- print ' | '.$langs->trans("WeeklyHours").' | ';
+ print ' | '.$langs->trans("WeeklyHours").' | ';
print '';
print price2num($object->weeklyhours);
print ' | ';
@@ -1342,14 +1342,14 @@ else
// Accountancy code
if ($conf->salaries->enabled)
{
- print ' | '.$langs->trans("AccountancyCode").' | ';
+ print ' | '.$langs->trans("AccountancyCode").' | ';
print ''.$object->accountancy_code.' | ';
}
// Color user
if (! empty($conf->agenda->enabled))
{
- print ' | '.$langs->trans("ColorUser").' | ';
+ print ' | '.$langs->trans("ColorUser").' | ';
print '';
if ($object->color) print '';
print ' | ';
@@ -1357,23 +1357,23 @@ else
}
// Status
- print ' | '.$langs->trans("Status").' | ';
+ print ' | '.$langs->trans("Status").' | ';
print '';
print $object->getLibStatut(4);
print ' | ';
print ' '."\n";
- print '| '.$langs->trans("LastConnexion").' | ';
+ print ' | '.$langs->trans("LastConnexion").' | ';
print ''.dol_print_date($object->datelastlogin,"dayhour").' | ';
print " \n";
- print '| '.$langs->trans("PreviousConnexion").' | ';
+ print ' | '.$langs->trans("PreviousConnexion").' | ';
print ''.dol_print_date($object->datepreviouslogin,"dayhour").' | ';
print " \n";
if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file->main_authentication) && ! empty($conf->global->MAIN_OPENIDURL_PERUSER))
{
- print '| '.$langs->trans("OpenIDURL").' | ';
+ print ' | '.$langs->trans("OpenIDURL").' | ';
print ''.$object->openid.' | ';
print " \n";
}
@@ -1381,7 +1381,7 @@ else
// Company / Contact
if (! empty($conf->societe->enabled))
{
- print '| '.$langs->trans("LinkToCompanyContact").' | ';
+ print ' | '.$langs->trans("LinkToCompanyContact").' | ';
print '';
if (isset($object->societe_id) && $object->societe_id > 0)
{
@@ -1409,7 +1409,7 @@ else
if (! empty($conf->adherent->enabled))
{
$langs->load("members");
- print ' | | '.$langs->trans("LinkedToDolibarrMember").' | ';
+ print ' | '.$langs->trans("LinkedToDolibarrMember").' | ';
print '';
if ($object->fk_member)
{
@@ -1432,7 +1432,7 @@ else
{
if (! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
{
- print ' | | '.$langs->trans("Entity").' | ';
+ print ' | | '.$langs->trans("Entity").' | ';
if (empty($object->entity))
{
print $langs->trans("AllEntities");
@@ -1578,7 +1578,7 @@ else
{
if ($conf->entity == 1 && $conf->multicompany->transverse_mode)
{
- print ' | '.$langs->trans("Entity").' | ';
+ print ''.$langs->trans("Entity").' | ';
print "".$mc->select_entities($conf->entity);
}
else
@@ -1691,7 +1691,7 @@ else
print '';
- print '| '.$langs->trans("Ref").' | ';
+ print ' | '.$langs->trans("Ref").' | ';
print '';
print $object->id;
print ' | ';
@@ -1699,7 +1699,7 @@ else
// Lastname
print " ";
- print '| '.$langs->trans("Lastname").' | ';
+ print ''.$langs->trans("Lastname").' | ';
print '';
if ($caneditfield && !$object->ldap_sid)
{
@@ -1728,7 +1728,7 @@ else
print ' | ';
// Firstname
- print "".'| '.$langs->trans("Firstname").' | ';
+ print " ".'| '.$langs->trans("Firstname").' | ';
print '';
if ($caneditfield && !$object->ldap_sid)
{
@@ -1742,7 +1742,7 @@ else
print ' | ';
// Position/Job
- print '| '.$langs->trans("PostOrFunction").' | ';
+ print ' | '.$langs->trans("PostOrFunction").' | ';
print '';
if ($caneditfield)
{
@@ -1756,7 +1756,7 @@ else
print ' | ';
// Login
- print "".'| '.$langs->trans("Login").' | ';
+ print " ".'| '.$langs->trans("Login").' | ';
print '';
if ($user->admin && !$object->ldap_sid)
{
@@ -1771,7 +1771,7 @@ else
print ' | ';
// Pass
- print '| '.$langs->trans("Password").' | ';
+ print ' | '.$langs->trans("Password").' | ';
print '';
if ($object->ldap_sid)
{
@@ -1793,7 +1793,7 @@ else
print " | \n";
// Administrator
- print '| '.$langs->trans("Administrator").' | ';
+ print ' | '.$langs->trans("Administrator").' | ';
if ($object->societe_id > 0)
{
$langs->load("admin");
@@ -1870,7 +1870,7 @@ else
}
// Type
- print ' | '.$langs->trans("Type").' | ';
+ print ' | '.$langs->trans("Type").' | ';
print '';
if ($user->id == $object->id || ! $user->admin)
{
@@ -1889,7 +1889,7 @@ else
print ' | ';
// Tel pro
- print "".'| '.$langs->trans("PhonePro").' | ';
+ print " ".'| '.$langs->trans("PhonePro").' | ';
print '';
if ($caneditfield && empty($object->ldap_sid))
{
@@ -1903,7 +1903,7 @@ else
print ' | ';
// Tel mobile
- print "".'| '.$langs->trans("PhoneMobile").' | ';
+ print " ".'| '.$langs->trans("PhoneMobile").' | ';
print '';
if ($caneditfield && empty($object->ldap_sid))
{
@@ -1917,7 +1917,7 @@ else
print ' | ';
// Fax
- print "".'| '.$langs->trans("Fax").' | ';
+ print " ".'| '.$langs->trans("Fax").' | ';
print '';
if ($caneditfield && empty($object->ldap_sid))
{
@@ -1933,7 +1933,7 @@ else
// Skype
if (! empty($conf->skype->enabled))
{
- print ' | | '.$langs->trans("Skype").' | ';
+ print ' | '.$langs->trans("Skype").' | ';
print '';
if ($caneditfield && empty($object->ldap_sid))
{
@@ -1948,7 +1948,7 @@ else
}
// EMail
- print " | ".'| global->USER_MAIL_REQUIRED)?' class="fieldrequired"':'').'>'.$langs->trans("EMail").' | ';
+ print " ".'| global->USER_MAIL_REQUIRED)?' class="fieldrequired"':'').'>'.$langs->trans("EMail").' | ';
print '';
if ($caneditfield && empty($object->ldap_sid))
{
@@ -1962,7 +1962,7 @@ else
print ' | ';
// Signature
- print "".'| '.$langs->trans("Signature").' | ';
+ print " ".'| '.$langs->trans("Signature").' | ';
print '';
if ($caneditfield)
{
@@ -1979,7 +1979,7 @@ else
// OpenID url
if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file->main_authentication) && ! empty($conf->global->MAIN_OPENIDURL_PERUSER))
{
- print " | ".'| '.$langs->trans("OpenIDURL").' | ';
+ print " ".'| '.$langs->trans("OpenIDURL").' | ';
print '';
if ($caneditfield)
{
@@ -1994,7 +1994,7 @@ else
}
// Hierarchy
- print ' | | '.$langs->trans("HierarchicalResponsible").' | ';
+ print ' | '.$langs->trans("HierarchicalResponsible").' | ';
print '';
if ($caneditfield)
{
@@ -2015,21 +2015,21 @@ else
$langs->load("salaries");
// THM
- print ' | | '.$langs->trans("THM").' | ';
+ print ' | '.$langs->trans("THM").' | ';
print '';
print '';
print ' | ';
print " \n";
// TJM
- print '| '.$langs->trans("TJM").' | ';
+ print ' | '.$langs->trans("TJM").' | ';
print '';
print '';
print ' | ';
print " \n";
// Salary
- print '| '.$langs->trans("Salary").' | ';
+ print ' | '.$langs->trans("Salary").' | ';
print '';
print '';
print ' | ';
@@ -2037,7 +2037,7 @@ else
}
// Weeklyhours
- print ' | '.$langs->trans("WeeklyHours").' | ';
+ print ' | '.$langs->trans("WeeklyHours").' | ';
print '';
print '';
print ' | ';
@@ -2047,7 +2047,7 @@ else
if ($conf->salaries->enabled)
{
print " ";
- print '| '.$langs->trans("AccountancyCode").' | ';
+ print ''.$langs->trans("AccountancyCode").' | ';
print '';
if ($caneditfield)
{
@@ -2065,14 +2065,14 @@ else
// User color
if (! empty($conf->agenda->enabled))
{
- print ' | | '.$langs->trans("ColorUser").' | ';
+ print ' | '.$langs->trans("ColorUser").' | ';
print '';
print $formother->selectColor(GETPOST('color')?GETPOST('color'):$object->color, 'color', 'usercolorconfig', 1, '', 'hideifnotset');
print ' | ';
}
// Status
- print '| '.$langs->trans("Status").' | ';
+ print ' | '.$langs->trans("Status").' | ';
print '';
print $object->getLibStatut(4);
print ' | ';
@@ -2080,7 +2080,7 @@ else
// Company / Contact
if (! empty($conf->societe->enabled))
{
- print '| '.$langs->trans("LinkToCompanyContact").' | ';
+ print ' | '.$langs->trans("LinkToCompanyContact").' | ';
print '';
if ($object->societe_id > 0)
{
@@ -2107,7 +2107,7 @@ else
if (! empty($conf->adherent->enabled))
{
$langs->load("members");
- print ' | | '.$langs->trans("LinkedToDolibarrMember").' | ';
+ print ' | '.$langs->trans("LinkedToDolibarrMember").' | ';
print '';
if ($object->fk_member)
{
@@ -2129,7 +2129,7 @@ else
{
if (empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
{
- print " | ".'| '.$langs->trans("Entity").' | ';
+ print " ".'| '.$langs->trans("Entity").' | ';
print "".$mc->select_entities($object->entity, 'entity', '', 0, 1); // last parameter 1 means, show also a choice 0=>'all entities'
print " | \n";
}
| |