diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php index a602edc810d..7fc5a866eec 100644 --- a/htdocs/expensereport/class/expensereport.class.php +++ b/htdocs/expensereport/class/expensereport.class.php @@ -113,14 +113,32 @@ class ExpenseReport extends CommonObject */ public $fk_statut; + /** + * @var int ID + */ public $fk_c_paiement; + + /** + * @var int ID + */ public $modepaymentid; public $paid; + // Paiement + /** + * @var string Firstname Lastname + */ public $user_paid_infos; + /** + * @var string Firstname Lastname + */ public $user_author_infos; + + /** + * @var string Firstname Lastname + */ public $user_validator_infos; public $rule_warning_message; @@ -211,7 +229,7 @@ class ExpenseReport extends CommonObject public $fk_user_valid; /** - * @var int ID + * @var string Firstname Lastname */ public $user_valid_infos; diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php index 642b4612358..cc371eb138c 100644 --- a/htdocs/fourn/facture/list.php +++ b/htdocs/fourn/facture/list.php @@ -11,7 +11,7 @@ * Copyright (C) 2015-2016 Ferran Marcet * Copyright (C) 2017 Josep Lluís Amador * Copyright (C) 2018-2022 Charlene Benke - * Copyright (C) 2018-2020 Frédéric France + * Copyright (C) 2018-2024 Frédéric France * Copyright (C) 2019-2023 Alexandre Spangaro * Copyright (C) 2023 Nick Fragoulis * Copyright (C) 2023 Joachim Kueter @@ -1595,7 +1595,6 @@ while ($i < $imaxinloop) { $facturestatic->alreadypaid = ($paiement ? $paiement : 0); $facturestatic->paye = $obj->paye; - $facturestatic->socid = $thirdparty->getNomUrl(1, 'supplier', 3); $facturestatic->date = $db->jdate($obj->datef);