(no commit message)

diff --git a/inc/extranet/Controlleur/class.extranet.ajax.php b/inc/extranet/Controlleur/class.extranet.ajax.php
index 7853364dbc15eb0a7a7b358e37af02558405f11b..b63504d4e8fc417e649111daa905c093142ba6e0 100644 (file)
--- a/inc/extranet/Controlleur/class.extranet.ajax.php
+++ b/inc/extranet/Controlleur/class.extranet.ajax.php
@@ -71,8 +71,8 @@ class extranetAjax {
                $dao = new commonDAOClient($core->con);\r
                $client = $dao->sauve($_POST);\r
                $x->addClosePopup();\r
-               $x->addContent('devisAdresseDisplay', extranetUrl::adresse($client->utilisateur_id, null, 'devis'));\r
-               $x->addContent('factureAdresseDisplay', extranetUrl::adresse($client->utilisateur_id, null, 'facture'));\r
+               $x->addContent('devisAdresseDisplay', commonUrl::adresse($client->utilisateur_id, null, 'devis'));\r
+               $x->addContent('factureAdresseDisplay', commonUrl::adresse($client->utilisateur_id, null, 'facture'));\r
                $x->addContent('listeContacts', extranetUrl::listeContacts($client->entreprise));\r
                $contacts = array();\r
                $client_contacts = $dao->getContactsOfEntreprise($client->entreprise);\r

diff --git a/inc/extranet/Controlleur/class.extranet.url.php b/inc/extranet/Controlleur/class.extranet.url.php
index 91adcc2ffeb127b7d877e5b4e58d6015bd4cf415..22793f99edb77f169bf49403f9ebcc22e40e35db 100644 (file)
--- a/inc/extranet/Controlleur/class.extranet.url.php
+++ b/inc/extranet/Controlleur/class.extranet.url.php
@@ -1406,9 +1406,9 @@ class extranetUrl {
                $res .= form::hidden('projet', $default_id);\r
                $res .= '<div id="factureAdresseDisplay">';\r
                if ($facture->projet_id != 'new') {\r
-                       $res .= extranetUrl::adresse(null, $facture->projet_id, 'facture', $facture->adresse);\r
+                       $res .= commonUrl::adresse(null, $facture->projet_id, 'facture', $facture->adresse);\r
                } else {\r
-                       $res .= extranetUrl::adresse($facture->client_id, null, 'facture', $facture->adresse);\r
+                       $res .= commonUrl::adresse($facture->client_id, null, 'facture', $facture->adresse);\r
                        $res .= form::hidden('client', $facture->client_id);\r
                }\r
 \r

diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php
index 172c7fb1aaa82a4483abd13e9e6b5808dd3e997a..a7105272819773cdc736f50cdd5a145bb1aef78c 100644 (file)
--- a/inc/ws/Controlleur/class.ws.ajax.php
+++ b/inc/ws/Controlleur/class.ws.ajax.php
@@ -65,8 +65,8 @@ class wsAjax extends cubeAjax {
                $dao = new commonDAOClient($core->con);\r
                $client = $dao->sauve($_POST);\r
                $x->addClosePopup();\r
-               $x->addContent('devisAdresseDisplay', wsUrl::adresse($client->utilisateur_id, null, 'devis'));\r
-               $x->addContent('factureAdresseDisplay', wsUrl::adresse($client->utilisateur_id, null, 'facture'));\r
+               $x->addContent('devisAdresseDisplay', commonUrl::adresse($client->utilisateur_id, null, 'devis'));\r
+               $x->addContent('factureAdresseDisplay', commonUrl::adresse($client->utilisateur_id, null, 'facture'));\r
                $x->addContent('listeContacts', wsUrl::listeContacts($client->entreprise));\r
                $contacts = array();\r
                $client_contacts = $dao->getContactsOfEntreprise($client->entreprise);\r