From 7ac05c7549e2f6dd9d3c41882f2f96d16516e2ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Tue, 21 Nov 2023 21:36:34 +0100 Subject: [PATCH] fix phpstan (#26799) * fix phpstan * Update commoninvoice.class.php * Update facture.class.php * Update commoninvoice.class.php * fix properties --- htdocs/compta/facture/class/facture.class.php | 11 +++----- htdocs/core/class/commoninvoice.class.php | 19 -------------- htdocs/core/class/commonobject.class.php | 20 +++++++++++---- htdocs/core/class/commonobjectline.class.php | 25 ++++++++++++++++++- .../class/fournisseur.facture-rec.class.php | 9 ------- .../fourn/class/fournisseur.facture.class.php | 23 ----------------- 6 files changed, 42 insertions(+), 65 deletions(-) diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 25038832a1c..681faa2f698 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -231,6 +231,9 @@ class Facture extends CommonInvoice */ public $tab_next_situation_invoice = array(); + /** + * @var Facture object oldcopy + */ public $oldcopy; /** @@ -6073,14 +6076,6 @@ class FactureLigne extends CommonInvoiceLine */ public $fk_prev_id; - // Multicurrency - public $fk_multicurrency; - public $multicurrency_code; - public $multicurrency_subprice; - public $multicurrency_total_ht; - public $multicurrency_total_tva; - public $multicurrency_total_ttc; - /** * Constructor * diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php index 80082dcd9cd..8bb1907cd3b 100644 --- a/htdocs/core/class/commoninvoice.class.php +++ b/htdocs/core/class/commoninvoice.class.php @@ -88,18 +88,6 @@ abstract class CommonInvoice extends CommonObject public $sumcreditnote_multicurrency; public $remaintopay; - // Multicurrency - /** - * @var int ID - */ - public $fk_multicurrency; - - public $multicurrency_code; - public $multicurrency_tx; - public $multicurrency_total_ht; - public $multicurrency_total_tva; - public $multicurrency_total_ttc; - /** * @var int */ @@ -1984,13 +1972,6 @@ abstract class CommonInvoiceLine extends CommonObjectLine public $special_code = 0; - public $fk_multicurrency; - public $multicurrency_code; - public $multicurrency_subprice; - public $multicurrency_total_ht; - public $multicurrency_total_tva; - public $multicurrency_total_ttc; - public $fk_user_author; public $fk_user_modif; diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index e4c8e1f7a47..ef9e42a9aac 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -442,24 +442,34 @@ abstract class CommonObject */ public $shipping_method; + // Multicurrency /** - * @var string multicurrency code + * @var int ID + */ + public $fk_multicurrency; + + /** + * @var string Multicurrency code */ public $multicurrency_code; + /** - * @var string multicurrency tx + * @var float Multicurrency rate */ public $multicurrency_tx; + /** - * @var string multicurrency total_ht + * @var float Multicurrency total without tax */ public $multicurrency_total_ht; + /** - * @var string multicurrency total_tva + * @var float Multicurrency total vat */ public $multicurrency_total_tva; + /** - * @var string multicurrency total_ttc + * @var float Multicurrency total with tax */ public $multicurrency_total_ttc; diff --git a/htdocs/core/class/commonobjectline.class.php b/htdocs/core/class/commonobjectline.class.php index 9461eaa39e8..e31bef02423 100644 --- a/htdocs/core/class/commonobjectline.class.php +++ b/htdocs/core/class/commonobjectline.class.php @@ -108,11 +108,34 @@ abstract class CommonObjectLine extends CommonObject public $subprice; public $tva_tx; + /** + * @var int multicurrency id + */ + public $fk_multicurrency; + + /** + * @var string Multicurrency code + */ public $multicurrency_code; - public $multicurrency_tx; + + /** + * @var float Multicurrency subprice + */ public $multicurrency_subprice; + + /** + * @var float Multicurrency total without tax + */ public $multicurrency_total_ht; + + /** + * @var float Multicurrency total vat + */ public $multicurrency_total_tva; + + /** + * @var float Multicurrency total with tax + */ public $multicurrency_total_ttc; diff --git a/htdocs/fourn/class/fournisseur.facture-rec.class.php b/htdocs/fourn/class/fournisseur.facture-rec.class.php index b905a699c53..42c8d8eba5d 100644 --- a/htdocs/fourn/class/fournisseur.facture-rec.class.php +++ b/htdocs/fourn/class/fournisseur.facture-rec.class.php @@ -122,14 +122,6 @@ class FactureFournisseurRec extends CommonInvoice public $date_lim_reglement; - public $fk_multicurrency; - public $multicurrency_code; - public $multicurrency_tx; - public $multicurrency_subprice; - public $multicurrency_total_ht; - public $multicurrency_total_tva; - public $multicurrency_total_ttc; - public $usenewprice = 0; public $frequency; public $unit_frequency; @@ -2021,7 +2013,6 @@ class FactureFournisseurLigneRec extends CommonObjectLine public $fk_user_author; public $fk_user_modif; - public $fk_multicurrency; /** diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php index 7d7abee0cda..17340547190 100644 --- a/htdocs/fourn/class/fournisseur.facture.class.php +++ b/htdocs/fourn/class/fournisseur.facture.class.php @@ -229,17 +229,6 @@ class FactureFournisseur extends CommonInvoice */ public $fournisseur; - // Multicurrency - /** - * @var int ID - */ - public $fk_multicurrency; - - public $multicurrency_code; - public $multicurrency_tx; - public $multicurrency_total_ht; - public $multicurrency_total_tva; - public $multicurrency_total_ttc; //! id of source invoice if replacement invoice or credit note /** * @var int ID @@ -3614,18 +3603,6 @@ class SupplierInvoiceLine extends CommonObjectLine */ public $localtax2_type; - // Multicurrency - /** - * @var int ID - */ - public $fk_multicurrency; - - public $multicurrency_code; - public $multicurrency_subprice; - public $multicurrency_total_ht; - public $multicurrency_total_tva; - public $multicurrency_total_ttc; - /** * Constructor