(no commit message)

diff --git a/inc/extranet/Controlleur/class.extranet.ajax.php b/inc/extranet/Controlleur/class.extranet.ajax.php
index 2e3b140da3b3aa4801a156ea7a5806d6c62d354f..db89466f3e6bc40b5c10c2cba16fc2612714508c 100644 (file)
--- a/inc/extranet/Controlleur/class.extranet.ajax.php
+++ b/inc/extranet/Controlleur/class.extranet.ajax.php
@@ -11,7 +11,7 @@ class extranetAjax {
                }\r
                $extra .= '<p class="right" style="margin-top:10px;margin-right:10px;"><br /><br /><a href="#" class="submit">' . $core->typo->BoutonOK(__('Enregistrer')) . '</a><br /><br /></p>';\r
 \r
-               self::form('saveClient', __("Edition d'un client"), extranetUrl::formClient($args[1]), false, 2, '', $extra);\r
+               commonAjax::form('saveClient', __("Edition d'un client"), extranetUrl::formClient($args[1]), false, 2, '', $extra);\r
        }\r
 \r
        public static function formContact($args, &$x)\r
@@ -19,13 +19,13 @@ class extranetAjax {
                if (!isset($args[2])) {\r
                        $args[2] = null;\r
                }\r
-               self::form('saveContact', __("Edition d'un contact"), extranetUrl::formContact($args[1], $args[2]));\r
+               commonAjax::form('saveContact', __("Edition d'un contact"), extranetUrl::formContact($args[1], $args[2]));\r
        }\r
 \r
        public static function formNotes($args, &$x)\r
        {\r
                global $core;\r
-               self::form('saveNotes', __('Edition des notes'), extranetUrl::formNotes($args[1]));\r
+               commonAjax::form('saveNotes', __('Edition des notes'), extranetUrl::formNotes($args[1]));\r
        }\r
 \r
        public static function saveClient($args, &$x)\r
@@ -100,35 +100,35 @@ class extranetAjax {
 \r
        public static function sortClient($args, &$x)\r
        {\r
-               self::sort('clients', $args[1]);\r
+               commonAjax::sort('clients', $args[1]);\r
                $x->addContent('listeClients', extranetUrl::listeClients());\r
        }\r
        public static function sortEquipier($args, &$x)\r
        {\r
-               self::sort('equipiers', $args[1]);\r
+               commonAjax::sort('equipiers', $args[1]);\r
                $x->addContent('listeEquipiers', extranetUrl::listeRh());\r
        }\r
 \r
        public static function pageClient($args, &$x)\r
        {\r
-               self::page('clients', $args[1]);\r
+               commonAjax::page('clients', $args[1]);\r
                $x->addContent('listeClients', extranetUrl::listeClients());\r
        }\r
 \r
        public static function parPageClient($args, &$x)\r
        {\r
-               self::parPage('clients', $_POST['par_page']);\r
+               commonAjax::parPage('clients', $_POST['par_page']);\r
                $x->addContent('listeClients', extranetUrl::listeClients());\r
        }\r
 \r
        public static function filtreClients($args, &$x)\r
        {\r
                if (isset($args[1]) && $args[1] == 'efface') {\r
-                       self::filtre('clients');\r
+                       commonAjax::filtre('clients');\r
                        $x->addReload();\r
                        return;\r
                } else {\r
-                       self::filtre('clients', $_POST);\r
+                       commonAjax::filtre('clients', $_POST);\r
                        $x->addContent('listeClients', extranetUrl::listeClients());\r
                }\r
        }\r
@@ -138,7 +138,7 @@ class extranetAjax {
                global $core;\r
                $dao = new commonDAOEntreprise($core->con);\r
                $client = $dao->selectById($args[1]);\r
-               return self::form('', __("Détail du chiffre d'affaire de") . ' ' . $client->nom, extranetUrl::clientDetailCa($args[1]), false);\r
+               return commonAjax::form('', __("Détail du chiffre d'affaire de") . ' ' . $client->nom, extranetUrl::clientDetailCa($args[1]), false);\r
        }\r
 \r
        public static function clientDetailImpaye($args, &$x)\r
@@ -146,12 +146,12 @@ class extranetAjax {
                global $core;\r
                $dao = new commonDAOEntreprise($core->con);\r
                $client = $dao->selectById($args[1]);\r
-               return self::form('', __("Détail des impayés de") . ' ' . $client->nom, extranetUrl::clientDetailImpaye($args[1]), false, 4);\r
+               return commonAjax::form('', __("Détail des impayés de") . ' ' . $client->nom, extranetUrl::clientDetailImpaye($args[1]), false, 4);\r
        }\r
 \r
        public static function formProjet($args, &$x)\r
        {\r
-               self::form('saveProjet', __("Edition d'un projet"), extranetUrl::formProjet($args[1]));\r
+               commonAjax::form('saveProjet', __("Edition d'un projet"), extranetUrl::formProjet($args[1]));\r
        }\r
 \r
        public static function saveProjet($args, &$x)\r
@@ -198,29 +198,29 @@ class extranetAjax {
 \r
        public static function pageProjet($args, &$x)\r
        {\r
-               self::page('projets', $args[1]);\r
+               commonAjax::page('projets', $args[1]);\r
                $x->addContent('listeProjets', extranetUrl::listeProjets());\r
        }\r
        public static function parPageProjet($args, &$x)\r
        {\r
-               self::parPage('projets', $_POST['par_page']);\r
+               commonAjax::parPage('projets', $_POST['par_page']);\r
                $x->addContent('listeProjets', extranetUrl::listeProjets());\r
        }\r
 \r
        public static function sortProjet($args, &$x)\r
        {\r
-               self::sort('projets', $args[1]);\r
+               commonAjax::sort('projets', $args[1]);\r
                $x->addContent('listeProjets', extranetUrl::listeProjets());\r
        }\r
 \r
        public static function filtreProjet($args, &$x)\r
        {\r
                if (isset($args[1]) && $args[1] == 'efface') {\r
-                       self::filtre('projets');\r
+                       commonAjax::filtre('projets');\r
                        $x->addReload();\r
                        return;\r
                } else {\r
-                       self::filtre('projets', $_POST);\r
+                       commonAjax::filtre('projets', $_POST);\r
                        $x->addContent('listeProjets', extranetUrl::listeProjets());\r
                }\r
        }\r
@@ -228,13 +228,13 @@ class extranetAjax {
        public static function formTacheNormale($args, &$x)\r
        {\r
                $projet = isset($args[2])?$args[2]:null;\r
-               self::form('saveTache', __("Edition d'un tâche"), extranetUrl::formTacheNormale($args[1], $projet));\r
+               commonAjax::form('saveTache', __("Edition d'un tâche"), extranetUrl::formTacheNormale($args[1], $projet));\r
        }\r
 \r
        public static function formTacheSousTraitee($args, &$x)\r
        {\r
                $projet = isset($args[2])?$args[2]:null;\r
-               self::form('saveTache', __("Edition d'un tâche sous-traitée"), extranetUrl::formTacheSousTraitee($args[1], $projet));\r
+               commonAjax::form('saveTache', __("Edition d'un tâche sous-traitée"), extranetUrl::formTacheSousTraitee($args[1], $projet));\r
        }\r
 \r
        public static function saveTache($args, &$x)\r
@@ -289,13 +289,13 @@ class extranetAjax {
 \r
        public static function sortTimereport($args, &$x)\r
        {\r
-               self::sort('timereport', $args[1]);\r
+               commonAjax::sort('timereport', $args[1]);\r
                $x->addContent('listeTimereport', extranetUrl::listeTimereport());\r
        }\r
 \r
        public static function pageTimereport($args, &$x)\r
        {\r
-               self::page('timereport', $args[1]);\r
+               commonAjax::page('timereport', $args[1]);\r
                $x->addContent('listeTimereport', extranetUrl::listeTimereport());\r
        }\r
 \r
@@ -306,18 +306,18 @@ class extranetAjax {
 \r
        public static function parPageTimereport($args, &$x)\r
        {\r
-               self::parPage('timereport', $_POST['par_page']);\r
+               commonAjax::parPage('timereport', $_POST['par_page']);\r
                $x->addContent('listeTimereport', extranetUrl::listeTimereport());\r
        }\r
 \r
        public static function filtreTimereport($args, &$x)\r
        {\r
                if (isset($args[1]) && $args[1] == 'efface') {\r
-                       self::filtre('timereport');\r
+                       commonAjax::filtre('timereport');\r
                        $x->addReload();\r
                        return;\r
                } else {\r
-                       self::filtre('timereport', $_POST);\r
+                       commonAjax::filtre('timereport', $_POST);\r
                        $x->addContent('listeTimereport', extranetUrl::listeTimereport());\r
                }\r
        }\r
@@ -355,37 +355,37 @@ class extranetAjax {
 \r
        public static function pageDevis($args, &$x)\r
        {\r
-               self::page('devis', $args[1]);\r
+               commonAjax::page('devis', $args[1]);\r
                $x->addContent('listeDevis', extranetUrl::listeDevis());\r
        }\r
 \r
        public static function parPageDevis($args, &$x)\r
        {\r
-               self::parPage('devis', $_POST['par_page']);\r
+               commonAjax::parPage('devis', $_POST['par_page']);\r
                $x->addContent('listeDevis', extranetUrl::listeDevis());\r
        }\r
 \r
        public static function sortDevis($args, &$x)\r
        {\r
-               self::sort('devis', $args[1]);\r
+               commonAjax::sort('devis', $args[1]);\r
                $x->addContent('listeDevis', extranetUrl::listeDevis());\r
        }\r
 \r
        public static function filtreDevis($args, &$x)\r
        {\r
                if (isset($args[1]) && $args[1] == 'efface') {\r
-                       self::filtre('devis');\r
+                       commonAjax::filtre('devis');\r
                        $x->addReload();\r
                        return;\r
                } else {\r
-                       self::filtre('devis', $_POST);\r
+                       commonAjax::filtre('devis', $_POST);\r
                        $x->addContent('listeDevis', extranetUrl::listeDevis());\r
                }\r
        }\r
 \r
        public static function sortDevisClient($args, &$x)\r
        {\r
-               self::sort('devis', $args[1]);\r
+               commonAjax::sort('devis', $args[1]);\r
                $x->addContent('listeDevis', extranetUrl::listeDevisClient());\r
        }\r
 \r
@@ -435,7 +435,7 @@ class extranetAjax {
 \r
        public static function changeFacturePaiement($args, &$x)\r
        {\r
-               return self::form('saveFacturePaiement', __('Informations relatives au paiement de la facture'), extranetUrl::formFacturePaiement($args[1]));\r
+               return commonAjax::form('saveFacturePaiement', __('Informations relatives au paiement de la facture'), extranetUrl::formFacturePaiement($args[1]));\r
        }\r
 \r
        public static function saveFacturePaiement($args, &$x)\r
@@ -473,30 +473,30 @@ class extranetAjax {
 \r
        public static function pageFacture($args, &$x)\r
        {\r
-               self::page('factures', $args[1]);\r
+               commonAjax::page('factures', $args[1]);\r
                $x->addContent('listeFactures', extranetUrl::listeFactures());\r
        }\r
 \r
        public static function parPageFacture($args, &$x)\r
        {\r
-               self::parPage('factures', $_POST['par_page']);\r
+               commonAjax::parPage('factures', $_POST['par_page']);\r
                $x->addContent('listeFactures', extranetUrl::listeFactures());\r
        }\r
 \r
        public static function sortFacture($args, &$x)\r
        {\r
-               self::sort('factures', $args[1]);\r
+               commonAjax::sort('factures', $args[1]);\r
                $x->addContent('listeFactures', extranetUrl::listeFactures());\r
        }\r
 \r
        public static function filtreFactures($args, &$x)\r
        {\r
                if (isset($args[1]) && $args[1] == 'efface') {\r
-                       self::filtre('factures');\r
+                       commonAjax::filtre('factures');\r
                        $x->addReload();\r
                        return;\r
                } else {\r
-                       self::filtre('factures', $_POST);\r
+                       commonAjax::filtre('factures', $_POST);\r
                        $x->addContent('listeFactures', extranetUrl::listeFactures());\r
                }\r
        }\r
@@ -522,7 +522,7 @@ class extranetAjax {
 \r
        public static function formPrintFactures($args, &$x)\r
        {\r
-               self::form('printFactures', __('Imprimer des factures'), extranetUrl::formPrintFactures(), __("Lancer l'impression"));\r
+               commonAjax::form('printFactures', __('Imprimer des factures'), extranetUrl::formPrintFactures(), __("Lancer l'impression"));\r
        }\r
 \r
        public static function printFactures($args, &$x)\r
@@ -552,7 +552,7 @@ class extranetAjax {
 \r
        public static function formDashboard($args, &$x)\r
        {\r
-               self::form('saveDashboard', __('Ajouter un élément au dashboard'), extranetUrl::formDashboard($args));\r
+               commonAjax::form('saveDashboard', __('Ajouter un élément au dashboard'), extranetUrl::formDashboard($args));\r
        }\r
 \r
        public static function saveDashboard($args, &$x)\r
@@ -730,24 +730,24 @@ class extranetAjax {
 \r
        public static function chargesDetails($args, &$x)\r
        {\r
-               self::form('', sprintf(__("Détails des charges de l'année %s"), date('Y')), extranetPageChiffres::chargesDetails($args), '', 3, 'liste');\r
+               commonAjax::form('', sprintf(__("Détails des charges de l'année %s"), date('Y')), extranetPageChiffres::chargesDetails($args), '', 3, 'liste');\r
        }\r
 \r
        public static function sortFichiers($args, &$x)\r
        {\r
-               self::sort('fichiers', $args[1]);\r
+               commonAjax::sort('fichiers', $args[1]);\r
                $x->addContent('listeFichiers', extranetUrl::listeFichiers());\r
        }\r
 \r
        public static function pageFichiers($args, &$x)\r
        {\r
-               self::page('fichiers', $args[1]);\r
+               commonAjax::page('fichiers', $args[1]);\r
                $x->addContent('listeFichiers', extranetUrl::listeFichiers());\r
        }\r
 \r
        public static function parPageFichiers($args, &$x)\r
        {\r
-               self::parPage('fichiers', $_POST['par_page']);\r
+               commonAjax::parPage('fichiers', $_POST['par_page']);\r
                $x->addContent('listeFichiers', extranetUrl::listeFichiers());\r
        }\r
 \r

diff --git a/inc/extranet/Controlleur/class.extranet.url.php b/inc/extranet/Controlleur/class.extranet.url.php
index ca4cae3d53a28ef939b5431159598bfd0542fcfc..e78e6179dc2a5016313fd7c38f0ed0188a6098f6 100644 (file)
--- a/inc/extranet/Controlleur/class.extranet.url.php
+++ b/inc/extranet/Controlleur/class.extranet.url.php
@@ -39,12 +39,12 @@ class extranetUrl {
                $liste = $dao->getListe($settings['orderby'], $settings['sens'], $settings['limit']);\r
 \r
                $res = '<table class="liste">';\r
-               $res .= '<tr><th>' . self::orderby('#', 'entreprise_id', $settings, 'sort' . $change) . '</th>';\r
-               $res .= '<th>' . self::orderby(__('Raison sociale'), 'nom', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<tr><th>' . commonUrl::orderby('#', 'entreprise_id', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<th>' . commonUrl::orderby(__('Raison sociale'), 'nom', $settings, 'sort' . $change) . '</th>';\r
                $res .= '<th>' . __('Contacts') . '</th>';\r
                $res .= '<th>' . __('Notes') . '</th>';\r
-               $res .= '<th>' . self::orderby('<abbr title="' . __("Chiffre d'affaire") . '">CA</abbr>', 'ca', $settings, 'sort' . $change) . '</th>';\r
-               $res .= '<th>' . self::orderby('Impayés', 'impaye', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<th>' . commonUrl::orderby('<abbr title="' . __("Chiffre d'affaire") . '">CA</abbr>', 'ca', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<th>' . commonUrl::orderby('Impayés', 'impaye', $settings, 'sort' . $change) . '</th>';\r
                $res .= '<th class="min"></th><th class="min"></th></tr>';\r
                $i = 0;\r
                foreach($liste as $id => $client) {\r
@@ -303,16 +303,16 @@ class extranetUrl {
                $change = is_null($dashboard)?'Projet':'Dashboard/' . $dashboard;\r
 \r
                $res = '<table class="liste">';\r
-               $res .= '<tr><th>' . self::orderby('#', 'projet_id', $settings, 'sort' . $change) . '</th>';\r
-               $res .= '<th>' . self::orderby(__('Projet'), 'nom', $settings, 'sort' . $change) . '</th>';\r
-               $res .= '<th>' . self::orderby(__('Client'), 'client', $settings, 'sort' . $change) . '</th>';\r
-               $res .= '<th>' . self::orderby(__('Année'), 'annee_fin', $settings, 'sort' . $change) . '</th>';\r
-               $res .= '<th>' . self::orderby(__('Chef'), 'chef', $settings, 'sort' . $change) . '</th>';\r
-               $res .= '<th>' . self::orderby(__('Status'), 'status', $settings, 'sort' . $change) . '</th>';\r
-               $res .= '<th>' . self::orderby(__('Facturé'), 'rapport_facturation', $settings, 'sort' . $change) . '</th>';\r
-               $res .= '<th>' . self::orderby(__('Payé'), 'rapport_paiement', $settings, 'sort' . $change) . '</th>';\r
-               $res .= '<th>' . self::orderby('<abbr title="' . __('Budget') . '">B</abbr>', 'budget', $settings, 'sort' . $change) . '</th>';\r
-               $res .= '<th>' . self::orderby('<abbr title="' . __('Progression') . '">Pr</abbr>', 'progression', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<tr><th>' . commonUrl::orderby('#', 'projet_id', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<th>' . commonUrl::orderby(__('Projet'), 'nom', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<th>' . commonUrl::orderby(__('Client'), 'client', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<th>' . commonUrl::orderby(__('Année'), 'annee_fin', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<th>' . commonUrl::orderby(__('Chef'), 'chef', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<th>' . commonUrl::orderby(__('Status'), 'status', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<th>' . commonUrl::orderby(__('Facturé'), 'rapport_facturation', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<th>' . commonUrl::orderby(__('Payé'), 'rapport_paiement', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<th>' . commonUrl::orderby('<abbr title="' . __('Budget') . '">B</abbr>', 'budget', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<th>' . commonUrl::orderby('<abbr title="' . __('Progression') . '">Pr</abbr>', 'progression', $settings, 'sort' . $change) . '</th>';\r
                $res .= '<th class="min"></th></tr>';\r
 \r
                $dao = new extranetDAOProjet($core->con);\r
@@ -665,15 +665,15 @@ class extranetUrl {
                $timereports = $daoTimereport->getListe($taches, $core->user->utilisateur_id, array('start' => $avant, 'end' => $apres));\r
                // Affiche le tableau\r
                $res = '<table class="liste listeTimereport">';\r
-               $res .= '<tr><th class="normal">' . self::orderby('#', 'projet_id', $settings, 'sort' . $change) . '</th>';\r
-               $res .= '<th class="normal">' . self::orderby(__('Projet'), 'nom', $settings, 'sort' . $change) . '</th>';\r
-               $res .= '<th class="normal">' . self::orderby(__('Client'), 'client', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<tr><th class="normal">' . commonUrl::orderby('#', 'projet_id', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<th class="normal">' . commonUrl::orderby(__('Projet'), 'nom', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<th class="normal">' . commonUrl::orderby(__('Client'), 'client', $settings, 'sort' . $change) . '</th>';\r
                for($date = $avant;$date <= $apres;$date += 3600 * 24) {\r
                        $res .= '<th>' . date('d', $date) . '' . cubeMedia::spacer(16, 1, '', 'spacer') . '</th>';\r
                }\r
-               $res .= '<th class="normal info">' . self::orderby('<abbr title="' . __('Progression') . '">Pr</abbr>', 'progression', $settings, 'sort' . $change) . '</th>';\r
-               $res .= '<th class="normal info">' . self::orderby('<abbr title="' . __('Jours consommés') . '">Co</abbr>', 'jours_consommes', $settings, 'sort' . $change) . '</th>';\r
-               $res .= '<th class="normal info">' . self::orderby('<abbr title="' . __('Jours prévus') . '">Pl</abbr>', 'jours_prevus', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<th class="normal info">' . commonUrl::orderby('<abbr title="' . __('Progression') . '">Pr</abbr>', 'progression', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<th class="normal info">' . commonUrl::orderby('<abbr title="' . __('Jours consommés') . '">Co</abbr>', 'jours_consommes', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<th class="normal info">' . commonUrl::orderby('<abbr title="' . __('Jours prévus') . '">Pl</abbr>', 'jours_prevus', $settings, 'sort' . $change) . '</th>';\r
                $res .= '</tr>';\r
 \r
                foreach($liste as $projet) {\r
@@ -835,13 +835,13 @@ class extranetUrl {
                $liste = $dao->getListe($settings['orderby'], $settings['sens'], $settings['limit']);\r
                $res = self::contextDevis($context_id);\r
                $res .= '<table class="liste">';\r
-               $res .= '<tr><th>' . self::orderby('#', 'devis_id', $settings, 'sort' . $change) . '</th>';\r
-               $res .= '<th>' . self::orderby(__('Nom'), 'nom', $settings, 'sort' . $change) . '</th>';\r
-               $res .= '<th>' . self::orderby(__('Client'), 'client', $settings, 'sort' . $change) . '</th>';\r
-               $res .= '<th>' . self::orderby(__('Crée par'), 'createur', $settings, 'sort' . $change) . '</th>';\r
-               $res .= '<th>' . self::orderby(__('Date'), 'date_creation', $settings, 'sort' . $change) . '</th>';\r
-               $res .= '<th>' . self::orderby(__('Montant HT'), 'total_ht', $settings, 'sort' . $change) . '</th>';\r
-               $res .= '<th>' . self::orderby(__('Status'), 'status', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<tr><th>' . commonUrl::orderby('#', 'devis_id', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<th>' . commonUrl::orderby(__('Nom'), 'nom', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<th>' . commonUrl::orderby(__('Client'), 'client', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<th>' . commonUrl::orderby(__('Crée par'), 'createur', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<th>' . commonUrl::orderby(__('Date'), 'date_creation', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<th>' . commonUrl::orderby(__('Montant HT'), 'total_ht', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<th>' . commonUrl::orderby(__('Status'), 'status', $settings, 'sort' . $change) . '</th>';\r
                $res .= '<th class="min"></th><th class="min"></th><th class="min"></th></tr>';\r
                $i = 0;\r
                foreach($liste as $devis) {\r
@@ -904,10 +904,10 @@ class extranetUrl {
                $settings = $core->user->getSettings('devis');\r
                $liste = $dao->getListeForEntreprise($core->user->entreprise, $settings['orderby'], $settings['sens']);\r
                $res = '<table class="liste">';\r
-               $res .= '<th>' . self::orderby(__('Nom'), 'nom', $settings, 'sortDevis') . '</th>';\r
-               $res .= '<th>' . self::orderby(__('Date'), 'date_creation', $settings, 'sortDevis') . '</th>';\r
-               $res .= '<th>' . self::orderby(__('Montant HT'), 'total_ht', $settings, 'sortDevis') . '</th>';\r
-               $res .= '<th>' . self::orderby(__('Status'), 'status', $settings, 'sortDevis') . '</th>';\r
+               $res .= '<th>' . commonUrl::orderby(__('Nom'), 'nom', $settings, 'sortDevis') . '</th>';\r
+               $res .= '<th>' . commonUrl::orderby(__('Date'), 'date_creation', $settings, 'sortDevis') . '</th>';\r
+               $res .= '<th>' . commonUrl::orderby(__('Montant HT'), 'total_ht', $settings, 'sortDevis') . '</th>';\r
+               $res .= '<th>' . commonUrl::orderby(__('Status'), 'status', $settings, 'sortDevis') . '</th>';\r
                $res .= '<th class="min"></th></tr>';\r
                $i = 0;\r
                foreach($liste as $devis) {\r
@@ -1216,13 +1216,13 @@ class extranetUrl {
 \r
                $res = self::contextFacture($context_id);\r
                $res .= '<table class="liste">';\r
-               $res .= '<tr><th>' . self::orderby('#', 'facture_id', $settings, 'sort' . $change) . '</th>';\r
-               $res .= '<th>' . self::orderby(__('Nom'), 'nom', $settings, 'sort' . $change) . '</th>';\r
-               $res .= '<th>' . self::orderby(__('Client'), 'client', $settings, 'sort' . $change) . '</th>';\r
-               $res .= '<th>' . self::orderby(__('Crée par'), 'createur', $settings, 'sort' . $change) . '</th>';\r
-               $res .= '<th>' . self::orderby(__('Date'), 'date_creation', $settings, 'sort' . $change) . '</th>';\r
-               $res .= '<th>' . self::orderby(__('Montant HT'), 'total_ht', $settings, 'sort' . $change) . '</th>';\r
-               $res .= '<th>' . self::orderby(__('Status'), 'status', $settings, 'sort' . $change) . '</th><th class="min"></th><th class="min"></th><th class="min"></th></tr>';\r
+               $res .= '<tr><th>' . commonUrl::orderby('#', 'facture_id', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<th>' . commonUrl::orderby(__('Nom'), 'nom', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<th>' . commonUrl::orderby(__('Client'), 'client', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<th>' . commonUrl::orderby(__('Crée par'), 'createur', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<th>' . commonUrl::orderby(__('Date'), 'date_creation', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<th>' . commonUrl::orderby(__('Montant HT'), 'total_ht', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<th>' . commonUrl::orderby(__('Status'), 'status', $settings, 'sort' . $change) . '</th><th class="min"></th><th class="min"></th><th class="min"></th></tr>';\r
                $i = 0;\r
                foreach($liste as $facture) {\r
                        $droits = extranetDroits::facture($facture, 'w', false);\r
@@ -1298,11 +1298,11 @@ class extranetUrl {
                $liste = $dao->getListeForEntreprise($core->user->entreprise, $settings['orderby'], $settings['sens'], true);\r
 \r
                $res = '<table class="liste">';\r
-               $res .= '<tr><th>' . self::orderby('#', 'facture_id', $settings, 'sortFacture') . '</th>';\r
-               $res .= '<th>' . self::orderby(__('Nom'), 'nom', $settings, 'sortFacture') . '</th>';\r
-               $res .= '<th>' . self::orderby(__('Date'), 'date_creation', $settings, 'sortFacture') . '</th>';\r
-               $res .= '<th>' . self::orderby(__('Montant HT'), 'total_ht', $settings, 'sortFacture') . '</th>';\r
-               $res .= '<th>' . self::orderby(__('Status'), 'status', $settings, 'sortFacture') . '</th>';\r
+               $res .= '<tr><th>' . commonUrl::orderby('#', 'facture_id', $settings, 'sortFacture') . '</th>';\r
+               $res .= '<th>' . commonUrl::orderby(__('Nom'), 'nom', $settings, 'sortFacture') . '</th>';\r
+               $res .= '<th>' . commonUrl::orderby(__('Date'), 'date_creation', $settings, 'sortFacture') . '</th>';\r
+               $res .= '<th>' . commonUrl::orderby(__('Montant HT'), 'total_ht', $settings, 'sortFacture') . '</th>';\r
+               $res .= '<th>' . commonUrl::orderby(__('Status'), 'status', $settings, 'sortFacture') . '</th>';\r
                $res .= '<th class="min"></th></tr>';\r
                $i = 0;\r
                foreach($liste as $facture) {\r
@@ -1770,11 +1770,11 @@ class extranetUrl {
                $liste = $dao->getListe($settings['orderby'], $settings['sens'], $settings['limit']);\r
 \r
                $res = '<table class="liste">';\r
-               $res .= '<tr><th>' . self::orderby('#', 'utilisateur_id', $settings, 'sort' . $change) . '</th>';\r
-               $res .= '<th>' . self::orderby(__('Agence'), 'agence', $settings, 'sort' . $change) . '</th>';\r
-               $res .= '<th>' . self::orderby(__('Nom'), 'nom', $settings, 'sort' . $change) . '</th>';\r
-               $res .= '<th>' . self::orderby(__('E-mail'), 'email', $settings, 'sort' . $change) . '</th>';\r
-               $res .= '<th>' . self::orderby(__('Grade'), 'grade', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<tr><th>' . commonUrl::orderby('#', 'utilisateur_id', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<th>' . commonUrl::orderby(__('Agence'), 'agence', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<th>' . commonUrl::orderby(__('Nom'), 'nom', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<th>' . commonUrl::orderby(__('E-mail'), 'email', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<th>' . commonUrl::orderby(__('Grade'), 'grade', $settings, 'sort' . $change) . '</th>';\r
                $res .= '<th>Notes</th>';\r
                // $res .= '<th class="min"></th><th class="min"></th></tr>';\r
                $i = 0;\r
@@ -1901,12 +1901,12 @@ class extranetUrl {
                $liste = $dao->getListe($settings['orderby'], $settings['sens'], $settings['limit']);\r
 \r
                $res = '<table class="liste">';\r
-               $res .= '<tr><th>' . self::orderby(__('Nom de fichier'), 'nom', $settings, 'sort' . $change) . '</th>';\r
-               $res .= '<th>' . self::orderby(__('Type'), 'type', $settings, 'sort' . $change) . '</th>';\r
-               $res .= '<th>' . self::orderby(__('Taille'), 'taille', $settings, 'sort' . $change) . '</th>';\r
-               $res .= '<th>' . self::orderby(__('Date'), 'date', $settings, 'sort' . $change) . '</th>';\r
-               $res .= '<th>' . self::orderby(__('Envoyé par'), 'contact', $settings, 'sort' . $change) . '</th>';\r
-               $res .= '<th>' . self::orderby(__('Destiné à'), 'destinataire', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<tr><th>' . commonUrl::orderby(__('Nom de fichier'), 'nom', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<th>' . commonUrl::orderby(__('Type'), 'type', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<th>' . commonUrl::orderby(__('Taille'), 'taille', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<th>' . commonUrl::orderby(__('Date'), 'date', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<th>' . commonUrl::orderby(__('Envoyé par'), 'contact', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<th>' . commonUrl::orderby(__('Destiné à'), 'destinataire', $settings, 'sort' . $change) . '</th>';\r
                $res .= '<th class="min"></th><th class="min"></th></tr>';\r
                $i = 0;\r
                foreach($liste as $fichier) {\r

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index df45d34be808421755411d64758741063c8d30da..33e4f96b892879fb7592720054afd34708ac28e9 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -40,13 +40,13 @@ class wsUrl {
                $liste = $dao->getListe($settings['orderby'], $settings['sens'], $settings['limit']);\r
 \r
                $res = '<table class="liste">';\r
-               $res .= '<tr><th>' . extranetUrl::orderby('#', 'book_id', $settings, 'sort' . $change) . '</th>';\r
-               $res .= '<th>' . extranetUrl::orderby(__('Titre de la publication'), 'nom', $settings, 'sort' . $change) . '</th>';\r
-               $res .= '<th>' . extranetUrl::orderby(__(''), 'lang', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<tr><th>' . commonUrl::orderby('#', 'book_id', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<th>' . commonUrl::orderby(__('Titre de la publication'), 'nom', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<th>' . commonUrl::orderby(__(''), 'lang', $settings, 'sort' . $change) . '</th>';\r
                $res .= '<th>' . __('Pages') . '</th>';\r
-               $res .= '<th>' . extranetUrl::orderby(__('Proprietaire'), 'proprietaire_nom', $settings, 'sort' . $change) . '</th>';\r
-               $res .= '<th>' ./*extranetUrl::orderby(__('Facturation'), 'facturable', $settings, 'sort' . $change) .*/ '</th>';\r
-               $res .= '<th>' . extranetUrl::orderby(__('Status'), 'status', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<th>' . commonUrl::orderby(__('Proprietaire'), 'proprietaire_nom', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<th>' ./*commonUrl::orderby(__('Facturation'), 'facturable', $settings, 'sort' . $change) .*/ '</th>';\r
+               $res .= '<th>' . commonUrl::orderby(__('Status'), 'status', $settings, 'sort' . $change) . '</th>';\r
                $res .= '<th class="min"></th><th class="min"></th><th class="min"></th><th class="min"></th><th class="min"></th></tr>';\r
                $i = 0;\r
 \r
@@ -407,8 +407,8 @@ html{height:100%}' . "\n";
                $liste = $dao->getListe($settings['orderby'], $settings['sens'], $settings['limit']);\r
 \r
                $res = '<table class="liste">';\r
-               $res .= '<tr><th>' . extranetUrl::orderby('#', 'entreprise_id', $settings, 'sort' . $change) . '</th>';\r
-               $res .= '<th>' . extranetUrl::orderby(__('Raison sociale'), 'nom', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<tr><th>' . commonUrl::orderby('#', 'entreprise_id', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<th>' . commonUrl::orderby(__('Raison sociale'), 'nom', $settings, 'sort' . $change) . '</th>';\r
                $res .= '<th>' . __('Contacts') . '</th>';\r
                $res .= '<th class="min"></th><th class="min"></th></tr>';\r
                $i = 0;\r