diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php index e291d54acca..37c125668ec 100644 --- a/htdocs/compta/bank/bankentries_list.php +++ b/htdocs/compta/bank/bankentries_list.php @@ -446,13 +446,32 @@ if ($id > 0 || !empty($ref)) { if ($object->canBeConciliated() > 0) { + $allowautomaticconciliation = false; // TODO + $titletoconciliatemanual = $langs->trans("Conciliate"); + $titletoconciliateauto = $langs->trans("Conciliate"); + if ($allowautomaticconciliation) { + $titletoconciliatemanual .= ' ('.$langs->trans("Manual").')'; + $titletoconciliateauto .= ' ('.$langs->trans("Auto").')'; + } + // If not cash account and can be reconciliate if ($user->rights->banque->consolidate) { $newparam = $param; $newparam = preg_replace('/search_conciliated=\d+/i', '', $newparam); - $buttonreconcile = ''.$langs->trans("Conciliate").''; + $buttonreconcile = ''.$titletoconciliatemanual.''; } else { - $buttonreconcile = ''.$langs->trans("Conciliate").''; + $buttonreconcile = ''.$titletoconciliatemanual.''; + } + + if ($allowautomaticconciliation) { + // If not cash account and can be reconciliate + if ($user->rights->banque->consolidate) { + $newparam = $param; + $newparam = preg_replace('/search_conciliated=\d+/i', '', $newparam); + $buttonreconcile .= ' '.$titletoconciliateauto.''; + } else { + $buttonreconcile .= ' '.$titletoconciliateauto.''; + } } } } diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php index c14c1bf6ab5..5f095363e12 100644 --- a/htdocs/compta/bank/releve.php +++ b/htdocs/compta/bank/releve.php @@ -257,12 +257,34 @@ if (empty($numref)) print '
'; if ($object->canBeConciliated() > 0) { + $allowautomaticconciliation = false; // TODO + $titletoconciliatemanual = $langs->trans("Conciliate"); + $titletoconciliateauto = $langs->trans("Conciliate"); + if ($allowautomaticconciliation) { + $titletoconciliatemanual .= ' ('.$langs->trans("Manual").')'; + $titletoconciliateauto .= ' ('.$langs->trans("Auto").')'; + } + // If not cash account and can be reconciliate if ($user->rights->banque->consolidate) { - print ''.$langs->trans("Conciliate").''; + $buttonreconcile = ''.$titletoconciliatemanual.''; } else { - print ''.$langs->trans("Conciliate").''; + $buttonreconcile = ''.$titletoconciliatemanual.''; } + + + if ($allowautomaticconciliation) { + // If not cash account and can be reconciliate + if ($user->rights->banque->consolidate) { + $newparam = $param; + $newparam = preg_replace('/search_conciliated=\d+/i', '', $newparam); + $buttonreconcile .= ' '.$titletoconciliateauto.''; + } else { + $buttonreconcile .= ' '.$titletoconciliateauto.''; + } + } + + print $buttonreconcile; } print '
'; diff --git a/htdocs/theme/eldy/btn.inc.php b/htdocs/theme/eldy/btn.inc.php index 364723e2152..d6a2251b390 100644 --- a/htdocs/theme/eldy/btn.inc.php +++ b/htdocs/theme/eldy/btn.inc.php @@ -58,7 +58,9 @@ div.tabsActionNoBottom > a.butAction, div.tabsActionNoBottom > a.butActionRefuse span.butAction, span.butActionDelete { cursor: pointer; } - +.paginationafterarrows .butAction { + font-size: 0.9em; +} .butAction { background: var(--butactionbg); color: #FFF !important;