From fdc03dc18a74ee784729752fa3c31940548c53ca Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 28 Jun 2023 14:46:45 +0200 Subject: [PATCH] Debug v18 --- htdocs/bom/class/bom.class.php | 15 +++++++++++++ htdocs/mrp/class/mo.class.php | 8 +++++++ htdocs/product/class/product.class.php | 25 ++++++++++++++------- htdocs/societe/class/societe.class.php | 31 -------------------------- htdocs/theme/eldy/theme_vars.inc.php | 2 +- 5 files changed, 41 insertions(+), 40 deletions(-) diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php index f427146b202..182235cce19 100644 --- a/htdocs/bom/class/bom.class.php +++ b/htdocs/bom/class/bom.class.php @@ -154,6 +154,10 @@ class BOM extends CommonObject */ public $date_creation; + /** + * @var integer|string date_valid + */ + public $date_valid; public $tms; @@ -167,6 +171,16 @@ class BOM extends CommonObject */ public $fk_user_modif; + /** + * @var int Id User modifying + */ + public $fk_user_valid; + + /** + * @var int Id User modifying + */ + public $fk_warehouse; + /** * @var string import key */ @@ -182,6 +196,7 @@ class BOM extends CommonObject */ public $fk_product; public $qty; + public $duration; public $efficiency; // END MODULEBUILDER PROPERTIES diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php index 589dc19db47..b703dcc0531 100644 --- a/htdocs/mrp/class/mo.class.php +++ b/htdocs/mrp/class/mo.class.php @@ -149,8 +149,16 @@ class Mo extends CommonObject */ public $date_creation; + /** + * @var integer|string date_validation + */ + public $date_valid; + /** + * @var integer|string date_validation + */ public $tms; + public $fk_user_creat; public $fk_user_modif; public $import_key; diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index c6a91d801e7..8829ea81132 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -193,8 +193,14 @@ class Product extends CommonObject //! Default VAT rate of product public $tva_tx; - //! French VAT NPR (0 or 1) + /** + * int French VAT NPR (0 or 1) + */ public $tva_npr = 0; + /** + * @deprecated + */ + public $recuperableonly; //! Default discount percent public $remise_percent; @@ -258,21 +264,24 @@ class Product extends CommonObject */ public $desiredstock = 0; - /* + /** * Service expiration */ public $duration_value; + /** + * Serivce expiration unit + */ + public $duration_unit; + /** + * Service expiration label (value + unit) + */ + public $duration; - /* + /** * Service Workstation */ public $fk_default_workstation; - /** - * Exoiration unit - */ - public $duration_unit; - /** * Status indicates whether the product is on sale '1' or not '0' * diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index d8cd7776966..69f0830f161 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -303,43 +303,12 @@ class Societe extends CommonObject */ public $particulier; - /** - * @var string Address - */ - public $address; - - /** - * @var string Zip code of thirdparty - */ - public $zip; - - /** - * @var string Town of thirdparty - */ - public $town; - /** * Thirdparty status : 0=activity ceased, 1= in activity * @var int */ public $status = 1; - /** - * Id of department - * @var int - */ - public $state_id; - - /** - * @var string State code - */ - public $state_code; - - /** - * @var string State name - */ - public $state; - /** * Id of region * @var int diff --git a/htdocs/theme/eldy/theme_vars.inc.php b/htdocs/theme/eldy/theme_vars.inc.php index 4476f002ead..ca214173a63 100644 --- a/htdocs/theme/eldy/theme_vars.inc.php +++ b/htdocs/theme/eldy/theme_vars.inc.php @@ -52,7 +52,7 @@ $theme_bgcoloronglet = array(hexdec('DE'), hexdec('E7'), hexdec('EC')); $colorbackhmenu1 = '38,60,92'; // topmenu $colorbackvmenu1 = '250,250,250'; // vmenu $colortopbordertitle1 = '215,215,215'; // top border of title -$colorbacktitle1 = '233,234,237'; // title of tables,list +$colorbacktitle1 = '237,238,240'; // title of tables,list $colorbacktabcard1 = '255,255,255'; // card $colorbacktabactive = '234,234,234'; $colorbacklineimpair1 = '255,255,255'; // line impair