Index: src/include/lib/Garradin/Recherche.php ================================================================== --- src/include/lib/Garradin/Recherche.php +++ src/include/lib/Garradin/Recherche.php @@ -311,10 +311,18 @@ 'label' => 'Remarques', 'type' => 'text', 'null' => true, 'alias' => 'notes', ]; + + $columns['l.id'] = (object) [ + 'textMatch'=> null, + 'label' => null, + 'type' => 'integer', + 'null' => true, + 'alias' => 'id_line', + ]; $columns['l.label'] = (object) [ 'textMatch'=> true, 'label' => 'Libellé ligne', 'type' => 'text', @@ -531,11 +539,11 @@ $query_columns = array_merge([$config->get('champ_identite')], $query_columns); } // Ajout de champs compta si pas présents elseif ($target == 'compta') { - $query_columns = array_merge(['t.id', 't.date', 't.label', 'l.debit', 'l.credit', 'a.code'], $query_columns); + $query_columns = array_merge(['t.id', 't.date', 't.label', 'l.id', 'l.debit', 'l.credit', 'a.code'], $query_columns); } $query_columns[] = $order; if ($target_columns[$order]->textMatch) Index: src/templates/acc/search.tpl ================================================================== --- src/templates/acc/search.tpl +++ src/templates/acc/search.tpl @@ -8,18 +8,26 @@ {include file="common/search/advanced.tpl" action_url=$self_url} {if !empty($result)} - {*if $session->canAccess($session::SECTION_ACCOUNTING, $session::ACCESS_WRITE)} -
+{/if} {*if $session->canAccess($session::SECTION_USERS, $session::ACCESS_ADMIN)} {include file="admin/membres/_list_actions.tpl" colspan=count($result_header)+1} {/if*} Index: src/templates/acc/transactions/actions_analytical.tpl ================================================================== --- src/templates/acc/transactions/actions_analytical.tpl +++ src/templates/acc/transactions/actions_analytical.tpl @@ -6,11 +6,11 @@Index: src/templates/common/search/advanced.tpl ================================================================== --- src/templates/common/search/advanced.tpl +++ src/templates/common/search/advanced.tpl @@ -2,10 +2,11 @@ assert(isset($columns)); assert(isset($action_url)); assert(isset($query)); assert(isset($is_admin)); $sql_disabled = !$is_admin || (!$session->canAccess($session::SECTION_CONFIG, $session::ACCESS_ADMIN) && $is_unprotected); +unset($columns['l.id']); ?> {form_errors}