Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Renamed llx_c_pays to llx_c_country & field "libelle" to "label"

Browse Source
This commit is contained in:
aspangaro
2014-08-10 13:37:39 +02:00
parent ebcc68cdfa
commit 0738103da8
53 changed files with 488 additions and 491 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/user/sync_users_ldap2dolibarr.php
View File

@@ -129,11 +129,11 @@ if (empty($conf->global->LDAP_USER_DN))
}
// Charge tableau de correspondance des pays
// Load table of correspondence of countries
$hashlib2rowid=array();
$countries=array();
$sql = "SELECT rowid, code, libelle, active";
$sql.= " FROM ".MAIN_DB_PREFIX."c_pays";
$sql = "SELECT rowid, code, label, active";
$sql.= " FROM ".MAIN_DB_PREFIX."c_country";
$sql.= " WHERE active = 1";
$sql.= " ORDER BY code ASC";
$resql=$db->query($sql);
@@ -148,9 +148,9 @@ if ($resql)
$obj = $db->fetch_object($resql);
if ($obj)
{
//print 'Load cache for country '.strtolower($obj->libelle).' rowid='.$obj->rowid."\n";
$hashlib2rowid[strtolower($obj->libelle)]=$obj->rowid;
$countries[$obj->rowid]=array('rowid' => $obj->rowid, 'label' => $obj->libelle, 'code' => $obj->code);
//print 'Load cache for country '.strtolower($obj->label).' rowid='.$obj->rowid."\n";
$hashlib2rowid[strtolower($obj->label)]=$obj->rowid;
$countries[$obj->rowid]=array('rowid' => $obj->rowid, 'label' => $obj->label, 'code' => $obj->code);
}
$i++;
}