From 69379dc2bb7b032a8564ac9c7b27f0d57258b218 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Wed, 10 Oct 2018 09:12:25 +0200 Subject: [PATCH] Standardize and update code --- htdocs/core/class/comment.class.php | 3 ++ htdocs/core/class/discount.class.php | 46 ++++++++++++++++++---------- 2 files changed, 33 insertions(+), 16 deletions(-) diff --git a/htdocs/core/class/comment.class.php b/htdocs/core/class/comment.class.php index 287d260f4d2..161ce438e29 100644 --- a/htdocs/core/class/comment.class.php +++ b/htdocs/core/class/comment.class.php @@ -47,6 +47,9 @@ class Comment extends CommonObject public $datec; + /** + * @var int ID + */ public $fk_user_author; /** diff --git a/htdocs/core/class/discount.class.php b/htdocs/core/class/discount.class.php index 6f6e3a09041..067b1f87e57 100644 --- a/htdocs/core/class/discount.class.php +++ b/htdocs/core/class/discount.class.php @@ -34,9 +34,9 @@ class DiscountAbsolute public $db; /** - * @var string Error code (or message) - */ - public $error; + * @var string Error code (or message) + */ + public $error; /** * @var string[] Array of error strings @@ -48,9 +48,9 @@ class DiscountAbsolute */ public $id; - /** - * @var int Thirdparty ID - */ + /** + * @var int Thirdparty ID + */ public $fk_soc; public $discount_type; // 0 => customer discount, 1 => supplier discount @@ -60,20 +60,34 @@ class DiscountAbsolute public $tva_tx; // Vat rate /** - * @var int User ID Id utilisateur qui accorde la remise - */ - public $fk_user; + * @var int User ID Id utilisateur qui accorde la remise + */ + public $fk_user; /** - * @var string description - */ - public $description; + * @var string description + */ + public $description; public $datec; // Date creation - public $fk_facture_line; // Id invoice line when a discount is used into an invoice line (for absolute discounts) - public $fk_facture; // Id invoice when a discount line is used into an invoice (for credit note) - public $fk_facture_source; // Id facture avoir a l'origine de la remise - public $ref_facture_source; // Ref facture avoir a l'origine de la remise + + /** + * @var int ID invoice line when a discount is used into an invoice line (for absolute discounts) + */ + public $fk_facture_line; + + /** + * @var int ID invoice when a discount line is used into an invoice (for credit note) + */ + public $fk_facture; + + /** + * @var int ID credit note having caused the discount + */ + public $fk_facture_source; + + public $ref_facture_source; // Ref credit note having caused the discount + public $ref_invoice_supplier_source; /**