From 849a1a94000f9a959423a7f26b2d8b0bb93e5b31 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Fri, 12 Oct 2018 09:26:58 +0200 Subject: [PATCH] Standardize and update code --- .../template/class/myobject.class.php | 9 +++++++++ htdocs/product/class/product.class.php | 3 +++ htdocs/product/class/productbatch.class.php | 16 ++++++++++------ .../product/class/productcustomerprice.class.php | 10 +++++++++- .../class/propalmergepdfproduct.class.php | 13 +++++++++++++ 5 files changed, 44 insertions(+), 7 deletions(-) diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php index b04dd735e49..19e6bcd64a4 100644 --- a/htdocs/modulebuilder/template/class/myobject.class.php +++ b/htdocs/modulebuilder/template/class/myobject.class.php @@ -130,8 +130,17 @@ class MyObject extends CommonObject public $date_creation; public $tms; + + /** + * @var int ID + */ public $fk_user_creat; + + /** + * @var int ID + */ public $fk_user_modif; + public $import_key; // END MODULEBUILDER PROPERTIES diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 050d756ad82..3e1ceb8b2dc 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -290,6 +290,9 @@ class Product extends CommonObject public $oldcopy; + /** + * @var int ID + */ public $fk_price_expression; /* To store supplier price found */ diff --git a/htdocs/product/class/productbatch.class.php b/htdocs/product/class/productbatch.class.php index f6a7df212eb..eb4fc32baed 100644 --- a/htdocs/product/class/productbatch.class.php +++ b/htdocs/product/class/productbatch.class.php @@ -37,13 +37,17 @@ class Productbatch extends CommonObject private static $_table_element='product_batch'; //!< Name of table without prefix where object is stored - var $tms=''; - var $fk_product_stock; - var $sellby=''; - var $eatby=''; - var $batch=''; - var $qty; + public $tms=''; + public $fk_product_stock; + public $sellby=''; + public $eatby=''; + public $batch=''; + public $qty; public $warehouseid; + + /** + * @var int ID + */ public $fk_product; diff --git a/htdocs/product/class/productcustomerprice.class.php b/htdocs/product/class/productcustomerprice.class.php index 5aaa2c079ea..3079fef5412 100644 --- a/htdocs/product/class/productcustomerprice.class.php +++ b/htdocs/product/class/productcustomerprice.class.php @@ -45,6 +45,10 @@ class Productcustomerprice extends CommonObject public $datec = ''; public $tms = ''; + + /** + * @var int ID + */ public $fk_product; /** @@ -987,12 +991,16 @@ class PriceByCustomerLine public $datec = ''; public $tms = ''; + + /** + * @var int ID + */ public $fk_product; /** * @var int Thirdparty ID */ - public $fk_soc; + public $fk_soc; public $price; public $price_ttc; diff --git a/htdocs/product/class/propalmergepdfproduct.class.php b/htdocs/product/class/propalmergepdfproduct.class.php index 3a7f3fb586d..f2aabb86876 100644 --- a/htdocs/product/class/propalmergepdfproduct.class.php +++ b/htdocs/product/class/propalmergepdfproduct.class.php @@ -647,11 +647,24 @@ class PropalmergepdfproductLine */ public $id; + /** + * @var int ID + */ public $fk_product; + public $file_name; public $lang; + + /** + * @var int ID + */ public $fk_user_author; + + /** + * @var int ID + */ public $fk_user_mod; + public $datec=''; public $tms=''; public $import_key;