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

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

@ -3397,6 +3397,8 @@ if ($action == 'create')
print '</td></tr>'; print '</td></tr>';
// Bank Account // Bank Account
if (!empty($conf->banque->enabled))
{
if (GETPOSTISSET('fk_account')) { if (GETPOSTISSET('fk_account')) {
$fk_account = GETPOST('fk_account'); $fk_account = GETPOST('fk_account');
} }
@ -3404,6 +3406,7 @@ if ($action == 'create')
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,6 +4267,8 @@ if ($action == 'create')
} }
// Bank Account // Bank Account
if (!empty($conf->banque->enabled))
{
print '<tr><td class="nowrap">'; print '<tr><td class="nowrap">';
print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">'; print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
print $langs->trans('BankAccount'); print $langs->trans('BankAccount');
@ -4280,6 +4285,7 @@ if ($action == 'create')
} }
print "</td>"; print "</td>";
print '</tr>'; print '</tr>';
}
// Incoterms // Incoterms
if (!empty($conf->incoterm->enabled)) if (!empty($conf->incoterm->enabled))

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

@ -2015,9 +2015,12 @@ if ($action == 'create')
print '</td></tr>'; print '</td></tr>';
// Bank Account // Bank Account
if (!empty($conf->banque->enabled))
{
print '<tr><td>'.$langs->trans('BankAccount').'</td><td>'; print '<tr><td>'.$langs->trans('BankAccount').'</td><td>';
$form->select_comptes((GETPOSTISSET('fk_account') ?GETPOST('fk_account', 'alpha') : $fk_account), 'fk_account', 0, '', 1); $form->select_comptes((GETPOSTISSET('fk_account') ?GETPOST('fk_account', 'alpha') : $fk_account), 'fk_account', 0, '', 1);
print '</td></tr>'; print '</td></tr>';
}
// Multicurrency // Multicurrency
if (!empty($conf->multicurrency->enabled)) if (!empty($conf->multicurrency->enabled))
@ -2589,6 +2592,8 @@ if ($action == 'create')
} }
// Bank Account // Bank Account
if (!empty($conf->banque->enabled))
{
print '<tr><td class="nowrap">'; print '<tr><td class="nowrap">';
print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">'; print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
print $langs->trans('BankAccount'); print $langs->trans('BankAccount');
@ -2604,6 +2609,7 @@ if ($action == 'create')
} }
print "</td>"; print "</td>";
print '</tr>'; print '</tr>';
}
// Incoterms // Incoterms
if (!empty($conf->incoterm->enabled)) if (!empty($conf->incoterm->enabled))