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

Merge pull request #14576 from TobiasSekan/ShowBankOnlyWhenActive

Browse Source 
FIX: Show bank account only when bank module is active (on invoices)
This commit is contained in:
Laurent Destailleur 2020-09-03 13:19:32 +02:00 committed by GitHub
commit 661e3c7a11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 49 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
htdocs/compta/facture/card.php
View File

@ -3397,13 +3397,16 @@ if ($action == 'create')
print '</td></tr>'; print '</td></tr>';
// Bank Account // Bank Account
if (GETPOSTISSET('fk_account')) { if (!empty($conf->banque->enabled))
$fk_account = GETPOST('fk_account'); {
} if (GETPOSTISSET('fk_account')) {
$fk_account = GETPOST('fk_account');
}
print '<tr><td>'.$langs->trans('BankAccount').'</td><td colspan="2">'; print '<tr><td>'.$langs->trans('BankAccount').'</td><td colspan="2">';
$form->select_comptes($fk_account, 'fk_account', 0, '', 1); $form->select_comptes($fk_account, 'fk_account', 0, '', 1);
print '</td></tr>'; print '</td></tr>';
}
// Project // Project
if (!empty($conf->projet->enabled)) if (!empty($conf->projet->enabled))
@ -4264,22 +4267,25 @@ if ($action == 'create')
} }
// Bank Account // Bank Account
print '<tr><td class="nowrap">'; if (!empty($conf->banque->enabled))
print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
print $langs->trans('BankAccount');
print '<td>';
if (($action != 'editbankaccount') && $usercancreate)
print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
print '</tr></table>';
print '</td><td>';
if ($action == 'editbankaccount')
{ {
$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1); print '<tr><td class="nowrap">';
} else { print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none'); print $langs->trans('BankAccount');
print '<td>';
if (($action != 'editbankaccount') && $usercancreate)
print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
print '</tr></table>';
print '</td><td>';
if ($action == 'editbankaccount')
{
$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1);
} else {
$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none');
}
print "</td>";
print '</tr>';
} }
print "</td>";
print '</tr>';
// Incoterms // Incoterms
if (!empty($conf->incoterm->enabled)) if (!empty($conf->incoterm->enabled))

40
htdocs/fourn/facture/card.php
View File

@ -2015,9 +2015,12 @@ if ($action == 'create')
print '</td></tr>'; print '</td></tr>';
// Bank Account // Bank Account
print '<tr><td>'.$langs->trans('BankAccount').'</td><td>'; if (!empty($conf->banque->enabled))
$form->select_comptes((GETPOSTISSET('fk_account') ?GETPOST('fk_account', 'alpha') : $fk_account), 'fk_account', 0, '', 1); {
print '</td></tr>'; print '<tr><td>'.$langs->trans('BankAccount').'</td><td>';
$form->select_comptes((GETPOSTISSET('fk_account') ?GETPOST('fk_account', 'alpha') : $fk_account), 'fk_account', 0, '', 1);
print '</td></tr>';
}
// Multicurrency // Multicurrency
if (!empty($conf->multicurrency->enabled)) if (!empty($conf->multicurrency->enabled))
@ -2589,21 +2592,24 @@ if ($action == 'create')
} }
// Bank Account // Bank Account
print '<tr><td class="nowrap">'; if (!empty($conf->banque->enabled))
print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">'; {
print $langs->trans('BankAccount'); print '<tr><td class="nowrap">';
print '<td>'; print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
if ($action != 'editbankaccount' && $usercancreate) print $langs->trans('BankAccount');
print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>'; print '<td>';
print '</tr></table>'; if ($action != 'editbankaccount' && $usercancreate)
print '</td><td colspan="3">'; print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
if ($action == 'editbankaccount') { print '</tr></table>';
$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1); print '</td><td colspan="3">';
} else { if ($action == 'editbankaccount') {
$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none'); $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1);
} else {
$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none');
}
print "</td>";
print '</tr>';
} }
print "</td>";
print '</tr>';
// Incoterms // Incoterms
if (!empty($conf->incoterm->enabled)) if (!empty($conf->incoterm->enabled))