diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 56fb713ae0c..15394c81a3a 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -1142,7 +1142,7 @@ class ActionComm extends CommonObject */ function initAsSpecimen() { - global $user,$langs,$conf; + global $user,$langs,$conf,$user; $now=dol_now(); @@ -1166,6 +1166,9 @@ class ActionComm extends CommonObject $this->transparency=1; // 1 means opaque $this->priority=1; $this->note = 'Note'; + + $this->userownerid=$user->id; + $this->userassigned[$user->id]=array('id'=>$user->id, 'transparency'=> 1); } } diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index 2eff193a5fd..656e88ec83c 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -789,10 +789,11 @@ else print ''; print '     '; print ''; print ''; print "
\n"; @@ -811,6 +812,8 @@ else print ''; if ($modCodeClient->code_auto || $modCodeFournisseur->code_auto) print ''; + dol_fiche_head(null, 'card', '', 0, ''); + print ''; // Name, firstname @@ -1053,14 +1056,7 @@ else print $form->selectyesno('localtax2assuj_value',0,1); print ''; } -/* - if ($mysoc->country_code=='ES' && $mysoc->localtax2_assuj!="1" && ! empty($conf->fournisseur->enabled) && (GETPOST("type")=='f' || GETPOST("type")=='') ) - { - print ''; - } -*/ + if (! empty($conf->global->MAIN_MULTILANGS)) { print '
'.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).''; - print $form->selectyesno('localtax2assuj_value',0,1); - print '
'."\n"; @@ -1097,7 +1093,9 @@ else print '
'."\n"; - print '
'; + dol_fiche_end(); + + print '
'; print ''; print '
'."\n"; diff --git a/htdocs/support/default.css b/htdocs/support/default.css index 14454a19245..ea62df52ef0 100644 --- a/htdocs/support/default.css +++ b/htdocs/support/default.css @@ -148,3 +148,11 @@ background: #DDDFDD; table { font-size: 12px; } table.login { border: 1px solid #C0C0C0; background: #F0F0F0; font-size: 12px; } + +.inline-block +{ + display:inline-block; + vertical-align: top; + margin: 12px; + min-width: 400px; +} diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 9d29707e1bf..7eed00b74f6 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -63,7 +63,7 @@ $theme='eldy'; // Value of theme if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path='/'.$conf->global->MAIN_OVERWRITE_THEME_RES; $theme=$conf->global->MAIN_OVERWRITE_THEME_RES; } // Define image path files and other constants -$fontlist='arial,tahoma,verdana,helvetica'; //$fontlist='Verdana,Helvetica,Arial,sans-serif'; +$fontlist='arial,tahoma,verdana,helvetica'; //$fontlist='Helvetica, Verdana, Arial, sans-serif'; $img_head=''; $img_button=dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png',1); $dol_hide_topmenu=$conf->dol_hide_topmenu; @@ -2928,9 +2928,9 @@ div.dolEventError h1, div.dolEventError h2 { /* Select2 */ /* ============================================================================== */ -.select2-choice, -.select2-drop.select2-drop-above.select2-drop-active, -.select2-container-active .select2-choice, +.select2-choice, +.select2-drop.select2-drop-above.select2-drop-active, +.select2-container-active .select2-choice, .select2-container-active .select2-choices, .select2-dropdown-open.select2-drop-above .select2-choice, .select2-dropdown-open.select2-drop-above .select2-choices, diff --git a/htdocs/user/agenda_extsites.php b/htdocs/user/agenda_extsites.php index 2077c7e73e1..e46647f3b69 100644 --- a/htdocs/user/agenda_extsites.php +++ b/htdocs/user/agenda_extsites.php @@ -122,6 +122,10 @@ $arrayofcss=array(); llxHeader('',$langs->trans("UserSetup"),'','',0,0,$arrayofjs,$arrayofcss); + +print '
'; +print ''; + $head=user_prepare_head($fuser); dol_fiche_head($head, 'extsites', $langs->trans("User"), 0, 'user'); @@ -129,9 +133,6 @@ dol_fiche_head($head, 'extsites', $langs->trans("User"), 0, 'user'); print $langs->trans("AgendaExtSitesDesc")."
\n"; print "
\n"; -print ''; -print ''; - $selectedvalue=$conf->global->AGENDA_DISABLE_EXT; if ($selectedvalue==1) $selectedvalue=0; else $selectedvalue=1; @@ -172,7 +173,8 @@ while ($i <= $MAXAGENDA) } print ''; -print '
'; + +dol_fiche_end(); print '
'; print "trans("Save")."\">"; @@ -180,7 +182,6 @@ print "
"; print "
\n"; -dol_fiche_end(); llxFooter();