';
print '';
}
$membertypestatic->id = $obj->type_id;
diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index 5060a0224b6..2b805fdd214 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -626,7 +626,7 @@ while ($i < $imaxinloop) {
if ($mode == 'kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | ';
print '';
}
// Output Kanban
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index dcf8722fcbe..c8857748294 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -44,6 +44,7 @@ $rowid = GETPOST('rowid', 'int');
$action = GETPOST('action', 'aZ09');
$massaction = GETPOST('massaction', 'alpha');
$cancel = GETPOST('cancel', 'alpha');
+$toselect = GETPOST('toselect', 'array');
$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : str_replace('_', '', basename(dirname(__FILE__)).basename(__FILE__, '.php')); // To manage different context of search
$backtopage = GETPOST('backtopage', 'alpha');
$mode = GETPOST('mode', 'alopha');
@@ -245,6 +246,8 @@ $help_url = 'EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_M
llxHeader('', $langs->trans("MembersTypeSetup"), $help_url);
+$arrayofselected = is_array($toselect) ? $toselect : array();
+
// List of members type
if (!$rowid && $action != 'create' && $action != 'edit') {
//print dol_get_fiche_head('');
@@ -319,6 +322,7 @@ if (!$rowid && $action != 'create' && $action != 'edit') {
$membertype = new AdherentType($db);
$i = 0;
+ $savnbfield = 9;
/*$savnbfield = $totalarray['nbfield'];
$totalarray = array();
$totalarray['nbfield'] = 0;*/
@@ -337,7 +341,7 @@ if (!$rowid && $action != 'create' && $action != 'edit') {
if ($mode == 'kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | ';
print '';
}
//output kanban
diff --git a/htdocs/admin/emailcollector_list.php b/htdocs/admin/emailcollector_list.php
index 6c916dff3db..96b015c19c6 100644
--- a/htdocs/admin/emailcollector_list.php
+++ b/htdocs/admin/emailcollector_list.php
@@ -551,7 +551,7 @@ while ($i < $imaxinloop) {
if ($mode == 'kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | ';
print '';
}
// Output Kanban
diff --git a/htdocs/bom/bom_list.php b/htdocs/bom/bom_list.php
index e8b648d94cd..de7a2c4b4f7 100644
--- a/htdocs/bom/bom_list.php
+++ b/htdocs/bom/bom_list.php
@@ -684,7 +684,7 @@ while ($i < $imaxinloop) {
// mode view kanban
if ($mode == 'kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | ';
print '';
}
// Output kanban
diff --git a/htdocs/bookcal/availabilities_list.php b/htdocs/bookcal/availabilities_list.php
index 1be9db2df49..59095d8f03d 100644
--- a/htdocs/bookcal/availabilities_list.php
+++ b/htdocs/bookcal/availabilities_list.php
@@ -637,7 +637,7 @@ while ($i < $imaxinloop) {
if ($mode == 'kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | ';
print '';
}
// Output Kanban
diff --git a/htdocs/bookcal/booking_list.php b/htdocs/bookcal/booking_list.php
index 4bd9dbe116f..53bd76d9c72 100644
--- a/htdocs/bookcal/booking_list.php
+++ b/htdocs/bookcal/booking_list.php
@@ -637,7 +637,7 @@ while ($i < $imaxinloop) {
if ($mode == 'kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | ';
print '';
}
// Output Kanban
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 753c449a278..7337e4a07da 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -1715,7 +1715,7 @@ if ($resql) {
if ($mode == 'kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | ';
print '';
}
// Output Kanban
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index ead429c7152..99a1de84162 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -1999,7 +1999,7 @@ if ($resql) {
if ($mode == 'kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | | ';
print ' ';
}
diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php
index 5f4cf425b79..303590d85b8 100644
--- a/htdocs/compta/bank/list.php
+++ b/htdocs/compta/bank/list.php
@@ -568,6 +568,7 @@ print " | \n";
$totalarray = array();
+$savnbfield = $totalarray['nbfield'];
$totalarray['nbfield'] = 0;
$totalarray['val'] = array('balance'=>0);
$total = array();
@@ -596,7 +597,7 @@ foreach ($accounts as $key => $type) {
if ($mode == 'kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | | ';
print ' ';
}
// Output Kanban
diff --git a/htdocs/compta/bank/various_payment/list.php b/htdocs/compta/bank/various_payment/list.php
index 36855eb653c..27ba1dfb69a 100644
--- a/htdocs/compta/bank/various_payment/list.php
+++ b/htdocs/compta/bank/various_payment/list.php
@@ -614,6 +614,7 @@ print ' | ';
$totalarray = array();
+$savnbfield = $totalarray['nbfield'];
$totalarray['nbfield'] = 0;
$totalarray['val']['total_cred'] = 0;
$totalarray['val']['total_deb'] = 0;
@@ -636,7 +637,7 @@ while ($i < $imaxinloop) {
if ($mode == 'kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | ';
print '';
}
// Output Kanban
diff --git a/htdocs/compta/cashcontrol/cashcontrol_list.php b/htdocs/compta/cashcontrol/cashcontrol_list.php
index f4b3253b783..5e536f39dde 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_list.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_list.php
@@ -555,6 +555,7 @@ if (isset($extrafields->attributes[$object->table_element]['computed']) && is_ar
// --------------------------------------------------------------------
$i = 0;
$totalarray = array();
+$savnbfield = $totalarray['nbfield'];
$totalarray['nbfield'] = 0;
while ($i < ($limit ? min($num, $limit) : $num)) {
$obj = $db->fetch_object($resql);
@@ -568,7 +569,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
// show kanban result
if ($mode == 'kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | ';
print '';
}
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 5e5dde00ab2..7211b7098a6 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -1931,7 +1931,7 @@ if ($resql) {
if ($mode == 'kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | | ';
print ' ';
}
// Output Kanban
diff --git a/htdocs/compta/localtax/list.php b/htdocs/compta/localtax/list.php
index d97dd6cc709..b12b41fb270 100644
--- a/htdocs/compta/localtax/list.php
+++ b/htdocs/compta/localtax/list.php
@@ -82,9 +82,11 @@ if ($result) {
print " | ".$langs->trans("Label")." | ";
print "".$langs->trans("PeriodEndDate")." | ";
print ''.$langs->trans("DatePayment").' | ';
- print "".$langs->trans("PayedByThisPayment")." | ";
+ print ''.$langs->trans("PayedByThisPayment").' | ';
print " \n";
+ $savnbfield = 5;
+
$imaxinloop = ($limit ? min($num, $limit) : $num);
while ($i < $imaxinloop) {
$obj = $db->fetch_object($result);
@@ -100,7 +102,7 @@ if ($result) {
if ($mode == 'kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | | ';
print ' ';
}
// Output Kanban
diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php
index 04f2d325aba..6641ddbdc1a 100644
--- a/htdocs/compta/paiement/cheque/list.php
+++ b/htdocs/compta/paiement/cheque/list.php
@@ -240,6 +240,8 @@ if ($resql) {
print " | \n";
if ($num > 0) {
+ $savnbfield = 8;
+
$imaxinloop = ($limit ? min($num, $limit) : $num);
while ($i < $imaxinloop) {
$objp = $db->fetch_object($resql);
@@ -258,7 +260,7 @@ if ($resql) {
if ($mode == 'kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | ';
print '';
}
// Output Kanban
diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php
index 4e29351c4cc..0e3daaf496b 100644
--- a/htdocs/compta/prelevement/list.php
+++ b/htdocs/compta/prelevement/list.php
@@ -375,7 +375,7 @@ while ($i < $imaxinloop) {
if ($mode == 'kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | ';
print '';
}
// Output Kanban
diff --git a/htdocs/compta/prelevement/orders_list.php b/htdocs/compta/prelevement/orders_list.php
index c42672d904c..c8122ec27c3 100644
--- a/htdocs/compta/prelevement/orders_list.php
+++ b/htdocs/compta/prelevement/orders_list.php
@@ -323,7 +323,7 @@ while ($i < $imaxinloop) {
if ($mode == 'kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | | ';
print ' ';
}
// Output Kanban
diff --git a/htdocs/compta/sociales/list.php b/htdocs/compta/sociales/list.php
index ea415784943..1b26e89b2f7 100644
--- a/htdocs/compta/sociales/list.php
+++ b/htdocs/compta/sociales/list.php
@@ -614,6 +614,7 @@ print ' | ';
$i = 0;
$totalarray = $TLoadedUsers = array();
+$savnbfield = $totalarray['nbfield'];
$totalarray['nbfield'] = 0;
$totalarray['val']['totalttcfield'] = 0;
$imaxinloop = ($limit ? min($num, $limit) : $num);
@@ -636,7 +637,7 @@ while ($i < $imaxinloop) {
}
if ($mode == 'kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | ';
print '';
}
// Output Kanban
diff --git a/htdocs/compta/tva/list.php b/htdocs/compta/tva/list.php
index 22ac6310efc..9e5a28b6905 100644
--- a/htdocs/compta/tva/list.php
+++ b/htdocs/compta/tva/list.php
@@ -589,7 +589,7 @@ while ($i < $imaxinloop) {
if ($mode == 'kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | ';
print '';
}
// Output Kanban
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 049dbfefc1f..40ea623911e 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -1295,7 +1295,7 @@ while ($i < $imaxinloop) {
if ($mode == 'kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | ';
print '';
}
// Output Kanban
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 5ecb310d1be..e4de94fc921 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -990,7 +990,7 @@ while ($i < $imaxinloop) {
if ($mode == 'kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | ';
print '';
}
// Output Kanban
diff --git a/htdocs/don/list.php b/htdocs/don/list.php
index 7aa4918fc92..11b17cd494f 100644
--- a/htdocs/don/list.php
+++ b/htdocs/don/list.php
@@ -412,7 +412,7 @@ while ($i < $imaxinloop) {
if ($mode == 'kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | ';
print '';
}
// Output Kanban
diff --git a/htdocs/eventorganization/conferenceorbooth_list.php b/htdocs/eventorganization/conferenceorbooth_list.php
index 49940ef7881..69be0367ec8 100644
--- a/htdocs/eventorganization/conferenceorbooth_list.php
+++ b/htdocs/eventorganization/conferenceorbooth_list.php
@@ -890,7 +890,7 @@ while ($i < $imaxinloop) {
if ($mode == 'kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | ';
print '';
}
// Output Kanban
diff --git a/htdocs/eventorganization/conferenceorboothattendee_list.php b/htdocs/eventorganization/conferenceorboothattendee_list.php
index 9636e7e8d0f..38e6b11c06b 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_list.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_list.php
@@ -938,7 +938,7 @@ while ($i < $imaxinloop) {
if ($mode == 'kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | | ';
print ' ';
}
// Output Kanban
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index e6709ef482d..40c8191043a 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -884,6 +884,7 @@ print " | \n";
$typenArray = $formcompany->typent_array(1);
$i = 0;
+$savnbfield = $totalarray['nbfield'];
$totalarray = array();
$totalarray['nbfield'] = 0;
while ($i < min($num, $limit)) {
@@ -902,7 +903,7 @@ while ($i < min($num, $limit)) {
if ($mode == 'kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | ';
print '';
}
$object->date_delivery = $obj->delivery_date;
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index da22037e771..fd79cbc3e7a 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -725,6 +725,7 @@ if ($resql) {
if ($num > 0) {
$i = 0;
+ $savnbfield = $totalarray['nbfield'];
$totalarray = array();
$totalarray['nbfield'] = 0;
$totalarray['val'] = array();
@@ -751,7 +752,7 @@ if ($resql) {
if ($mode == 'kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | ';
print '';
}
// TODO Use a cache on user
diff --git a/htdocs/expensereport/payment/list.php b/htdocs/expensereport/payment/list.php
index 426d5268d92..0a142ed3d25 100644
--- a/htdocs/expensereport/payment/list.php
+++ b/htdocs/expensereport/payment/list.php
@@ -500,7 +500,7 @@ while ($i < $imaxinloop) {
if ($mode == 'kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | ';
print '';
}
// Output Kanban
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index 22ee0a1a1c5..6971f7e90c7 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -733,7 +733,7 @@ while ($i < $imaxinloop) {
//mode kanban
if ($mode == 'kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | | ';
print ' ';
}
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 612c99cacc2..c93feec72bb 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -1535,76 +1535,102 @@ if ($resql) {
print " | \n";
+ $totalarray = array();
+ $totalarray['nbfield'] = 0;
+
// Fields title
print ' ';
if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['cf.ref']['checked'])) {
print_liste_field_titre($arrayfields['cf.ref']['label'], $_SERVER["PHP_SELF"], "cf.ref", "", $param, '', $sortfield, $sortorder);
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['cf.ref_supplier']['checked'])) {
print_liste_field_titre($arrayfields['cf.ref_supplier']['label'], $_SERVER["PHP_SELF"], "cf.ref_supplier", "", $param, '', $sortfield, $sortorder, 'tdoverflowmax100imp ');
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['cf.fk_projet']['checked'])) {
print_liste_field_titre($arrayfields['cf.fk_projet']['label'], $_SERVER["PHP_SELF"], "p.ref", "", $param, '', $sortfield, $sortorder);
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['u.login']['checked'])) {
print_liste_field_titre($arrayfields['u.login']['label'], $_SERVER["PHP_SELF"], "u.login", "", $param, '', $sortfield, $sortorder);
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['cf.fk_soc']['checked'])) {
print_liste_field_titre($arrayfields['cf.fk_soc']['label'], $_SERVER["PHP_SELF"], "s.nom", "", $param, '', $sortfield, $sortorder);
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['s.name_alias']['checked'])) {
print_liste_field_titre($arrayfields['s.name_alias']['label'], $_SERVER["PHP_SELF"], "s.name_alias", "", $param, '', $sortfield, $sortorder);
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['s.town']['checked'])) {
print_liste_field_titre($arrayfields['s.town']['label'], $_SERVER["PHP_SELF"], 's.town', '', $param, '', $sortfield, $sortorder);
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['s.zip']['checked'])) {
print_liste_field_titre($arrayfields['s.zip']['label'], $_SERVER["PHP_SELF"], 's.zip', '', $param, '', $sortfield, $sortorder);
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['state.nom']['checked'])) {
print_liste_field_titre($arrayfields['state.nom']['label'], $_SERVER["PHP_SELF"], "state.nom", "", $param, '', $sortfield, $sortorder);
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['country.code_iso']['checked'])) {
print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "country.code_iso", "", $param, '', $sortfield, $sortorder, 'center ');
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['typent.code']['checked'])) {
print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, '', $sortfield, $sortorder, 'center ');
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['cf.fk_author']['checked'])) {
print_liste_field_titre($arrayfields['cf.fk_author']['label'], $_SERVER["PHP_SELF"], "cf.fk_author", "", $param, '', $sortfield, $sortorder);
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['cf.date_commande']['checked'])) {
print_liste_field_titre($arrayfields['cf.date_commande']['label'], $_SERVER["PHP_SELF"], "cf.date_commande", "", $param, '', $sortfield, $sortorder, 'center ');
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['cf.date_livraison']['checked'])) {
print_liste_field_titre($arrayfields['cf.date_livraison']['label'], $_SERVER["PHP_SELF"], 'cf.date_livraison', '', $param, '', $sortfield, $sortorder, 'center ');
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['cf.total_ht']['checked'])) {
print_liste_field_titre($arrayfields['cf.total_ht']['label'], $_SERVER["PHP_SELF"], "cf.total_ht", "", $param, '', $sortfield, $sortorder, 'right ');
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['cf.total_tva']['checked'])) {
print_liste_field_titre($arrayfields['cf.total_tva']['label'], $_SERVER["PHP_SELF"], "cf.total_tva", "", $param, '', $sortfield, $sortorder, 'right ');
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['cf.total_ttc']['checked'])) {
print_liste_field_titre($arrayfields['cf.total_ttc']['label'], $_SERVER["PHP_SELF"], "cf.total_ttc", "", $param, '', $sortfield, $sortorder, 'right ');
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['cf.multicurrency_code']['checked'])) {
print_liste_field_titre($arrayfields['cf.multicurrency_code']['label'], $_SERVER['PHP_SELF'], 'cf.multicurrency_code', '', $param, '', $sortfield, $sortorder);
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['cf.multicurrency_tx']['checked'])) {
print_liste_field_titre($arrayfields['cf.multicurrency_tx']['label'], $_SERVER['PHP_SELF'], 'cf.multicurrency_tx', '', $param, '', $sortfield, $sortorder);
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['cf.multicurrency_total_ht']['checked'])) {
print_liste_field_titre($arrayfields['cf.multicurrency_total_ht']['label'], $_SERVER['PHP_SELF'], 'cf.multicurrency_total_ht', '', $param, 'class="right"', $sortfield, $sortorder);
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['cf.multicurrency_total_tva']['checked'])) {
print_liste_field_titre($arrayfields['cf.multicurrency_total_tva']['label'], $_SERVER['PHP_SELF'], 'cf.multicurrency_total_tva', '', $param, 'class="right"', $sortfield, $sortorder);
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['cf.multicurrency_total_ttc']['checked'])) {
print_liste_field_titre($arrayfields['cf.multicurrency_total_ttc']['label'], $_SERVER['PHP_SELF'], 'cf.multicurrency_total_ttc', '', $param, 'class="right"', $sortfield, $sortorder);
+ $totalarray['nbfield']++;
}
// Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
@@ -1614,34 +1640,42 @@ if ($resql) {
print $hookmanager->resPrint;
if (!empty($arrayfields['cf.date_creation']['checked'])) {
print_liste_field_titre($arrayfields['cf.date_creation']['label'], $_SERVER["PHP_SELF"], "cf.date_creation", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['cf.tms']['checked'])) {
print_liste_field_titre($arrayfields['cf.tms']['label'], $_SERVER["PHP_SELF"], "cf.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['cf.fk_statut']['checked'])) {
print_liste_field_titre($arrayfields['cf.fk_statut']['label'], $_SERVER["PHP_SELF"], "cf.fk_statut", "", $param, '', $sortfield, $sortorder, 'right ');
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['cf.billed']['checked'])) {
print_liste_field_titre($arrayfields['cf.billed']['label'], $_SERVER["PHP_SELF"], 'cf.billed', '', $param, '', $sortfield, $sortorder, 'center ');
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['cf.date_valid']['checked'])) {
print_liste_field_titre($arrayfields['cf.date_valid']['label'], $_SERVER["PHP_SELF"], "cf.date_valid", "", $param, '', $sortfield, $sortorder, 'center ');
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['cf.date_approve']['checked'])) {
print_liste_field_titre($arrayfields['cf.date_approve']['label'], $_SERVER["PHP_SELF"], 'cf.date_approve', '', $param, '', $sortfield, $sortorder, 'center ');
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['cf.note_public']['checked'])) {
print_liste_field_titre($arrayfields['cf.note_public']['label'], $_SERVER["PHP_SELF"], "cf.note_public", "", $param, '', $sortfield, $sortorder, 'center ');
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['cf.note_private']['checked'])) {
print_liste_field_titre($arrayfields['cf.note_private']['label'], $_SERVER["PHP_SELF"], "cf.note_private", "", $param, '', $sortfield, $sortorder, 'center ');
+ $totalarray['nbfield']++;
}
if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+ $totalarray['nbfield']++;
}
print " \n";
-
$total = 0;
$subtotal = 0;
$productstat_cache = array();
@@ -1651,6 +1685,7 @@ if ($resql) {
$projectstatic = new Project($db);
$i = 0;
+ $savnbfield = $totalarray['nbfield'];
$totalarray = array('nbfield' => 0, 'val' => array(), 'pos' => array());
$totalarray['val']['cf.total_ht'] = 0;
$totalarray['val']['cf.total_ttc'] = 0;
@@ -1682,7 +1717,7 @@ if ($resql) {
if ($mode == 'kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | ';
print '';
}
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index a3cb7e016a7..a41f3011c17 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -1501,7 +1501,7 @@ while ($i < $imaxinloop) {
if ($mode == 'kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | ';
print '';
}
// Output Kanban
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index e7965cc979b..0deaf878a9a 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -877,7 +877,7 @@ if ($id && empty($user->rights->holiday->readall) && !in_array($id, $childids))
if ($mode == 'kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | | ';
print ' ';
}
diff --git a/htdocs/hrm/evaluation_list.php b/htdocs/hrm/evaluation_list.php
index 6055d3153cd..a2548a2385f 100644
--- a/htdocs/hrm/evaluation_list.php
+++ b/htdocs/hrm/evaluation_list.php
@@ -521,6 +521,8 @@ print $searchpicto;
print ' | ';
print ' '."\n";
+$totalarray = array();
+$totalarray['nbfield'] = 0;
// Fields title label
// --------------------------------------------------------------------
@@ -538,6 +540,7 @@ foreach ($object->fields as $key => $val) {
}
if (!empty($arrayfields['t.'.$key]['checked'])) {
print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n";
+ $totalarray['nbfield']++;
}
}
// Extra fields
@@ -548,6 +551,7 @@ $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $objec
print $hookmanager->resPrint;
// Action column
print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+$totalarray['nbfield']++;
print ' | '."\n";
@@ -565,6 +569,7 @@ if (isset($extrafields->attributes[$object->table_element]['computed']) && is_ar
// Loop on record
// --------------------------------------------------------------------
$i = 0;
+$savnbfield = $totalarray['nbfield'];
$totalarray = array();
$totalarray['nbfield'] = 0;
$imaxinloop = ($limit ? min($num, $limit) : $num);
@@ -579,7 +584,7 @@ while ($i < $imaxinloop) {
if ($mode == 'kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | ';
print '';
}
// Output Kanban
diff --git a/htdocs/hrm/job_list.php b/htdocs/hrm/job_list.php
index 675f2c77cf2..18129d56c12 100644
--- a/htdocs/hrm/job_list.php
+++ b/htdocs/hrm/job_list.php
@@ -605,7 +605,7 @@ while ($i < $imaxinloop) {
$object->description = $obj->description;
if ($i == 0) {
- print ' | ';
+ print ' | ';
print '';
}
// Output Kanban
diff --git a/htdocs/hrm/position_list.php b/htdocs/hrm/position_list.php
index 866645a9571..e9b2eaa9b50 100644
--- a/htdocs/hrm/position_list.php
+++ b/htdocs/hrm/position_list.php
@@ -614,7 +614,7 @@ while ($i < $imaxinloop) {
if ($mode == 'kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | ';
print '';
}
// get info needed
diff --git a/htdocs/hrm/skill_list.php b/htdocs/hrm/skill_list.php
index 7d6042c9ca2..dee90553457 100644
--- a/htdocs/hrm/skill_list.php
+++ b/htdocs/hrm/skill_list.php
@@ -614,7 +614,7 @@ while ($i < $imaxinloop) {
if ($mode == 'kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | ';
print '';
}
// Output Kanban
diff --git a/htdocs/intracommreport/list.php b/htdocs/intracommreport/list.php
index a2c857fc1c7..dcf95d1b943 100644
--- a/htdocs/intracommreport/list.php
+++ b/htdocs/intracommreport/list.php
@@ -574,7 +574,7 @@ while ($i < $imaxinloop) {
if ($mode == 'kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | ';
print '';
}
// Output Kanban
diff --git a/htdocs/knowledgemanagement/knowledgerecord_list.php b/htdocs/knowledgemanagement/knowledgerecord_list.php
index f81f842bea8..6ce878389c2 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_list.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_list.php
@@ -663,7 +663,7 @@ while ($i < $imaxinloop) {
if ($mode == 'kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | | ';
print ' ';
}
// Output Kanban
diff --git a/htdocs/loan/list.php b/htdocs/loan/list.php
index a6d28396c8b..8be6e1317d6 100644
--- a/htdocs/loan/list.php
+++ b/htdocs/loan/list.php
@@ -247,20 +247,31 @@ if ($resql) {
}
print ' | ';
+ $totalarray = array();
+ $totalarray['nbfield'] = 0;
+
// Fields title label
// --------------------------------------------------------------------
print ' ';
if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch ');
+ $totalarray['nbfield']++;
}
print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "l.rowid", "", $param, "", $sortfield, $sortorder);
+ $totalarray['nbfield']++;
print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "l.label", "", $param, '', $sortfield, $sortorder, 'left ');
+ $totalarray['nbfield']++;
print_liste_field_titre("LoanCapital", $_SERVER["PHP_SELF"], "l.capital", "", $param, '', $sortfield, $sortorder, 'right ');
+ $totalarray['nbfield']++;
print_liste_field_titre("DateStart", $_SERVER["PHP_SELF"], "l.datestart", "", $param, '', $sortfield, $sortorder, 'center ');
+ $totalarray['nbfield']++;
print_liste_field_titre("DateEnd", $_SERVER["PHP_SELF"], "l.dateend", "", $param, '', $sortfield, $sortorder, 'center ');
+ $totalarray['nbfield']++;
print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "l.paid", "", $param, '', $sortfield, $sortorder, 'right ');
+ $totalarray['nbfield']++;
if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch ');
+ $totalarray['nbfield']++;
}
print " \n";
@@ -269,6 +280,7 @@ if ($resql) {
// Loop on record
// --------------------------------------------------------------------
$i = 0;
+ $savnbfield = $totalarray['nbfield'];
$totalarray = array();
$imaxinloop = ($limit ? min($num, $limit) : $num);
while ($i < $imaxinloop) {
@@ -285,7 +297,7 @@ if ($resql) {
if ($mode == 'kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | ';
print '';
}
// Output Kanban
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 9e6f195e8d8..f567b89ceda 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -698,7 +698,7 @@ while ($i < $imaxinloop) {
if ($mode == 'kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | | ';
print ' ';
}
// Output Kanban
diff --git a/htdocs/mrp/mo_list.php b/htdocs/mrp/mo_list.php
index 5f94232d374..ab9ee3e3645 100644
--- a/htdocs/mrp/mo_list.php
+++ b/htdocs/mrp/mo_list.php
@@ -541,6 +541,9 @@ if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
}
print ' | '."\n";
+$totalarray = array();
+$totalarray['nbfield'] = 0;
+
// Fields title label
// --------------------------------------------------------------------
@@ -564,6 +567,7 @@ foreach ($object->fields as $key => $val) {
}
if (!empty($arrayfields['t.'.$key]['checked'])) {
print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n";
+ $totalarray['nbfield']++;
}
}
// Extra fields
@@ -575,6 +579,7 @@ print $hookmanager->resPrint;
// Action column
if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+ $totalarray['nbfield']++;
}
print ' | '."\n";
@@ -590,10 +595,12 @@ if (isset($extrafields->attributes[$object->table_element]['computed']) && is_ar
}
+$bom = new Bom($db);
+
// Loop on record
// --------------------------------------------------------------------
-$bom = new Bom($db);
$i = 0;
+$savnbfield = $totalarray['nbfield'];
$totalarray = array();
$totalarray['nbfield'] = 0;
$imaxinloop = ($limit ? min($num, $limit) : $num);
@@ -609,7 +616,7 @@ while ($i < $imaxinloop) {
//mode Kanban
if ($mode == 'kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | ';
print '';
}
$object->id = $obj->type_id;
diff --git a/htdocs/partnership/partnership_list.php b/htdocs/partnership/partnership_list.php
index 01dbe7c399a..01a1cb9b602 100644
--- a/htdocs/partnership/partnership_list.php
+++ b/htdocs/partnership/partnership_list.php
@@ -865,7 +865,7 @@ while ($i < $imaxinloop) {
if ($mode == 'kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | ';
print '';
}
// Output Kanban
diff --git a/htdocs/product/inventory/list.php b/htdocs/product/inventory/list.php
index 09b01686b07..1e71791929c 100644
--- a/htdocs/product/inventory/list.php
+++ b/htdocs/product/inventory/list.php
@@ -644,7 +644,7 @@ while ($i < $imaxinloop) {
if ($mode == 'kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | ';
print '';
}
// Output Kanban
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 1ff093b096c..cd879043a2b 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -1535,7 +1535,7 @@ while ($i < $imaxinloop) {
if ($mode == 'kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | | ';
print ' ';
}
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index 666253e5e2c..0bb83cb64e8 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -613,12 +613,12 @@ if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
}
print ' | '."\n";
+$warehouse = new Entrepot($db);
+
// Loop on record
// --------------------------------------------------------------------
$i = 0;
-
-$warehouse = new Entrepot($db);
-
+$savnbfield = $totalarray['nbfield'];
$imaxinloop = ($limit ? min($num, $limit) : $num);
while ($i < $imaxinloop) {
$obj = $db->fetch_object($resql);
@@ -634,7 +634,7 @@ while ($i < $imaxinloop) {
if ($mode =='kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | ';
print '';
}
// Output Kanban
diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php
index e0366f48eb2..232b31ca984 100644
--- a/htdocs/product/stock/movement_list.php
+++ b/htdocs/product/stock/movement_list.php
@@ -1395,7 +1395,7 @@ while ($i < $imaxinloop) {
if ($mode == 'kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | ';
print '';
}
// Output Kanban
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 7c436f62fd6..42d0e0d2a5b 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -1486,7 +1486,7 @@ while ($i < $imaxinloop) {
if ($mode == 'kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | ';
print '';
}
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 86446e8b840..992bae1896f 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -1156,7 +1156,7 @@ while ($i < $imaxinloop) {
}
if ($mode == 'kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | ';
print '';
}
// Output Kanban
diff --git a/htdocs/recruitment/recruitmentcandidature_list.php b/htdocs/recruitment/recruitmentcandidature_list.php
index cc3a29e5475..0bf19a4a045 100644
--- a/htdocs/recruitment/recruitmentcandidature_list.php
+++ b/htdocs/recruitment/recruitmentcandidature_list.php
@@ -744,7 +744,7 @@ while ($i < $imaxinloop) {
if ($mode == 'kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | ';
print '';
}
// TODO Use a cache for $recruitment
diff --git a/htdocs/recruitment/recruitmentjobposition_list.php b/htdocs/recruitment/recruitmentjobposition_list.php
index db7e6db5c29..11e74280a50 100644
--- a/htdocs/recruitment/recruitmentjobposition_list.php
+++ b/htdocs/recruitment/recruitmentjobposition_list.php
@@ -590,7 +590,7 @@ while ($i < $imaxinloop) {
if ($mode == 'kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | ';
print '';
}
if ($massactionbutton || $massaction) {
diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php
index 5a908a4d58e..c907f494ff1 100644
--- a/htdocs/salaries/list.php
+++ b/htdocs/salaries/list.php
@@ -615,7 +615,6 @@ if (isset($extrafields->attributes[$object->table_element]['computed']) && is_ar
// Loop on record
// --------------------------------------------------------------------
$i = 0;
-$total = 0;
$savnbfield = $totalarray['nbfield'];
$totalarray = array();
$totalarray['nbfield'] = 0;
@@ -653,7 +652,7 @@ while ($i < $imaxinloop) {
if ($mode == 'kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | | ';
print ' ';
}
// Output Kanban
diff --git a/htdocs/salaries/payments.php b/htdocs/salaries/payments.php
index 710a7b88c35..5be2f163282 100644
--- a/htdocs/salaries/payments.php
+++ b/htdocs/salaries/payments.php
@@ -488,24 +488,41 @@ print $searchpicto;
print ' | ';
print ' '."\n";
+$totalarray = array();
+$totalarray['nbfield'] = 0;
// Fields title label
// --------------------------------------------------------------------
print ' ';
+// Action column
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+ print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+ $totalarray['nbfield']++;
+}
print_liste_field_titre("RefPayment", $_SERVER["PHP_SELF"], "s.rowid", "", $param, "", $sortfield, $sortorder);
+$totalarray['nbfield']++;
print_liste_field_titre("Salary", $_SERVER["PHP_SELF"], "sal.rowid", "", $param, '', $sortfield, $sortorder);
+$totalarray['nbfield']++;
print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "s.label", "", $param, 'class="left"', $sortfield, $sortorder);
+$totalarray['nbfield']++;
print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "sal.dateep", "", $param, '', $sortfield, $sortorder, 'center ');
+$totalarray['nbfield']++;
print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "s.datep,s.rowid", "", $param, '', $sortfield, $sortorder, 'center ');
-//print_liste_field_titre("DateValue", $_SERVER["PHP_SELF"], "b.datev,s.rowid", "", $param, '', $sortfield, $sortorder, 'center ');
+$totalarray['nbfield']++;
print_liste_field_titre("Employee", $_SERVER["PHP_SELF"], "u.rowid", "", $param, "", $sortfield, $sortorder);
+$totalarray['nbfield']++;
print_liste_field_titre("PaymentMode", $_SERVER["PHP_SELF"], "pst.code", "", $param, 'class="left"', $sortfield, $sortorder);
+$totalarray['nbfield']++;
print_liste_field_titre("Numero", $_SERVER["PHP_SELF"], "s.num_payment", "", $param, '', $sortfield, $sortorder, '', 'ChequeOrTransferNumber');
+$totalarray['nbfield']++;
if (isModEnabled("banque")) {
print_liste_field_titre("BankTransactionLine", $_SERVER["PHP_SELF"], "s.fk_bank", "", $param, '', $sortfield, $sortorder);
+ $totalarray['nbfield']++;
print_liste_field_titre("BankAccount", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
+ $totalarray['nbfield']++;
}
print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "s.amount", "", $param, 'class="right"', $sortfield, $sortorder);
+$totalarray['nbfield']++;
// Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
// Hook fields
@@ -513,7 +530,10 @@ $parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$
$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
// Action column
-print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+ print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+ $totalarray['nbfield']++;
+}
print ' '."\n";
@@ -531,9 +551,10 @@ if (isset($extrafields->attributes[$object->table_element]['computed']) && is_ar
// Loop on record
// --------------------------------------------------------------------
$i = 0;
-$total = 0;
+$savnbfield = $totalarray['nbfield'];
$totalarray = array();
$totalarray['nbfield'] = 0;
+$imaxinloop = ($limit ? min($num, $limit) : $num);
while ($i < $imaxinloop) {
$obj = $db->fetch_object($resql);
if (empty($obj)) {
@@ -570,7 +591,7 @@ while ($i < $imaxinloop) {
if ($mode == 'kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | ';
print '';
}
// Output Kanban
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 9d9a3c7a9ef..194bf96c936 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -1568,7 +1568,7 @@ while ($i < $imaxinloop) {
if ($mode == 'kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | | ';
print ' ';
}
// Output Kanban
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index b9a25642cd3..e3db6909c82 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -879,67 +879,90 @@ if ($resql) {
print " | \n";
+ $totalarray = array();
+ $totalarray['nbfield'] = 0;
+
// Fields title
print ' ';
if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['sp.ref']['checked'])) {
print_liste_field_titre($arrayfields['sp.ref']['label'], $_SERVER["PHP_SELF"], 'sp.ref', '', $param, '', $sortfield, $sortorder);
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['s.nom']['checked'])) {
print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], 's.nom', '', $param, '', $sortfield, $sortorder);
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['s.name_alias']['checked'])) {
print_liste_field_titre($arrayfields['s.name_alias']['label'], $_SERVER["PHP_SELF"], 's.name_alias', '', $param, '', $sortfield, $sortorder);
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['s.town']['checked'])) {
print_liste_field_titre($arrayfields['s.town']['label'], $_SERVER["PHP_SELF"], 's.town', '', $param, '', $sortfield, $sortorder);
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['s.zip']['checked'])) {
print_liste_field_titre($arrayfields['s.zip']['label'], $_SERVER["PHP_SELF"], 's.zip', '', $param, '', $sortfield, $sortorder);
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['state.nom']['checked'])) {
print_liste_field_titre($arrayfields['state.nom']['label'], $_SERVER["PHP_SELF"], "state.nom", "", $param, '', $sortfield, $sortorder);
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['country.code_iso']['checked'])) {
print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "country.code_iso", "", $param, '', $sortfield, $sortorder, 'center ');
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['typent.code']['checked'])) {
print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, '', $sortfield, $sortorder, 'center ');
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['sp.date_valid']['checked'])) {
print_liste_field_titre($arrayfields['sp.date_valid']['label'], $_SERVER["PHP_SELF"], 'sp.date_valid', '', $param, '', $sortfield, $sortorder, 'center ');
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['sp.date_livraison']['checked'])) {
print_liste_field_titre($arrayfields['sp.date_livraison']['label'], $_SERVER["PHP_SELF"], 'sp.date_livraison', '', $param, '', $sortfield, $sortorder, 'center ');
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['sp.total_ht']['checked'])) {
print_liste_field_titre($arrayfields['sp.total_ht']['label'], $_SERVER["PHP_SELF"], 'sp.total_ht', '', $param, '', $sortfield, $sortorder, 'right ');
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['sp.total_tva']['checked'])) {
print_liste_field_titre($arrayfields['sp.total_tva']['label'], $_SERVER["PHP_SELF"], 'sp.total_tva', '', $param, '', $sortfield, $sortorder, 'right ');
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['sp.total_ttc']['checked'])) {
print_liste_field_titre($arrayfields['sp.total_ttc']['label'], $_SERVER["PHP_SELF"], 'sp.total_ttc', '', $param, '', $sortfield, $sortorder, 'right ');
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['sp.multicurrency_code']['checked'])) {
print_liste_field_titre($arrayfields['sp.multicurrency_code']['label'], $_SERVER['PHP_SELF'], 'sp.multicurrency_code', '', $param, '', $sortfield, $sortorder);
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['sp.multicurrency_tx']['checked'])) {
print_liste_field_titre($arrayfields['sp.multicurrency_tx']['label'], $_SERVER['PHP_SELF'], 'sp.multicurrency_tx', '', $param, '', $sortfield, $sortorder);
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['sp.multicurrency_total_ht']['checked'])) {
print_liste_field_titre($arrayfields['sp.multicurrency_total_ht']['label'], $_SERVER['PHP_SELF'], 'sp.multicurrency_total_ht', '', $param, 'class="right"', $sortfield, $sortorder);
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['sp.multicurrency_total_vat']['checked'])) {
print_liste_field_titre($arrayfields['sp.multicurrency_total_vat']['label'], $_SERVER['PHP_SELF'], 'sp.multicurrency_total_tva', '', $param, 'class="right"', $sortfield, $sortorder);
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['sp.multicurrency_total_ttc']['checked'])) {
print_liste_field_titre($arrayfields['sp.multicurrency_total_ttc']['label'], $_SERVER['PHP_SELF'], 'sp.multicurrency_total_ttc', '', $param, 'class="right"', $sortfield, $sortorder);
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['u.login']['checked'])) {
print_liste_field_titre($arrayfields['u.login']['label'], $_SERVER["PHP_SELF"], 'u.login', '', $param, '', $sortfield, $sortorder, 'center ');
+ $totalarray['nbfield']++;
}
// Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
@@ -949,15 +972,20 @@ if ($resql) {
print $hookmanager->resPrint;
if (!empty($arrayfields['sp.datec']['checked'])) {
print_liste_field_titre($arrayfields['sp.datec']['label'], $_SERVER["PHP_SELF"], "sp.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['sp.tms']['checked'])) {
print_liste_field_titre($arrayfields['sp.tms']['label'], $_SERVER["PHP_SELF"], "sp.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap');
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['sp.fk_statut']['checked'])) {
print_liste_field_titre($arrayfields['sp.fk_statut']['label'], $_SERVER["PHP_SELF"], "sp.fk_statut", "", $param, '', $sortfield, $sortorder, 'right ');
+ $totalarray['nbfield']++;
}
+ // Action
if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+ $totalarray['nbfield']++;
}
print ' '."\n";
@@ -965,6 +993,7 @@ if ($resql) {
$i = 0;
$total = 0;
$subtotal = 0;
+ $savnbfield = $totalarray['nbfield'];
$totalarray = array();
$totalarray['nbfield'] = 0;
$totalarray['val'] = array();
@@ -991,7 +1020,7 @@ if ($resql) {
if ($mode == 'kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | ';
print '';
}
// Output Kanban
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 2463cbc12f0..191d84e6983 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -3943,6 +3943,9 @@ table.liste td, table.noborder td, div.noborder form div, table.tableforservicep
/* line-height: 22px; This create trouble on cell login on list of last events of a contract*/
height: 22px;
}
+table.liste tr.trkanban td {
+ padding: 10px 12px 10px 12px; /* t r b l */
+}
div.liste_titre_bydiv .divsearchfield {
padding: 2px 1px 2px 7px; /* t r b l */
}
diff --git a/htdocs/theme/eldy/theme_vars.inc.php b/htdocs/theme/eldy/theme_vars.inc.php
index 3346ac5d73d..4476f002ead 100644
--- a/htdocs/theme/eldy/theme_vars.inc.php
+++ b/htdocs/theme/eldy/theme_vars.inc.php
@@ -57,8 +57,8 @@ $colorbacktabcard1 = '255,255,255'; // card
$colorbacktabactive = '234,234,234';
$colorbacklineimpair1 = '255,255,255'; // line impair
$colorbacklineimpair2 = '255,255,255'; // line impair
-$colorbacklinepair1 = '250,250,250'; // line pair
-$colorbacklinepair2 = '250,250,250'; // line pair
+$colorbacklinepair1 = '252,252,252'; // line pair
+$colorbacklinepair2 = '252,252,252'; // line pair
$colorbacklinepairhover = '230,237,244'; // line hover
$colorbacklinepairchecked = '230,237,244'; // line checked
$colorbacklinebreak = '248,247,244'; // line break
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index db6561ea15b..4ce3b9e11a4 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -4054,6 +4054,10 @@ table.liste td, table.noborder td, div.noborder form div, table.tableforservicep
padding: 4px 6px 4px 6px; /* t r b l */
height: 22px;
}
+table.liste tr.trkanban td {
+ padding: 10px 14px 10px 14px; /* t r b l */
+}
+
form.tagtable {
padding: unset !important;
border: unset !important;
diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index e986a09b0fe..f79eba64a52 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -1007,11 +1007,11 @@ while ($i < $imaxinloop) {
// Store properties in $object
$object->setVarsFromFetchObj($obj);
$object->type_code = $obj->type_code;
- $object->status = $object->fk_statut; // fk_statut is deprecated
+ $object->status = $object->fk_statut; // for backwad compatibility
if ($mode == 'kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | ';
print '';
}
diff --git a/htdocs/user/group/list.php b/htdocs/user/group/list.php
index 532602ca617..f14eace736a 100644
--- a/htdocs/user/group/list.php
+++ b/htdocs/user/group/list.php
@@ -405,7 +405,7 @@ while ($i < $imaxinloop) {
if ($mode == 'kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | ';
print '';
}
// Output Kanban
diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index 5184dd75202..2e15acce7b8 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -1009,7 +1009,7 @@ while ($i < $imaxinloop) {
if ($mode == 'kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | ';
print '';
}
diff --git a/htdocs/variants/list.php b/htdocs/variants/list.php
index 6b27a567ec9..d9daf1e28d4 100644
--- a/htdocs/variants/list.php
+++ b/htdocs/variants/list.php
@@ -667,7 +667,7 @@ while ($i < $imaxinloop) {
if ($mode == 'kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | ';
print '';
}
// Output Kanban
diff --git a/htdocs/webhook/target_list.php b/htdocs/webhook/target_list.php
index 029a194269f..1196e439c9c 100644
--- a/htdocs/webhook/target_list.php
+++ b/htdocs/webhook/target_list.php
@@ -634,7 +634,7 @@ while ($i < $imaxinloop) {
if ($mode == 'kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | ';
print '';
}
// Output Kanban
diff --git a/htdocs/workstation/workstation_list.php b/htdocs/workstation/workstation_list.php
index 95de830dcbe..f77ee16fc96 100644
--- a/htdocs/workstation/workstation_list.php
+++ b/htdocs/workstation/workstation_list.php
@@ -628,7 +628,7 @@ while ($i < $imaxinloop) {
if ($mode == 'kanban') {
if ($i == 0) {
- print ' | ';
+ print ' | | ';
print ' ';
}
// Output Kanban
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |