From c9a620d1a60a99aed0f977e17553b02aac442c7c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 2 Nov 2019 14:25:52 +0100 Subject: [PATCH] Renamed property of thirdparty "statut_commercial" into "status_prospect_label" --- ChangeLog | 1 + htdocs/societe/class/societe.class.php | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2c534cfff8b..2d398c83535 100644 --- a/ChangeLog +++ b/ChangeLog @@ -28,6 +28,7 @@ Following changes may create regressions for some external modules, but were nec * All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed into 'labelStatus'. * All properties 'labelstatusshort' and 'labelstatut_short' were renamed into 'labelStatusShort'. * All properties 'type_libelle' were renamed into 'type_label'. +* Renamed property of thirdparty "statut_commercial" into "status_prospect_label" ***** ChangeLog for 10.0.3 compared to 10.0.2 ***** IMPORTANT : This version fixes a serious bug in saving the units of weight, size, surface and volume on product card. diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index 4615290a03d..9ba0bdcfd12 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -399,9 +399,16 @@ class Societe extends CommonObject */ public $note_public; - //! code statut prospect + /** + * Status prospect id + * @var int + */ public $stcomm_id; - public $statut_commercial; + /** + * Status prospect label + * @var int + */ + public $status_prospect_label; /** * Assigned price level @@ -1354,9 +1361,9 @@ class Societe extends CommonObject $this->state = ($obj->state!='-'?$obj->state:''); $transcode=$langs->trans('StatusProspect'.$obj->fk_stcomm); - $libelle=($transcode!='StatusProspect'.$obj->fk_stcomm?$transcode:$obj->stcomm); - $this->stcomm_id = $obj->fk_stcomm; // id statut commercial - $this->statut_commercial = $libelle; // libelle statut commercial + $label = ($transcode!='StatusProspect'.$obj->fk_stcomm ? $transcode : $obj->stcomm); + $this->stcomm_id = $obj->fk_stcomm; // id status prospect + $this->status_prospect_label = $label; // label status prospect $this->email = $obj->email; $this->skype = $obj->skype;