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

Merge pull request #15212 from Dolibarr/revert-15182-FIX_11.0_various_payment_subledger

Browse Source 
Revert "FIX: various payments: bad data handling for subledger account + useless db commit/rollback"
This commit is contained in:
Laurent Destailleur 2020-10-29 10:37:33 +01:00 committed by GitHub
commit 89dcbfae82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/compta/bank/various_payment/card.php
View File

@ -115,7 +115,7 @@ if (empty($reshook))
$object->category_transaction = GETPOST("category_transaction", 'alpha');
$object->accountancy_code = GETPOST("accountancy_code") > 0 ? GETPOST("accountancy_code", "alpha") : "";
$object->subledger_account = $subledger_account;
$object->subledger_account = GETPOST("subledger_account") > 0 ? GETPOST("subledger_account", "alpha") : "";
$object->sens = GETPOST('sens');
$object->fk_project = GETPOST('fk_project', 'int');
@ -221,10 +221,13 @@ if (empty($reshook))
if ($action == 'setsubledger_account') {
$result = $object->fetch($id);
$object->subledger_account = $subledger_account;
$object->subledger_account = (GETPOST("subledger_account") > 0 ? GETPOST("subledger_account", "alpha") : "");
$res = $object->update($user);
if ($res < 0) {
if ($res > 0) {
$db->commit();
} else {
$db->rollback();
setEventMessages($object->error, $object->errors, 'errors');
}
}