lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	htdocs/core/class/html.formfile.class.php
This commit is contained in:
Laurent Destailleur 2013-07-24 00:42:28 +02:00
commit 644f5149e4
6 changed files with 46 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
htdocs/adherents/document.php
View File

@ -93,15 +93,15 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes')
*/ */
$form = new Form($db); $form = new Form($db);
$member=new Adherent($db); $object=new Adherent($db);
$membert=new AdherentType($db); $membert=new AdherentType($db);
llxHeader(); llxHeader();
if ($id > 0) if ($id > 0)
{ {
$result=$member->fetch($id); $result=$object->fetch($id);
$result=$membert->fetch($member->typeid); $result=$membert->fetch($object->typeid);
if ($result > 0) if ($result > 0)
{ {
/* /*
@ -110,7 +110,7 @@ if ($id > 0)
if (! empty($conf->notification->enabled)) if (! empty($conf->notification->enabled))
$langs->load("mails"); $langs->load("mails");
$head = member_prepare_head($member); $head = member_prepare_head($object);
$form=new Form($db); $form=new Form($db);
@ -133,19 +133,19 @@ if ($id > 0)
// Ref // Ref
print '<tr><td width="20%">'.$langs->trans("Ref").'</td>'; print '<tr><td width="20%">'.$langs->trans("Ref").'</td>';
print '<td class="valeur">'; print '<td class="valeur">';
print $form->showrefnav($member, 'rowid', $linkback); print $form->showrefnav($object, 'rowid', $linkback);
print '</td></tr>'; print '</td></tr>';
// Login // Login
if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED))
{ {
print '<tr><td>'.$langs->trans("Login").' / '.$langs->trans("Id").'</td><td class="valeur">'.$member->login.'&nbsp;</td></tr>'; print '<tr><td>'.$langs->trans("Login").' / '.$langs->trans("Id").'</td><td class="valeur">'.$object->login.'&nbsp;</td></tr>';
} }
// Morphy // Morphy
print '<tr><td>'.$langs->trans("Nature").'</td><td class="valeur" >'.$member->getmorphylib().'</td>'; print '<tr><td>'.$langs->trans("Nature").'</td><td class="valeur" >'.$object->getmorphylib().'</td>';
/*print '<td rowspan="'.$rowspan.'" align="center" valign="middle" width="25%">'; /*print '<td rowspan="'.$rowspan.'" align="center" valign="middle" width="25%">';
print $form->showphoto('memberphoto',$member); print $form->showphoto('memberphoto',$object);
print '</td>';*/ print '</td>';*/
print '</tr>'; print '</tr>';
@ -153,22 +153,22 @@ if ($id > 0)
print '<tr><td>'.$langs->trans("Type").'</td><td class="valeur">'.$membert->getNomUrl(1)."</td></tr>\n"; print '<tr><td>'.$langs->trans("Type").'</td><td class="valeur">'.$membert->getNomUrl(1)."</td></tr>\n";
// Company // Company
print '<tr><td>'.$langs->trans("Company").'</td><td class="valeur">'.$member->societe.'</td></tr>'; print '<tr><td>'.$langs->trans("Company").'</td><td class="valeur">'.$object->societe.'</td></tr>';
// Civility // Civility
print '<tr><td>'.$langs->trans("UserTitle").'</td><td class="valeur">'.$member->getCivilityLabel().'&nbsp;</td>'; print '<tr><td>'.$langs->trans("UserTitle").'</td><td class="valeur">'.$object->getCivilityLabel().'&nbsp;</td>';
print '</tr>'; print '</tr>';
// Lastname // Lastname
print '<tr><td>'.$langs->trans("Lastname").'</td><td class="valeur">'.$member->lastname.'&nbsp;</td>'; print '<tr><td>'.$langs->trans("Lastname").'</td><td class="valeur">'.$object->lastname.'&nbsp;</td>';
print '</tr>'; print '</tr>';
// Firstname // Firstname
print '<tr><td>'.$langs->trans("Firstname").'</td><td class="valeur">'.$member->firstname.'&nbsp;</td>'; print '<tr><td>'.$langs->trans("Firstname").'</td><td class="valeur">'.$object->firstname.'&nbsp;</td>';
print '</tr>'; print '</tr>';
// Status // Status
print '<tr><td>'.$langs->trans("Status").'</td><td class="valeur">'.$member->getLibStatut(4).'</td></tr>'; print '<tr><td>'.$langs->trans("Status").'</td><td class="valeur">'.$object->getLibStatut(4).'</td></tr>';
// Nbre fichiers // Nbre fichiers
print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>'; print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
@ -185,18 +185,18 @@ if ($id > 0)
*/ */
if ($action == 'delete') if ($action == 'delete')
{ {
$ret=$form->form_confirm($_SERVER["PHP_SELF"].'?id='.$member->id.'&urlfile='.urlencode(GETPOST("urlfile")), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', 0, 1); $ret=$form->form_confirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&urlfile='.urlencode(GETPOST("urlfile")), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', 0, 1);
if ($ret == 'html') print '<br>'; if ($ret == 'html') print '<br>';
} }
// Affiche formulaire upload // Affiche formulaire upload
$formfile=new FormFile($db); $formfile=new FormFile($db);
$formfile->form_attach_new_file(DOL_URL_ROOT.'/adherents/document.php?id='.$member->id,'',0,0,$user->rights->adherent->creer,50,$object); $formfile->form_attach_new_file(DOL_URL_ROOT.'/adherents/document.php?id='.$object->id,'',0,0,$user->rights->adherent->creer,50,$object);
// List of document // List of document
$formfile->list_of_documents($filearray,$member,'member','', 0, get_exdir($member->id,2,0,1).'/'.$member->id.'/'); $formfile->list_of_documents($filearray,$object,'member','', 0, get_exdir($object->id,2,0,1).'/'.$object->id.'/');
print "<br><br>"; print "<br><br>";
} }

6
htdocs/core/class/extrafields.class.php
View File

@ -931,7 +931,11 @@ class ExtraFields
else if (in_array($key_type,array('checkbox'))) else if (in_array($key_type,array('checkbox')))
{ {
$value_arr=GETPOST("options_".$key); $value_arr=GETPOST("options_".$key);
$value_key=implode($value_arr,','); if (!empty($value_arr)) {
$value_key=implode($value_arr,',');
}else {
$value_key='';
}
} }
else if (in_array($key_type,array('price','double'))) else if (in_array($key_type,array('price','double')))
{ {

15
htdocs/core/class/html.formfile.class.php
View File

@ -546,22 +546,25 @@ class FormFile
} }
$out.='</td>'; $out.='</td>';
} }
if (is_object($hookmanager)) if (is_object($hookmanager))
{ {
$parameters=array('socid'=>(isset($GLOBALS['socid'])?$GLOBALS['socid']:''),'id'=>(isset($GLOBALS['id'])?$GLOBALS['id']:''),'modulepart'=>$modulepart,'relativepath'=>$relativepath); $parameters=array('socid'=>(isset($GLOBALS['socid'])?$GLOBALS['socid']:''),'id'=>(isset($GLOBALS['id'])?$GLOBALS['id']:''),'modulepart'=>$modulepart,'relativepath'=>$relativepath);
$res = $hookmanager->executeHooks('formBuilddocLineOptions',$parameters,$file); $res = $hookmanager->executeHooks('formBuilddocLineOptions',$parameters,$file);
if(!$res) { if (empty($res))
$out .= $hookmanager->resPrint; {
$out .= $hookmanager->resPrint; // Complete line
$out.= '</tr>';
} }
} else $out = $hookmanager->resPrint; // Replace line
$out.= '</tr>'; }
} }
if (count($file_list) == 0) if (count($file_list) == 0)
{ {
$out.='<tr><td colspan="3">'.$langs->trans("None").'</td></tr>'; $out.='<tr><td colspan="3">'.$langs->trans("None").'</td></tr>';
} }
$this->numoffiles++; $this->numoffiles++;
} }
} }

22
htdocs/theme/amarok/style.css.php
View File

@ -924,7 +924,7 @@ a.help:link, a.help:visited, a.help:hover, a.help:active { font-size:<?php print
div.tabs { div.tabs {
margin: 0px 0px 0px 6px; margin: 0px 0px 0px 6px;
padding: 0px 6px 1px 0px; padding: 0px 6px 0px 0px;
clear:both; clear:both;
height:100%; height:100%;
} }
@ -962,7 +962,7 @@ a.tabTitle img {
} }
a.tab { a.tab {
padding: 5px 12px 2px; padding: 5px 12px 3px;
margin: 0em 0.2em; margin: 0em 0.2em;
background-color:rgba(0,0,0,.2); background-color:rgba(0,0,0,.2);
color:#666666; color:#666666;
@ -1177,9 +1177,9 @@ table.noborder, div.noborder {
padding:0px; padding:0px;
margin:3px 0px 8px; margin:3px 0px 8px;
border-spacing:0px; border-spacing:0px;
-moz-box-shadow:2px 4px 2px #cccccc; -moz-box-shadow: 2px 2px 2px #cccccc;
-webkit-box-shadow:2px 4px 2px #cccccc; -webkit-box-shadow: 2px 2px 2px #cccccc;
box-shadow:2px 4px 2px #cccccc; box-shadow: 2px 2px 2px #cccccc;
} }
table.noborder tr, div.noborder form {} table.noborder tr, div.noborder form {}
@ -1317,9 +1317,9 @@ tr.impair table.nobordernopadding td, tr.pair table.nobordernopadding td { paddi
} }
.boxtable { .boxtable {
-moz-box-shadow:2px 4px 2px #cccccc; -moz-box-shadow: 2px 2px 2px #cccccc;
-webkit-box-shadow:2px 4px 2px #cccccc; -webkit-box-shadow: 2px 2px 2px #cccccc;
box-shadow:2px 4px 2px #cccccc; box-shadow: 2px 2px 2px #cccccc;
/*white-space:nowrap;*/ /*white-space:nowrap;*/
} }
@ -1541,9 +1541,9 @@ table.dp {
background-color:#ffffff; background-color:#ffffff;
border:1px solid #bbbbbb; border:1px solid #bbbbbb;
border-spacing:0px; border-spacing:0px;
-moz-box-shadow:2px 4px 2px #cccccc; -moz-box-shadow: 2px 2px 2px #cccccc;
-webkit-box-shadow:2px 4px 2px #cccccc; -webkit-box-shadow: 2px 2px 2px #cccccc;
box-shadow:2px 4px 2px #cccccc; box-shadow: 2px 2px 2px #cccccc;
} }
.dp td, .tpHour td, .tpMinute td { .dp td, .tpHour td, .tpMinute td {

1
htdocs/theme/auguria/style.css.php
View File

@ -260,6 +260,7 @@ td.showDragHandle {
#id-container { #id-container {
display: table; display: table;
table-layout: fixed; table-layout: fixed;
margin-top: 6px;
} }
#id-right, #id-left { #id-right, #id-left {
display: table-cell; display: table-cell;

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

@ -116,7 +116,7 @@ $fontsizesmaller=empty($conf->dol_optimize_smallscreen)?'11':'14';
// Eldy colors // Eldy colors
if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED)) if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
{ {
$conf->global->THEME_ELDY_TOPMENU_BACK1='200,216,246'; // topmenu $conf->global->THEME_ELDY_TOPMENU_BACK1=($conf->browser->name == 'ie' && round($conf->browser->version,2) < 10)?'230,232,232':'200,216,246'; // topmenu
$conf->global->THEME_ELDY_TOPMENU_BACK2='190,206,236'; $conf->global->THEME_ELDY_TOPMENU_BACK2='190,206,236';
$conf->global->THEME_ELDY_VERMENU_BACK1='255,255,255'; // vmenu $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_BACK1b='230,232,232'; // vmenu (not menu)
@ -1359,7 +1359,7 @@ div.tabBar {
background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacktabcard1; ?>) 25%, rgb(<?php echo $colorbacktabcard2; ?>) 100%); background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacktabcard1; ?>) 25%, rgb(<?php echo $colorbacktabcard2; ?>) 100%);
background-image: linear-gradient(bottom, rgb(<?php echo $colorbacktabcard1; ?>) 25%, rgb(<?php echo $colorbacktabcard2; ?>) 100%); background-image: linear-gradient(bottom, rgb(<?php echo $colorbacktabcard1; ?>) 25%, rgb(<?php echo $colorbacktabcard2; ?>) 100%);
<?php } else { ?> <?php } else { ?>
background: #dee7ec url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/tab_background.png',1); ?>) repeat-x; background: rgb(<?php echo $colorbacktabcard1; ?>) repeat-x;
<?php } ?> <?php } ?>
<?php if (empty($dol_optimize_smallscreen)) { ?> <?php if (empty($dol_optimize_smallscreen)) { ?>
-moz-box-shadow: 4px 4px 4px #DDD; -moz-box-shadow: 4px 4px 4px #DDD;
@ -1417,7 +1417,7 @@ a.tab:link, a.tab:visited, a.tab:hover, a.tab#active {
background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacktab1; ?>) 35%, rgb(<?php echo $colorbacktab2; ?>) 100%); background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacktab1; ?>) 35%, rgb(<?php echo $colorbacktab2; ?>) 100%);
background-image: linear-gradient(bottom, rgb(<?php echo $colorbacktab1; ?>) 35%, rgb(<?php echo $colorbacktab2; ?>) 100%); background-image: linear-gradient(bottom, rgb(<?php echo $colorbacktab1; ?>) 35%, rgb(<?php echo $colorbacktab2; ?>) 100%);
<?php } else { ?> <?php } else { ?>
background: #dee7ec; background: #ffffff;
<?php } ?> <?php } ?>
} }
@ -1426,7 +1426,7 @@ a.tab#active {
border-bottom: 1px solid rgb(<?php echo $colorbacktabactive; ?>) !important; border-bottom: 1px solid rgb(<?php echo $colorbacktabactive; ?>) !important;
background-color: rgb(<?php echo $colorbacktabactive; ?>) !important; background-color: rgb(<?php echo $colorbacktabactive; ?>) !important;
<?php } else { ?> <?php } else { ?>
background: #ffffff; background: rgb(<?php echo $colorbacktabcard1; ?>);
<?php } ?> <?php } ?>
background-image: none !important; background-image: none !important;
} }