Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Updated: User accountancy code depends on Accounting module, not Salaries module

Browse Source
This commit is contained in:
aspangaro
2016-02-13 08:03:49 +01:00
parent 298be09ee2
commit 9c20bf1b2e
1 changed files with 4 additions and 4 deletions
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) 2011 Herve Prot <herve.prot@symeos.com>
* Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro> * 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 Jean-François Ferry <jfefe@aternatik.fr>
* Copyright (C) 2015 Ari Elbaz (elarifr) <github@accedinfo.com> * Copyright (C) 2015 Ari Elbaz (elarifr) <github@accedinfo.com>
* *
@@ -1065,7 +1065,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
print "</tr>\n"; print "</tr>\n";
// Accountancy code // Accountancy code
if ($conf->salaries->enabled) if ($conf->accounting->enabled)
{ {
print '<tr><td>'.$langs->trans("AccountancyCode").'</td>'; print '<tr><td>'.$langs->trans("AccountancyCode").'</td>';
print '<td>'; print '<td>';
@@ -1402,7 +1402,7 @@ else
print "</tr>\n"; print "</tr>\n";
// Accountancy code // Accountancy code
if ($conf->salaries->enabled) if ($conf->accounting->enabled)
{ {
print '<tr><td>'.$langs->trans("AccountancyCode").'</td>'; print '<tr><td>'.$langs->trans("AccountancyCode").'</td>';
print '<td>'.$object->accountancy_code.'</td>'; print '<td>'.$object->accountancy_code.'</td>';
@@ -2173,7 +2173,7 @@ else
print "</tr>\n"; print "</tr>\n";
// Accountancy code // Accountancy code
if ($conf->salaries->enabled) if ($conf->accounting->enabled)
{ {
print "<tr>"; print "<tr>";
print '<td>'.$langs->trans("AccountancyCode").'</td>'; print '<td>'.$langs->trans("AccountancyCode").'</td>';