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

Merge pull request #4817 from aspangaro/3.9-p19

Browse Source 
Fix: 3.9 Problem of rowspan in edit mode on user card
This commit is contained in:
Laurent Destailleur 2016-03-18 00:02:19 +01:00
commit e201357907
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
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>
* *
@ -1049,7 +1049,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>';
@ -1386,7 +1386,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>';
@ -1733,13 +1733,14 @@ else
dol_fiche_head($head, 'user', $title, 0, 'user'); dol_fiche_head($head, 'user', $title, 0, 'user');
$rowspan=17; $rowspan=22;
if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file->main_authentication) && ! empty($conf->global->MAIN_OPENIDURL_PERUSER)) $rowspan++; if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file->main_authentication) && ! empty($conf->global->MAIN_OPENIDURL_PERUSER)) $rowspan++;
if (! empty($conf->societe->enabled)) $rowspan++; if (! empty($conf->societe->enabled)) $rowspan++;
if (! empty($conf->adherent->enabled)) $rowspan++; if (! empty($conf->adherent->enabled)) $rowspan++;
if (! empty($conf->skype->enabled)) $rowspan++; if (! empty($conf->skype->enabled)) $rowspan++;
if (! empty($conf->salaries->enabled) && ! empty($user->rights->salaries->read)) $rowspan = $rowspan+3; if (! empty($conf->salaries->enabled) && ! empty($user->rights->salaries->read)) $rowspan = $rowspan+3;
if (! empty($conf->agenda->enabled)) $rowspan++; if (! empty($conf->agenda->enabled)) $rowspan++;
if (! empty($conf->accounting->enabled)) $rowspan++;
print '<table width="100%" class="border">'; print '<table width="100%" class="border">';
@ -2157,7 +2158,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>';