From 36c39657d616916dda582298d9756e7c9ed601e9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 6 Mar 2023 19:06:23 +0100 Subject: [PATCH] Fix amount --- htdocs/compta/facture/prelevement.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php index 0d73fba7281..9be13ef092e 100644 --- a/htdocs/compta/facture/prelevement.php +++ b/htdocs/compta/facture/prelevement.php @@ -835,7 +835,7 @@ if ($object->id > 0) { $sql = "SELECT pfd.rowid, pfd.traite, pfd.date_demande as date_demande,"; $sql .= " pfd.date_traite as date_traite, pfd.amount, pfd.fk_prelevement_bons,"; - $sql .= " pb.ref, pb.date_trans, pb.method_trans, pb.credite, pb.date_credit, pb.datec, pb.statut as status,"; + $sql .= " pb.ref, pb.date_trans, pb.method_trans, pb.credite, pb.date_credit, pb.datec, pb.statut as status, pb.amount as pb_amount,"; $sql .= " u.rowid as user_id, u.email, u.lastname, u.firstname, u.login, u.statut as user_status"; $sql .= " FROM ".MAIN_DB_PREFIX."prelevement_demande as pfd"; $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on pfd.fk_user_demande = u.rowid"; @@ -896,7 +896,7 @@ if ($object->id > 0) { $withdrawreceipt->date_creation = $db->jdate($obj->datec); $withdrawreceipt->statut = $obj->status; $withdrawreceipt->status = $obj->status; - $withdrawreceipt->amount = $obj->amount; + $withdrawreceipt->amount = $obj->pb_amount; //$withdrawreceipt->credite = $db->jdate($obj->credite); print $withdrawreceipt->getNomUrl(1); @@ -943,7 +943,7 @@ if ($object->id > 0) { // Past requests $sql = "SELECT pfd.rowid, pfd.traite, pfd.date_demande, pfd.date_traite, pfd.fk_prelevement_bons, pfd.amount,"; - $sql .= " pb.ref, pb.date_trans, pb.method_trans, pb.credite, pb.date_credit, pb.datec, pb.statut as status, pb.fk_bank_account,"; + $sql .= " pb.ref, pb.date_trans, pb.method_trans, pb.credite, pb.date_credit, pb.datec, pb.statut as status, pb.fk_bank_account, pb.amount as pb_amount"; $sql .= " u.rowid as user_id, u.email, u.lastname, u.firstname, u.login, u.statut as user_status"; $sql .= " FROM ".MAIN_DB_PREFIX."prelevement_demande as pfd"; $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on pfd.fk_user_demande = u.rowid"; @@ -1004,7 +1004,7 @@ if ($object->id > 0) { $withdrawreceipt->statut = $obj->status; $withdrawreceipt->status = $obj->status; $withdrawreceipt->fk_bank_account = $obj->fk_bank_account; - $withdrawreceipt->amount = $obj->amount; + $withdrawreceipt->amount = $obj->pb_amount; //$withdrawreceipt->credite = $db->jdate($obj->credite); print $withdrawreceipt->getNomUrl(1);