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

Better fix fox #20807

Browse Source
This commit is contained in:
Laurent Destailleur 2022-05-10 15:27:43 +02:00
parent 7d3ae7d4b8
commit 8ef75ecc7c
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
htdocs/compta/bank/line.php
View File

@ -52,11 +52,12 @@ if (!empty($conf->salaries->enabled)) {
$id = GETPOST('rowid', 'int'); $id = GETPOST('rowid', 'int');
$accountid = (GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('account', 'int')); $rowid = GETPOST("rowid", 'int');
$accountoldid = GETPOST('account', 'int'); // GETPOST('account') is old account id
$accountid = GETPOST('accountid', 'int'); // GETPOST('accountid') is new account id
$ref = GETPOST('ref', 'alpha'); $ref = GETPOST('ref', 'alpha');
$action = GETPOST('action', 'aZ09'); $action = GETPOST('action', 'aZ09');
$confirm = GETPOST('confirm', 'alpha'); $confirm = GETPOST('confirm', 'alpha');
$rowid = GETPOST("rowid", 'int');
$orig_account = GETPOST("orig_account"); $orig_account = GETPOST("orig_account");
$backtopage = GETPOST('backtopage', 'alpha'); $backtopage = GETPOST('backtopage', 'alpha');
$cancel = GETPOST('cancel', 'alpha'); $cancel = GETPOST('cancel', 'alpha');
@ -68,7 +69,7 @@ if ($user->socid) {
$socid = $user->socid; $socid = $user->socid;
} }
$result = restrictedArea($user, 'banque', $accountid, 'bank_account'); $result = restrictedArea($user, 'banque', $accountoldid, 'bank_account');
if (!$user->rights->banque->lire && !$user->rights->banque->consolidate) { if (!$user->rights->banque->lire && !$user->rights->banque->consolidate) {
accessforbidden(); accessforbidden();
} }
@ -126,15 +127,19 @@ if ($user->rights->banque->modifier && $action == "update") {
$acline->fetch($rowid); $acline->fetch($rowid);
$acsource = new Account($db); $acsource = new Account($db);
$acsource->fetch($id); $acsource->fetch($accountoldid);
$actarget = new Account($db); $actarget = new Account($db);
if (GETPOST('accountid', 'int') > 0 && !$acline->rappro && !$acline->getVentilExportCompta()) { // We ask to change bank account if (GETPOST('accountid', 'int') > 0 && !$acline->rappro && !$acline->getVentilExportCompta()) { // We ask to change bank account
$actarget->fetch(GETPOST('accountid', 'int')); $actarget->fetch(GETPOST('accountid', 'int'));
} else { } else {
$actarget->fetch($id); $actarget->fetch($accountoldid);
} }
if (!($actarget->id > 0)) {
setEventMessages($langs->trans("ErrorFailedToLoadBankAccount"), null, 'errors');
$error++;
}
if ($actarget->courant == Account::TYPE_CASH && GETPOST('value', 'alpha') != 'LIQ') { if ($actarget->courant == Account::TYPE_CASH && GETPOST('value', 'alpha') != 'LIQ') {
setEventMessages($langs->trans("ErrorCashAccountAcceptsOnlyCashMoney"), null, 'errors'); setEventMessages($langs->trans("ErrorCashAccountAcceptsOnlyCashMoney"), null, 'errors');
$error++; $error++;
@ -302,7 +307,6 @@ if ($result) {
print '<input type="hidden" name="action" value="update">'; print '<input type="hidden" name="action" value="update">';
print '<input type="hidden" name="orig_account" value="'.$orig_account.'">'; print '<input type="hidden" name="orig_account" value="'.$orig_account.'">';
print '<input type="hidden" name="account" value="'.$acct->id.'">'; print '<input type="hidden" name="account" value="'.$acct->id.'">';
print '<input type="hidden" name="id" value="'.$acct->id.'">';
print dol_get_fiche_head($head, 'bankline', $langs->trans('LineRecord'), 0, 'accountline', 0); print dol_get_fiche_head($head, 'bankline', $langs->trans('LineRecord'), 0, 'accountline', 0);
@ -607,11 +611,7 @@ if ($result) {
print dol_get_fiche_end(); print dol_get_fiche_end();
if (!$objp->rappro) {
print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Update").'"></div><br>'; print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Update").'"></div><br>';
} else {
print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Update").'" disabled></div><br>';
}
print "</form>"; print "</form>";