Fix: Error when editing memeber card

This commit is contained in:
Laurent Destailleur 2009-01-21 12:30:33 +00:00
parent c786173baa
commit f15eac3a7a

View File

@ -225,20 +225,24 @@ if ($user->rights->adherent->cotisation->creer && $action == 'edit')
print '<tr><td>'.$langs->trans("Label").'</td><td class="valeur" colspan="2">'; print '<tr><td>'.$langs->trans("Label").'</td><td class="valeur" colspan="2">';
print '<input type="text" class="flat" size="60" name="note" value="'.$subscription->note.'"></td></tr>'; print '<input type="text" class="flat" size="60" name="note" value="'.$subscription->note.'"></td></tr>';
if ($conf->banque->enabled && $conf->global->ADHERENT_BANK_USE) // Bank line
if ($conf->banque->enabled)
{ {
print '<tr><td>'.$langs->trans("BankTransactionLine").'</td><td class="valeur" colspan="2">'; if ($conf->global->ADHERENT_BANK_USE || $subscription->fk_bank)
if ($subscription->fk_bank) {
{ print '<tr><td>'.$langs->trans("BankTransactionLine").'</td><td class="valeur" colspan="2">';
$bankline=new AccountLine($db); if ($subscription->fk_bank)
$result=$bankline->fetch($subscription->fk_bank); {
print $bankline->getNomUrl(1,0,'showall'); $bankline=new AccountLine($db);
} $result=$bankline->fetch($subscription->fk_bank);
else print $bankline->getNomUrl(1,0,'showall');
{ }
print $langs->trans("NoneF"); else
} {
print '</td></tr>'; print $langs->trans("NoneF");
}
print '</td></tr>';
}
} }
print '<tr><td colspan="3" align="center">'; print '<tr><td colspan="3" align="center">';
@ -328,25 +332,23 @@ if ($rowid && $action != 'edit')
// Amount // Amount
print '<tr><td>'.$langs->trans("Label").'</td><td class="valeur" colspan="3">'.$subscription->note.'</td></tr>'; print '<tr><td>'.$langs->trans("Label").'</td><td class="valeur" colspan="3">'.$subscription->note.'</td></tr>';
// Bank account // Bank line
if ($conf->banque->enabled) if ($conf->banque->enabled)
{ {
if ($subscription->fk_bank) if ($conf->global->ADHERENT_BANK_USE || $subscription->fk_bank)
{ {
$bankline=new AccountLine($db); print '<tr><td>'.$langs->trans("BankTransactionLine").'</td><td class="valeur" colspan="3">';
$result=$bankline->fetch($subscription->fk_bank); if ($subscription->fk_bank)
{
$bank=new Account($db); $bankline=new AccountLine($db);
$result=$bank->fetch($bankline->fk_account); $result=$bankline->fetch($subscription->fk_bank);
print $bankline->getNomUrl(1,0,'showall');
print '<tr>'; }
print '<td>'.$langs->trans('BankTransactionLine').'</td>'; else
print '<td colspan="3">'; {
$bankline=new AccountLine($db); print $langs->trans("NoneF");
$result=$bankline->fetch($subscription->fk_bank); }
print $bankline->getNomUrl(1,0,'showall'); print '</td></tr>';
print '</td>';
print '</tr>';
} }
} }