';
+
+ $out.='';
+ if ($donetodo)
+ {
+ $out.=' | ';
+ }
+ $out.=' | ';
+ $out.=' | ';
+ $out.=' | ';
+ $out.=' | ';
+ $out.='';
+ $out.=$formactions->select_type_actions($actioncode, "actioncode", '', empty($conf->global->AGENDA_USE_EVENT_TYPE)?1:-1, 0, 0, 1);
+ $out.=' | ';
+ $out.=' | ';
+ $out.=' | ';
+ $out.=' | ';
+ // Action column
+ $out.='';
+ $searchpitco=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
+ $out.=$searchpitco;
+ $out.=' | ';
+ $out.='
';
+
$out.='';
if ($donetodo)
{
- $out.='| ';
- if (get_class($filterobj) == 'Societe') $out.='';
- $out.=($donetodo != 'done' ? $langs->trans("ActionsToDoShort") : '');
- $out.=($donetodo != 'done' && $donetodo != 'todo' ? ' / ' : '');
- $out.=($donetodo != 'todo' ? $langs->trans("ActionsDoneShort") : '');
+ $tmp='';
+ if (get_class($filterobj) == 'Societe') $tmp.='';
+ $tmp.=($donetodo != 'done' ? $langs->trans("ActionsToDoShort") : '');
+ $tmp.=($donetodo != 'done' && $donetodo != 'todo' ? ' / ' : '');
+ $tmp.=($donetodo != 'todo' ? $langs->trans("ActionsDoneShort") : '');
//$out.=$langs->trans("ActionsToDoShort").' / '.$langs->trans("ActionsDoneShort");
- if (get_class($filterobj) == 'Societe') $out.='';
- $out.=' | ';
+ if (get_class($filterobj) == 'Societe') $tmp.='';
+ $out.=getTitleFieldOfList($tmp);
}
- $out.=getTitleFieldOfList($langs->trans("Ref"), 0, $_SERVER["PHP_SELF"], 'a.id', '', $param, '', $sortfield, $sortorder);
- $out.=''.$langs->trans("Label").' | ';
- $out.=getTitleFieldOfList($langs->trans("Date"), 0, $_SERVER["PHP_SELF"], 'a.datep,a.id', '', $param, '', $sortfield, $sortorder);
- $out.=''.$langs->trans("Type").' | ';
- $out.=' | ';
- $out.=' | ';
- $out.=''.$langs->trans("Owner").' | ';
+ $out.=getTitleFieldOfList($langs->trans("Ref"), 0, $_SERVER["PHP_SELF"], 'a.id', '', $param, '', $sortfield, $sortorder);
+ $out.=getTitleFieldOfList($langs->trans("Owner"));
+ $out.=getTitleFieldOfList($langs->trans("Label"), 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);
+ $out.=getTitleFieldOfList($langs->trans("Date"), 0, $_SERVER["PHP_SELF"], 'a.datep,a.id', '', $param, 'align="center"', $sortfield, $sortorder);
+ $out.=getTitleFieldOfList($langs->trans("Type"));
+ $out.=getTitleFieldOfList('');
+ $out.=getTitleFieldOfList('');
$out.=getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], 'a.percent', '', $param, 'align="center"', $sortfield, $sortorder);
- $out.='';
- //TODO Add selection of fields
- $out.=' | ';
- $out.='
';
-
-
- $out.='';
- if ($donetodo)
- {
- $out.=' | ';
- }
- $out.=' | ';
- $out.=' | ';
- $out.=' | ';
- $out.='';
- $out.=$formactions->select_type_actions($actioncode, "actioncode", '', empty($conf->global->AGENDA_USE_EVENT_TYPE)?1:-1, 0, 0, 1);
- $out.=' | ';
- $out.=' | ';
- $out.=' | ';
- $out.=' | ';
- $out.=' | ';
- // Action column
- $out.='';
- $searchpitco=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
- $out.=$searchpitco;
- $out.=' | ';
+ $out.=getTitleFieldOfList('', 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'maxwidthsearch ');
$out.='
';
foreach ($histo as $key=>$value)
@@ -1256,6 +1263,15 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
$out.=$actionstatic->getNomUrl(1, -1);
$out.='';
+ // Author of event
+ $out.='';
+ //$userstatic->id=$histo[$key]['userid'];
+ //$userstatic->login=$histo[$key]['login'];
+ //$out.=$userstatic->getLoginUrl(1);
+ $userstatic->fetch($histo[$key]['userid']);
+ $out.=$userstatic->getNomUrl(-1);
+ $out.=' | ';
+
// Title
$out.='';
if (isset($histo[$key]['type']) && $histo[$key]['type']=='action')
@@ -1276,9 +1292,9 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
$out.=dol_trunc($libelle,120);
}
$out.=' | ';
-
+
// Date
- $out.='';
+ $out.=' | ';
$out.=dol_print_date($histo[$key]['datestart'],'dayhour');
if ($histo[$key]['dateend'] && $histo[$key]['dateend'] != $histo[$key]['datestart'])
{
@@ -1374,16 +1390,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
$out.=' | | ';
}
- // Auteur
- $out.='';
- //$userstatic->id=$histo[$key]['userid'];
- //$userstatic->login=$histo[$key]['login'];
- //$out.=$userstatic->getLoginUrl(1);
- $userstatic->fetch($histo[$key]['userid']);
- $out.=$userstatic->getNomUrl(1);
- $out.=' | ';
-
- // Statut
+ // Status
$out.=''.$actionstatic->LibStatut($histo[$key]['percent'],3,1,$histo[$key]['datestart']).' | ';
// Actions
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index f9ba39f870e..ea92fb5a63b 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2711,7 +2711,7 @@ function img_error($titlealt = 'default')
if ($titlealt == 'default') $titlealt = $langs->trans('Error');
- return img_picto($titlealt, 'error.png');
+ return img_picto($titlealt, 'error.png', 'class="valigntextbottom"');
}
/**
@@ -2727,7 +2727,8 @@ function img_next($titlealt = 'default', $morealt='')
if ($titlealt == 'default') $titlealt = $langs->trans('Next');
- return img_picto($titlealt, 'next.png', $morealt);
+ //return img_picto($titlealt, 'next.png', $morealt);
+ return '';
}
/**
@@ -2743,7 +2744,8 @@ function img_previous($titlealt = 'default', $morealt='')
if ($titlealt == 'default') $titlealt = $langs->trans('Previous');
- return img_picto($titlealt, 'previous.png', $morealt);
+ //return img_picto($titlealt, 'previous.png', $morealt);
+ return '';
}
/**
@@ -3109,7 +3111,7 @@ function print_liste_field_titre($name, $file="", $field="", $begin="", $morepar
* @param string $field Field to use for new sorting. Empty if this field is not sortable.
* @param string $begin ("" by defaut)
* @param string $moreparam Add more parameters on sort url links ("" by default)
- * @param string $moreattrib Add more attributes on th ("" by defaut)
+ * @param string $moreattrib Add more attributes on th ("" by defaut). To add more css class, use param $prefix.
* @param string $sortfield Current field used to sort
* @param string $sortorder Current sort order
* @param string $prefix Prefix for css. Use space after prefix to add your own CSS tag.
diff --git a/htdocs/core/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php
index 291ca6bdbfd..339a208fc31 100644
--- a/htdocs/core/modules/modAgenda.class.php
+++ b/htdocs/core/modules/modAgenda.class.php
@@ -86,9 +86,9 @@ class modAgenda extends DolibarrModules
{
while ($obj = $this->db->fetch_object($sqlreadactions))
{
- if (preg_match('/_CREATE$/',$obj->code) && (! in_array($obj->code, array('COMPANY_CREATE','PRODUCT_CREATE','TASK_CREATE')))) continue; // We don't track such events (*_CREATE) by default, we prefer validation (except thirdparty/product/task creation because there is no validation).
+ //if (preg_match('/_CREATE$/',$obj->code) && (! in_array($obj->code, array('COMPANY_CREATE','PRODUCT_CREATE','TASK_CREATE')))) continue; // We don't track such events (*_CREATE) by default, we prefer validation (except thirdparty/product/task creation because there is no validation).
if (preg_match('/^TASK_/',$obj->code)) continue; // We don't track such events by default.
- if (preg_match('/^_MODIFY/',$obj->code)) continue; // We don't track such events by default.
+ //if (preg_match('/^_MODIFY/',$obj->code)) continue; // We don't track such events by default.
$this->const[] = array('MAIN_AGENDA_ACTIONAUTO_'.$obj->code, "chaine", "1");
}
}
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 65d7fd5223e..4166bbb3791 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -308,44 +308,8 @@ if ($resql)
print '';
print '
'."\n";
- print '';
-
- if (! empty($arrayfields['e.ref']['checked'])) print_liste_field_titre($arrayfields['e.ref']['label'], $_SERVER["PHP_SELF"],"e.ref","",$param,'',$sortfield,$sortorder);
- if (! empty($arrayfields['e.ref_customer']['checked'])) print_liste_field_titre($arrayfields['e.ref_customer']['label'], $_SERVER["PHP_SELF"],"e.ref_customer","",$param,'',$sortfield,$sortorder);
- if (! empty($arrayfields['s.nom']['checked'])) print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"],"s.nom", "", $param,'align="left"',$sortfield,$sortorder);
- if (! empty($arrayfields['s.town']['checked'])) print_liste_field_titre($arrayfields['s.town']['label'],$_SERVER["PHP_SELF"],'s.town','',$param,'',$sortfield,$sortorder);
- if (! empty($arrayfields['s.zip']['checked'])) print_liste_field_titre($arrayfields['s.zip']['label'],$_SERVER["PHP_SELF"],'s.zip','',$param,'',$sortfield,$sortorder);
- if (! empty($arrayfields['state.nom']['checked'])) print_liste_field_titre($arrayfields['state.nom']['label'],$_SERVER["PHP_SELF"],"state.nom","",$param,'',$sortfield,$sortorder);
- if (! empty($arrayfields['country.code_iso']['checked'])) print_liste_field_titre($arrayfields['country.code_iso']['label'],$_SERVER["PHP_SELF"],"country.code_iso","",$param,'align="center"',$sortfield,$sortorder);
- if (! empty($arrayfields['typent.code']['checked'])) print_liste_field_titre($arrayfields['typent.code']['label'],$_SERVER["PHP_SELF"],"typent.code","",$param,'align="center"',$sortfield,$sortorder);
- if (! empty($arrayfields['e.date_delivery']['checked'])) print_liste_field_titre($arrayfields['e.date_delivery']['label'], $_SERVER["PHP_SELF"],"e.date_delivery","",$param, 'align="center"',$sortfield,$sortorder);
- if (! empty($arrayfields['l.ref']['checked'])) print_liste_field_titre($arrayfields['l.ref']['label'], $_SERVER["PHP_SELF"],"l.ref","",$param, '',$sortfield,$sortorder);
- if (! empty($arrayfields['l.date_delivery']['checked'])) print_liste_field_titre($arrayfields['l.date_delivery']['label'], $_SERVER["PHP_SELF"],"l.date_delivery","",$param, 'align="center"',$sortfield,$sortorder);
- // Extra fields
- if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
- {
- foreach($extrafields->attribute_label as $key => $val)
- {
- if (! empty($arrayfields["ef.".$key]['checked']))
- {
- $align=$extrafields->getAlignFlag($key);
- print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
- }
- }
- }
- // Hook fields
- $parameters=array('arrayfields'=>$arrayfields);
- $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters); // Note that $action and $object may have been modified by hook
- print $hookmanager->resPrint;
- if (! empty($arrayfields['e.datec']['checked'])) print_liste_field_titre($arrayfields['e.datec']['label'],$_SERVER["PHP_SELF"],"e.date_creation","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
- if (! empty($arrayfields['e.tms']['checked'])) print_liste_field_titre($arrayfields['e.tms']['label'],$_SERVER["PHP_SELF"],"e.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
- if (! empty($arrayfields['e.fk_statut']['checked'])) print_liste_field_titre($arrayfields['e.fk_statut']['label'],$_SERVER["PHP_SELF"],"e.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
- if (! empty($arrayfields['l.fk_statut']['checked'])) print_liste_field_titre($arrayfields['l.fk_statut']['label'], $_SERVER["PHP_SELF"],"l.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
- print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
- print "
\n";
-
// Lignes des champs de filtre
- print '';
+ print '
';
// Ref
if (! empty($arrayfields['e.ref']['checked']))
{
@@ -462,6 +426,41 @@ if ($resql)
print '';
print "
\n";
+ print '';
+ if (! empty($arrayfields['e.ref']['checked'])) print_liste_field_titre($arrayfields['e.ref']['label'], $_SERVER["PHP_SELF"],"e.ref","",$param,'',$sortfield,$sortorder);
+ if (! empty($arrayfields['e.ref_customer']['checked'])) print_liste_field_titre($arrayfields['e.ref_customer']['label'], $_SERVER["PHP_SELF"],"e.ref_customer","",$param,'',$sortfield,$sortorder);
+ if (! empty($arrayfields['s.nom']['checked'])) print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"],"s.nom", "", $param,'align="left"',$sortfield,$sortorder);
+ if (! empty($arrayfields['s.town']['checked'])) print_liste_field_titre($arrayfields['s.town']['label'],$_SERVER["PHP_SELF"],'s.town','',$param,'',$sortfield,$sortorder);
+ if (! empty($arrayfields['s.zip']['checked'])) print_liste_field_titre($arrayfields['s.zip']['label'],$_SERVER["PHP_SELF"],'s.zip','',$param,'',$sortfield,$sortorder);
+ if (! empty($arrayfields['state.nom']['checked'])) print_liste_field_titre($arrayfields['state.nom']['label'],$_SERVER["PHP_SELF"],"state.nom","",$param,'',$sortfield,$sortorder);
+ if (! empty($arrayfields['country.code_iso']['checked'])) print_liste_field_titre($arrayfields['country.code_iso']['label'],$_SERVER["PHP_SELF"],"country.code_iso","",$param,'align="center"',$sortfield,$sortorder);
+ if (! empty($arrayfields['typent.code']['checked'])) print_liste_field_titre($arrayfields['typent.code']['label'],$_SERVER["PHP_SELF"],"typent.code","",$param,'align="center"',$sortfield,$sortorder);
+ if (! empty($arrayfields['e.date_delivery']['checked'])) print_liste_field_titre($arrayfields['e.date_delivery']['label'], $_SERVER["PHP_SELF"],"e.date_delivery","",$param, 'align="center"',$sortfield,$sortorder);
+ if (! empty($arrayfields['l.ref']['checked'])) print_liste_field_titre($arrayfields['l.ref']['label'], $_SERVER["PHP_SELF"],"l.ref","",$param, '',$sortfield,$sortorder);
+ if (! empty($arrayfields['l.date_delivery']['checked'])) print_liste_field_titre($arrayfields['l.date_delivery']['label'], $_SERVER["PHP_SELF"],"l.date_delivery","",$param, 'align="center"',$sortfield,$sortorder);
+ // Extra fields
+ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+ {
+ foreach($extrafields->attribute_label as $key => $val)
+ {
+ if (! empty($arrayfields["ef.".$key]['checked']))
+ {
+ $align=$extrafields->getAlignFlag($key);
+ print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+ }
+ }
+ }
+ // Hook fields
+ $parameters=array('arrayfields'=>$arrayfields);
+ $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters); // Note that $action and $object may have been modified by hook
+ print $hookmanager->resPrint;
+ if (! empty($arrayfields['e.datec']['checked'])) print_liste_field_titre($arrayfields['e.datec']['label'],$_SERVER["PHP_SELF"],"e.date_creation","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+ if (! empty($arrayfields['e.tms']['checked'])) print_liste_field_titre($arrayfields['e.tms']['label'],$_SERVER["PHP_SELF"],"e.tms","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+ if (! empty($arrayfields['e.fk_statut']['checked'])) print_liste_field_titre($arrayfields['e.fk_statut']['label'],$_SERVER["PHP_SELF"],"e.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
+ if (! empty($arrayfields['l.fk_statut']['checked'])) print_liste_field_titre($arrayfields['l.fk_statut']['label'], $_SERVER["PHP_SELF"],"l.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
+ print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'maxwidthsearch ');
+ print "
\n";
+
$i=0;
$var=true;
$totalarray=array();
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index 21348a5c948..8de637df3cc 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -507,8 +507,11 @@ if ($step == 3 && $datatoimport)
print $objimport->array_import_label[0];
print '';
- print '
';
- print '
'.$langs->trans("InformationOnSourceFile").'';
+ print '
';
//print '| '.$langs->trans("InformationOnSourceFile").' |
';
@@ -1261,38 +1270,33 @@ if ($step == 5 && $datatoimport)
// Do not import first lines
print '| ';
- print $langs->trans("ImportFromLine");
+ print $langs->trans("ImportFromToLine");
print ' | ';
if ($action=='launchsimu')
{
- print '';
+ print '';
print '';
print ' '.$langs->trans("Modify").'';
}
else
{
- print '';
+ print '';
print $form->textwithpicto("", $langs->trans("SetThisValueTo2ToExcludeFirstLine"));
}
- print ' |
';
-
- // Do not import end lines
- print '| ';
- print $langs->trans("EndAtLineNb");
- print ' | ';
+ print ' - ';
if ($action=='launchsimu')
{
- print '';
+ print '';
print '';
print ' '.$langs->trans("Modify").'';
}
else
{
- print '';
+ print '';
print $form->textwithpicto("", $langs->trans("KeepEmptyToGoToEndOfFile"));
}
print ' |
';
-
+
print '| ';
print $langs->trans("KeysToUseForUpdates");
print ' | ';
@@ -1304,7 +1308,7 @@ if ($step == 5 && $datatoimport)
print ' '.$langs->trans("Modify").'';
} else {
print $form->multiselectarray('updatekeys', $objimport->array_import_updatekeys[0], $updatekeys, 0, 0, '', 1, '80%');
- print $form->textwithpicto("", $langs->trans("SelectColumnsOfYourFileForUpdateAttempt"));
+ print $form->textwithpicto("", $langs->trans("SelectPrimaryColumnsForUpdateAttempt"));
}
/*echo '';
print_r($objimport->array_import_updatekeys);
@@ -1315,7 +1319,7 @@ if ($step == 5 && $datatoimport)
print '
';
- print ''.$langs->trans("InformationOnTargetTables").'';
+ print ''.$langs->trans("InformationOnTargetTables").'
';
print ' ';
//print '| '.$langs->trans("InformationOnTargetTables").' | ';
@@ -1643,8 +1647,11 @@ if ($step == 6 && $datatoimport)
print $objimport->array_import_label[0];
print '';
- print '
';
- print ''.$langs->trans("InformationOnSourceFile").'';
+ print ' |