diff --git a/htdocs/compta/paymentbybanktransfer/index.php b/htdocs/compta/paymentbybanktransfer/index.php index a67398034ce..37de3bfbbbd 100644 --- a/htdocs/compta/paymentbybanktransfer/index.php +++ b/htdocs/compta/paymentbybanktransfer/index.php @@ -168,16 +168,13 @@ if (isModEnabled('supplier_invoice')) { $invoicestatic->date = $db->jdate($obj->datef); $invoicestatic->date_echeance = $db->jdate($obj->date_lim_reglement); $invoicestatic->total_ttc = $obj->total_ttc; - $alreadypayed = $invoicestatic->getSommePaiement(); + $alreadypayed = $invoicestatic->getSommePaiement(); $thirdpartystatic->id = $obj->socid; $thirdpartystatic->name = $obj->name; $thirdpartystatic->email = $obj->email; $thirdpartystatic->tva_intra = $obj->tva_intra; - $thirdpartystatic->siren = $obj->idprof1; - $thirdpartystatic->siret = $obj->idprof2; - $thirdpartystatic->ape = $obj->idprof3; $thirdpartystatic->idprof1 = $obj->idprof1; $thirdpartystatic->idprof2 = $obj->idprof2; $thirdpartystatic->idprof3 = $obj->idprof3; @@ -186,7 +183,6 @@ if (isModEnabled('supplier_invoice')) { $thirdpartystatic->idprof6 = $obj->idprof6; - print ''; print $invoicestatic->getNomUrl(1, 'withdraw'); print ''; @@ -233,8 +229,11 @@ if (isModEnabled('salaries')) { if ($numRow) { while ($j < $numRow && $j<10) { $objSalary = $db->fetch_object($resql2); + $user->fetch($objSalary->fk_user); + $salary->fetch($objSalary->fk_salary); + $alreadypayedS = $salary->getSommePaiement(); print ''; @@ -242,14 +241,14 @@ if (isModEnabled('salaries')) { print ''; print ''; - print $user->getNomUrl(1); + print $user->getNomUrl(-1); print ''; print ''; print ''.price($objSalary->amount).''; print ''; - print ''; + print ''; print dol_print_date($db->jdate($objSalary->date_demande), 'day'); print ''; diff --git a/htdocs/salaries/virement_request.php b/htdocs/salaries/virement_request.php index 664faba42ca..83f8868c05e 100644 --- a/htdocs/salaries/virement_request.php +++ b/htdocs/salaries/virement_request.php @@ -56,7 +56,7 @@ if (isModEnabled('project')) { } // Load translation files required by the page -$langs->loadLangs(array("compta", "bills", "users", "salaries", "hrm")); +$langs->loadLangs(array("compta", "bills", "users", "salaries", "hrm", "withdrawals")); $id = GETPOST('id', 'int'); $ref = GETPOST('ref', 'alpha');