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

Prepare button to the bank conciliation pages

Browse Source
This commit is contained in:
Laurent Destailleur 2021-02-08 22:42:21 +01:00
parent 401b4f641d
commit c9f34cc0d4
3 changed files with 48 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
htdocs/compta/bank/bankentries_list.php
View File

@ -446,13 +446,32 @@ if ($id > 0 || !empty($ref))
{ {
if ($object->canBeConciliated() > 0) 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 not cash account and can be reconciliate
if ($user->rights->banque->consolidate) { if ($user->rights->banque->consolidate) {
$newparam = $param; $newparam = $param;
$newparam = preg_replace('/search_conciliated=\d+/i', '', $newparam); $newparam = preg_replace('/search_conciliated=\d+/i', '', $newparam);
$buttonreconcile = '<a class="butAction" style="margin-bottom: 5px !important; margin-top: 5px !important" href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?action=reconcile&sortfield=b.datev,b.dateo,b.rowid&amp;sortorder=asc,asc,asc&search_conciliated=0'.$newparam.'">'.$langs->trans("Conciliate").'</a>'; $buttonreconcile = '<a class="butAction" style="margin-bottom: 5px !important; margin-top: 5px !important" href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?action=reconcile&sortfield=b.datev,b.dateo,b.rowid&amp;sortorder=asc,asc,asc&search_conciliated=0'.$newparam.'">'.$titletoconciliatemanual.'</a>';
} else { } else {
$buttonreconcile = '<a class="butActionRefused" style="margin-bottom: 5px !important; margin-top: 5px !important" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$langs->trans("Conciliate").'</a>'; $buttonreconcile = '<a class="butActionRefused" style="margin-bottom: 5px !important; margin-top: 5px !important" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$titletoconciliatemanual.'</a>';
}
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 .= ' <a class="butAction" style="margin-bottom: 5px !important; margin-top: 5px !important" href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?action=reconcile&sortfield=b.datev,b.dateo,b.rowid&amp;sortorder=asc,asc,asc&search_conciliated=0'.$newparam.'">'.$titletoconciliateauto.'</a>';
} else {
$buttonreconcile .= ' <a class="butActionRefused" style="margin-bottom: 5px !important; margin-top: 5px !important" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$titletoconciliateauto.'</a>';
}
} }
} }
} }

26
htdocs/compta/bank/releve.php
View File

@ -257,12 +257,34 @@ if (empty($numref))
print '<div class="tabsAction">'; print '<div class="tabsAction">';
if ($object->canBeConciliated() > 0) { 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 not cash account and can be reconciliate
if ($user->rights->banque->consolidate) { if ($user->rights->banque->consolidate) {
print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?action=reconcile&sortfield=b.datev,b.dateo,b.rowid&sortorder=asc,asc,asc&search_conciliated=0&search_account='.$id.$param.'">'.$langs->trans("Conciliate").'</a>'; $buttonreconcile = '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?action=reconcile&sortfield=b.datev,b.dateo,b.rowid&sortorder=asc,asc,asc&search_conciliated=0&search_account='.$id.$param.'">'.$titletoconciliatemanual.'</a>';
} else { } else {
print '<a class="butActionRefused classfortooltip" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$langs->trans("Conciliate").'</a>'; $buttonreconcile = '<a class="butActionRefused classfortooltip" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$titletoconciliatemanual.'</a>';
} }
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 .= ' <a class="butAction" style="margin-bottom: 5px !important; margin-top: 5px !important" href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?action=reconcile&sortfield=b.datev,b.dateo,b.rowid&amp;sortorder=asc,asc,asc&search_conciliated=0'.$newparam.'">'.$titletoconciliateauto.'</a>';
} else {
$buttonreconcile .= ' <a class="butActionRefused" style="margin-bottom: 5px !important; margin-top: 5px !important" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$titletoconciliateauto.'</a>';
}
}
print $buttonreconcile;
} }
print '</div>'; print '</div>';

4
htdocs/theme/eldy/btn.inc.php
View File

@ -58,7 +58,9 @@ div.tabsActionNoBottom > a.butAction, div.tabsActionNoBottom > a.butActionRefuse
span.butAction, span.butActionDelete { span.butAction, span.butActionDelete {
cursor: pointer; cursor: pointer;
} }
.paginationafterarrows .butAction {
font-size: 0.9em;
}
.butAction { .butAction {
background: var(--butactionbg); background: var(--butactionbg);
color: #FFF !important; color: #FFF !important;