Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2

This commit is contained in:
Regis Houssin 2012-05-29 09:56:20 +02:00
commit 1cbd628971
2 changed files with 8 additions and 2 deletions

View File

@ -672,7 +672,10 @@ if (GETPOST("source") == 'membersubscription' && $valid)
// Debitor
$var=!$var;
print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Member");
print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$member->getFullName($langs).'</b>';
print '</td><td class="CTableRow'.($var?'1':'2').'"><b>';
if ($member->morphy == 'mor' && ! empty($member->societe)) print $member->societe;
else print $member->getFullName($langs);
print '</b>';
// Object
$var=!$var;

View File

@ -828,7 +828,10 @@ if (GETPOST("source") == 'membersubscription' && $valid)
// Debitor
$var=!$var;
print '<tr class="CTableRow'.($var?'1':'2').'"><td class="CTableRow'.($var?'1':'2').'">'.$langs->trans("Member");
print '</td><td class="CTableRow'.($var?'1':'2').'"><b>'.$member->getFullName($langs).'</b>';
print '</td><td class="CTableRow'.($var?'1':'2').'"><b>';
if ($member->morphy == 'mor' && ! empty($member->societe)) print $member->societe;
else print $member->getFullName($langs);
print '</b>';
// Object
$var=!$var;