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

Merge pull request #4618 from aspangaro/develop-p6

Browse Source 
Updated: User accountancy code depends on Accounting module, not Salaries module
This commit is contained in:
Laurent Destailleur 2016-02-15 00:59:52 +01:00
commit 6d4d54a917
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/user/card.php
View File

@ -8,7 +8,7 @@
* Copyright (C) 2011 Herve Prot <herve.prot@symeos.com>
* Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2013-2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2013-2016 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
* Copyright (C) 2015 Ari Elbaz (elarifr) <github@accedinfo.com>
*
@ -1065,7 +1065,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
print "</tr>\n";
// Accountancy code
if ($conf->salaries->enabled)
if ($conf->accounting->enabled)
{
print '<tr><td>'.$langs->trans("AccountancyCode").'</td>';
print '<td>';
@ -1402,7 +1402,7 @@ else
print "</tr>\n";
// Accountancy code
if ($conf->salaries->enabled)
if ($conf->accounting->enabled)
{
print '<tr><td>'.$langs->trans("AccountancyCode").'</td>';
print '<td>'.$object->accountancy_code.'</td>';
@ -2173,7 +2173,7 @@ else
print "</tr>\n";
// Accountancy code
if ($conf->salaries->enabled)
if ($conf->accounting->enabled)
{
print "<tr>";
print '<td>'.$langs->trans("AccountancyCode").'</td>';