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

resolve copflict

Browse Source
This commit is contained in:
florian HENRY 2019-10-02 12:46:35 +02:00
commit 371ff76f5e
4 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
htdocs/core/lib/company.lib.php
View File

@ -928,12 +928,12 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
// Definition of fields for list
$arrayfields=array(
't.rowid'=>array('label'=>"TechnicalID", 'checked'=>($conf->global->MAIN_SHOW_TECHNICAL_ID?1:0), 'enabled'=>($conf->global->MAIN_SHOW_TECHNICAL_ID?1:0), 'position'=>1),
't.name'=>array('label'=>"Name", 'checked'=>1, 'position'=>10),
't.poste'=>array('label'=>"PostOrFunction", 'checked'=>1, 'position'=>20),
't.address'=>array('label'=>(empty($conf->dol_optimize_smallscreen) ? $langs->trans("Address").' / '.$langs->trans("Phone").' / '.$langs->trans("Email") : $langs->trans("Address")), 'checked'=>1, 'position'=>30),
'sc.role'=>array('label'=>"Roles", 'checked'=>1, 'position'=>40),
't.statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>50, 'class'=>'center'),
't.rowid'=>array('label'=>"TechnicalID", 'checked'=>($conf->global->MAIN_SHOW_TECHNICAL_ID?1:0), 'enabled'=>($conf->global->MAIN_SHOW_TECHNICAL_ID?1:0), 'position'=>1),
't.name'=>array('label'=>"Name", 'checked'=>1, 'position'=>10),
't.poste'=>array('label'=>"PostOrFunction", 'checked'=>1, 'position'=>20),
't.address'=>array('label'=>(empty($conf->dol_optimize_smallscreen) ? $langs->trans("Address").' / '.$langs->trans("Phone").' / '.$langs->trans("Email") : $langs->trans("Address")), 'checked'=>1, 'position'=>30),
'sc.role'=>array('label'=>"Roles", 'checked'=>1, 'position'=>40),
't.statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>50, 'class'=>'center'),
);
// Extra fields
if (is_array($extrafields->attributes[$contactstatic->table_element]['label']) && count($extrafields->attributes[$contactstatic->table_element]['label']))
@ -944,7 +944,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
$arrayfields["ef.".$key]=array(
'label'=>$extrafields->attributes[$contactstatic->table_element]['label'][$key],
'checked'=>(($extrafields->attributes[$contactstatic->table_element]['list'][$key]<0)?0:1),
'position'=>$extrafields->attributes[$contactstatic->table_element]['pos'][$key],
'position'=>1000+$extrafields->attributes[$contactstatic->table_element]['pos'][$key],
'enabled'=>(abs($extrafields->attributes[$contactstatic->table_element]['list'][$key])!=3 && $extrafields->attributes[$contactstatic->table_element]['perms'][$key]));
}
}
@ -1046,18 +1046,18 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
// Fields title search
// --------------------------------------------------------------------
print '<tr class="liste_titre">';
foreach($arrayfields as $key => $val)
foreach($contactstatic->fields as $key => $val)
{
$align='';
if (in_array($val['type'], array('t.date','t.datetime','t.timestamp'))) $align.=($align?' ':'').'center';
if (in_array($val['type'], array('t.timestamp'))) $align.=($align?' ':'').'nowrap';
if ($key == 't.status' || $key == 't.statut') $align.=($align?' ':'').'center';
if (! empty($arrayfields[$key]['checked']))
if (in_array($val['type'], array('date','datetime','timestamp'))) $align.=($align?' ':'').'center';
if (in_array($val['type'], array('timestamp'))) $align.=($align?' ':'').'nowrap';
if ($key == 'status' || $key == 'statut') $align.=($align?' ':'').'center';
if (! empty($arrayfields['t.'.$key]['checked']))
{
print '<td class="liste_titre'.($align?' '.$align:'').'">';
if (in_array($key, array('t.statut'))){
if (in_array($key, array('statut'))){
print $form->selectarray('search_status', array('-1'=>'','0'=>$contactstatic->LibStatut(0, 1),'1'=>$contactstatic->LibStatut(1, 1)), $search_status);
} elseif (in_array($key, array('sc.role'))) {
} elseif (in_array($key, array('role'))) {
print $formcompany->showRoles("search_roles", $contactstatic, 'edit', $search_roles);
} else{
$fieldName = substr($key, 2);
@ -1090,10 +1090,8 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
if (in_array($val['type'], array('date','datetime','timestamp'))) $align.=($align?' ':'').'center';
if (in_array($val['type'], array('timestamp'))) $align.=($align?' ':'').'nowrap';
if ($key == 'status' || $key == 'statut') $align.=($align?' ':'').'center';
if (! empty($arrayfields['t.'.$key]['checked'])) print getTitleFieldOfList($val['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($align?'class="'.$align.'"':''), $sortfield, $sortorder, $align.' ')."\n";
if ($key == 'role') $align.=($align?' ':'').'center';
if (! empty($arrayfields['t.'.$key]['checked'])) {
print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($align?'class="'.$align.'"':''), $sortfield, $sortorder, $align.' ')."\n";
}
if (! empty($arrayfields['sc.'.$key]['checked'])) {
print getTitleFieldOfList($arrayfields['sc.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 'sc.'.$key, '', $param, ($align?'class="'.$align.'"':''), $sortfield, $sortorder, $align.' ')."\n";
}

6
htdocs/main.inc.php
View File

@ -2198,11 +2198,12 @@ function printSearchForm($urlaction, $urlobject, $title, $htmlmorecss, $htmlinpu
global $conf,$langs,$user;
$ret='';
$ret.='<form action="'.$urlaction.'" method="post" class="searchform nowraponall">';
$ret.='<form action="'.$urlaction.'" method="post" class="searchform nowraponall tagtr">';
$ret.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
$ret.='<input type="hidden" name="mode" value="search">';
$ret.='<input type="hidden" name="savelogin" value="'.dol_escape_htmltag($user->login).'">';
if ($showtitlebefore) $ret.=$title.' ';
if ($showtitlebefore) $ret.='<div class="tagtd left">'.$title.'</div> ';
$ret.='<div class="tagtd">';
$ret.='<input type="text" class="flat '.$htmlmorecss.'"';
$ret.=' style="text-indent: 22px; background-image: url(\''.$img.'\'); background-repeat: no-repeat; background-position: 3px;"';
$ret.=($accesskey?' accesskey="'.$accesskey.'"':'');
@ -2213,6 +2214,7 @@ function printSearchForm($urlaction, $urlobject, $title, $htmlmorecss, $htmlinpu
$ret.='<button type="submit" class="button" style="padding-top: 4px; padding-bottom: 4px; padding-left: 6px; padding-right: 6px">';
$ret.='<span class="fa fa-search"></span>';
$ret.='</button>';
$ret.='</div>';
$ret.="</form>\n";
return $ret;
}

5
htdocs/societe/card.php
View File

@ -2568,14 +2568,13 @@ else
// Parent company
if (empty($conf->global->SOCIETE_DISABLE_PARENTCOMPANY))
{
// Payment term
print '<tr><td>';
print '<table class="nobordernopadding" width="100%"><tr><td>';
print $langs->trans('ParentCompany');
print '</td>';
if ($action != 'editparentcompany') print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editparentcompany&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</a></td>';
print '</tr></table>';
print '</td><td colspan="3">';
print '</td><td>';
if ($action == 'editparentcompany')
{
$form->form_thirdparty($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->parent, 'editparentcompany', 's.rowid <> '.$object->id, 1);
@ -2596,7 +2595,7 @@ else
{
$langs->load("members");
print '<tr><td>'.$langs->trans("LinkedToDolibarrMember").'</td>';
print '<td colspan="3">';
print '<td>';
$adh=new Adherent($db);
$result=$adh->fetch('', '', $object->id);
if ($result > 0)

2
htdocs/theme/eldy/theme_vars.inc.php
View File

@ -87,7 +87,7 @@ $colorblind_deuteranopes_textWarning = $textWarning; // currently not tested wit
// Badges colors
$badgePrimary ='#007bff';
$badgeSecondary ='#999999';
$badgeSecondary ='#cccccc';
$badgeSuccess ='#28a745';
$badgeDanger ='#9f4705';
$badgeWarning ='#ffc107';