Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.7' into develop

Browse Source 
Conflicts:
	htdocs/user/agenda_extsites.php
This commit is contained in:
Laurent Destailleur 2014-12-08 17:51:36 +01:00
commit e95160c218
5 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/comm/action/class/actioncomm.class.php
View File

@ -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);
}
}

24
htdocs/societe/soc.php
View File

@ -789,10 +789,11 @@ else
print '</label>';
print ' &nbsp; &nbsp; ';
print '<label for="radioprivate">';
print '<input type="radio" id="radioprivate" class="flat" name="private" value="1"'.($private?' checked="checked"':'').'>';
print '&nbsp;';
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.='&nbsp;';
$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";

8
htdocs/support/default.css
View File

@ -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;
}

8
htdocs/theme/eldy/style.css.php
View File

@ -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,

11
htdocs/user/agenda_extsites.php
View File

@ -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();