lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #16429 from bafbes/abb120369

Browse Source 
Add region code and id into fetch of thirdparty
This commit is contained in:
Laurent Destailleur 2021-02-26 13:16:00 +01:00 committed by GitHub
commit 9fb15bde99
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/societe/class/societe.class.php
View File

@ -1602,6 +1602,7 @@ class Societe extends CommonObject
$sql .= ', e.libelle as effectif';
$sql .= ', c.code as country_code, c.label as country';
$sql .= ', d.code_departement as state_code, d.nom as state';
$sql .= ', r.rowid as region_id, r.code_region as region_code';
$sql .= ', st.libelle as stcomm, st.picto as stcomm_picto';
$sql .= ', te.code as typent_code';
$sql .= ', i.libelle as label_incoterms';
@ -1612,6 +1613,7 @@ class Societe extends CommonObject
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_stcomm as st ON s.fk_stcomm = st.id';
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_forme_juridique as fj ON s.fk_forme_juridique = fj.code';
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON s.fk_departement = d.rowid';
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_regions as r ON d.fk_region = r.rowid';
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_typent as te ON s.fk_typent = te.id';
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON s.fk_incoterms = i.rowid';
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_remise as sr ON sr.rowid = (SELECT MAX(rowid) FROM '.MAIN_DB_PREFIX.'societe_remise WHERE fk_soc = s.rowid AND entity IN ('.getEntity('discount').'))';
@ -1689,6 +1691,8 @@ class Societe extends CommonObject
$this->state_id = $obj->state_id;
$this->state_code = $obj->state_code;
$this->region_id = $obj->region_id;
$this->region_code = $obj->region_code;
$this->state = ($obj->state != '-' ? $obj->state : '');
$transcode = $langs->trans('StatusProspect'.$obj->fk_stcomm);