diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 56fb713ae0c7ac6c25c743990a2b247bc111651c..15394c81a3a8fac9f27217c7c473f6fce792eb5d 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 2eff193a5fd1496be4d9655bb5be1a6fe3a2efae..656e88ec83c24bac06a1a2c42c4f6a23c8f3c5f8 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -789,10 +789,11 @@ else print '</label>'; print ' '; print '<label for="radioprivate">'; - print '<input type="radio" id="radioprivate" class="flat" name="private" value="1"'.($private?' checked="checked"':'').'>'; - print ' '; - print $langs->trans("Individual"); - print '<div class="hideonsmartphone">('.$langs->trans("ToCreateContactWithSameName").')</div>'; + $text ='<input type="radio" id="radioprivate" class="flat" name="private" value="1"'.($private?' checked="checked"':'').'>'; + $text.=' '; + $text.= $langs->trans("Individual"); + $htmltext=$langs->trans("ToCreateContactWithSameName"); + print $form->textwithpicto($text, $htmltext, 1, 'help', '', 0, 3); print '</label>'; print '</div>'; print "<br>\n"; @@ -811,6 +812,8 @@ else print '<input type="hidden" name="ThirdPartyName" value="'.$langs->trans('ThirdPartyName').'">'; if ($modCodeClient->code_auto || $modCodeFournisseur->code_auto) print '<input type="hidden" name="code_auto" value="1">'; + dol_fiche_head(null, 'card', '', 0, ''); + print '<table class="border" width="100%">'; // Name, firstname @@ -1053,14 +1056,7 @@ else print $form->selectyesno('localtax2assuj_value',0,1); print '</td><tr>'; } -/* - if ($mysoc->country_code=='ES' && $mysoc->localtax2_assuj!="1" && ! empty($conf->fournisseur->enabled) && (GETPOST("type")=='f' || GETPOST("type")=='') ) - { - print '<tr><td>'.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).'</td><td colspan="3">'; - print $form->selectyesno('localtax2assuj_value',0,1); - print '</td><tr>'; - } -*/ + if (! empty($conf->global->MAIN_MULTILANGS)) { print '<tr><td><label for="default_lang">'.$langs->trans("DefaultLang").'</label></td><td colspan="3" class="maxwidthonsmartphone">'."\n"; @@ -1097,7 +1093,9 @@ else print '</table>'."\n"; - print '<br><div align="center">'; + dol_fiche_end(); + + print '<div class="center">'; print '<input type="submit" class="button" value="'.$langs->trans('AddThirdParty').'">'; print '</div>'."\n"; diff --git a/htdocs/support/default.css b/htdocs/support/default.css index 14454a1924513c1d4d323175153d4b48d2045c3f..ea62df52ef06f5e30432796b5f8a9f145f3742e7 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 9d29707e1bf359516e4a89790b26f4a7bd6dcb12..7eed00b74f65bb3c89f805dedcd52fd1e6a540d5 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 2077c7e73e19ac639c59ce256d98b597dec9fe02..e46647f3b6944bf667e3cd97c9f0b2afdbaefb44 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 '<form name="extsitesconfig" action="'.$_SERVER["PHP_SELF"].'" method="post">'; +print '<input type="hidden" name="id" value="'.$id.'">'; + $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")."<br>\n"; print "<br>\n"; -print '<form name="extsitesconfig" action="'.$_SERVER["PHP_SELF"].'" method="post">'; -print '<input type="hidden" name="id" value="'.$id.'">'; - $selectedvalue=$conf->global->AGENDA_DISABLE_EXT; if ($selectedvalue==1) $selectedvalue=0; else $selectedvalue=1; @@ -172,7 +173,8 @@ while ($i <= $MAXAGENDA) } print '</table>'; -print '<br>'; + +dol_fiche_end(); print '<div class="center">'; print "<input type=\"submit\" id=\"save\" name=\"save\" class=\"button hideifnotset\" value=\"".$langs->trans("Save")."\">"; @@ -180,7 +182,6 @@ print "</div>"; print "</form>\n"; -dol_fiche_end(); llxFooter();