Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-07 16:41:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0

Browse Source 
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/admin/defaultvalues.php
	htdocs/societe/card.php
This commit is contained in:
Laurent Destailleur
2019-01-08 01:53:00 +01:00
parent 1188540b41 9d8b084115
commit d2f6899346
7 changed files with 56 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/admin/defaultvalues.php
View File

@@ -383,8 +383,10 @@ if ($result)
print '</td>';
}
// Multicompany
print '<td></td>';
if (! empty($conf->multicompany->enabled) && !$user->entity)
{
print '<td></td>';
}
// Actions
print '<td align="center">';