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

Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0

Browse Source
This commit is contained in:
Laurent Destailleur 2023-01-06 16:52:06 +01:00
commit 0eb0ee5bb1
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/compta/bank/various_payment/list.php
View File

@ -650,6 +650,7 @@ if ($result) {
// Accounting account // Accounting account
if ($arrayfields['account']['checked']) { if ($arrayfields['account']['checked']) {
require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
$accountingaccount->fetch('', $obj->accountancy_code, 1); $accountingaccount->fetch('', $obj->accountancy_code, 1);
print '<td>'.$accountingaccount->getNomUrl(0, 1, 1, '', 1).'</td>'; print '<td>'.$accountingaccount->getNomUrl(0, 1, 1, '', 1).'</td>';

2
htdocs/projet/activity/permonth.php
View File

@ -418,7 +418,7 @@ if (! empty($conf->categorie->enabled))
// If the user can view user other than himself // If the user can view user other than himself
$moreforfilter .= '<div class="divsearchfield">'; $moreforfilter .= '<div class="divsearchfield">';
$moreforfilter .= '<div class="inline-block hideonsmartphone"></div>'; $moreforfilter .= '<div class="inline-block hideonsmartphone"></div>';
$includeonly = 'hierachyme'; $includeonly = 'hierarchyme';
if (empty($user->rights->user->user->lire)) { if (empty($user->rights->user->user->lire)) {
$includeonly = array($user->id); $includeonly = array($user->id);
} }