wip #6199 @0.5

diff --git a/inc/commons/class.common.core.php b/inc/commons/class.common.core.php
index 7cc84524ad7763d9f8ca66881c778f6b030f5670..be070f9ad9e0949348aab52060752d4126213bea 100644 (file)
--- a/inc/commons/class.common.core.php
+++ b/inc/commons/class.common.core.php
@@ -549,7 +549,7 @@ class commonCore extends cubeCore
  JSON_VALUE(address,"$.postcode") AS code_postal,\r
  JSON_VALUE(address,"$.country") AS pays,\r
  JSON_VALUE(address,"$.city") AS ville,\r
- JSON_VALUE(billing_address,"$.address") AS adresse_facturation,\r
+ c_billing_address AS adresse_facturation,\r
  c_ca AS ca,\r
  c_unpaid AS impaye, \r
  vat_number AS tva_intra,\r

diff --git a/inc/extranet/Controlleur/class.extranet.url.php b/inc/extranet/Controlleur/class.extranet.url.php
index df6a40b25da0292a200d7e5a051d1da527d8f807..681eb0a7e8732bfd9cbdea77ba389771d5a4e1c0 100644 (file)
--- a/inc/extranet/Controlleur/class.extranet.url.php
+++ b/inc/extranet/Controlleur/class.extranet.url.php
@@ -578,7 +578,9 @@ class extranetUrl
             }
             $listeClients[trim($client->rs) . ' (' . $client->prenom . ' ' . $client->nom . ')'] = $client->utilisateur_id;
         }
-        ksort($listeClients);
+        uksort($listeClients, function ($a, $b) {
+            return strcasecmp($a, $b);
+        });
         $listeClients = array_merge(array('--' => ''), $listeClients);
 
         $daoEquipier = new commonDAOEquipier($core->con);