From 269148b9afb95f7689923e227f856e92450bb3df Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Tue, 22 Aug 2023 16:06:57 +0000 Subject: [PATCH] wip #6199 @0.5 --- inc/commons/class.common.core.php | 2 +- inc/extranet/Controlleur/class.extranet.url.php | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/inc/commons/class.common.core.php b/inc/commons/class.common.core.php index 7cc84524a..be070f9ad 100644 --- 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, JSON_VALUE(address,"$.country") AS pays, JSON_VALUE(address,"$.city") AS ville, - JSON_VALUE(billing_address,"$.address") AS adresse_facturation, + c_billing_address AS adresse_facturation, c_ca AS ca, c_unpaid AS impaye, vat_number AS tva_intra, diff --git a/inc/extranet/Controlleur/class.extranet.url.php b/inc/extranet/Controlleur/class.extranet.url.php index df6a40b25..681eb0a7e 100644 --- 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); -- 2.39.5