(no commit message)

diff --git a/inc/commons/DAO/class.common.dao.entreprise.php b/inc/commons/DAO/class.common.dao.entreprise.php
index aec6d87678e9192f47e65bec8222920ef4f4adc7..3c0cbcbf849fdcfd1a745de6e1655a51c54ff848 100644 (file)
--- a/inc/commons/DAO/class.common.dao.entreprise.php
+++ b/inc/commons/DAO/class.common.dao.entreprise.php
@@ -27,6 +27,9 @@ class commonDAOEntreprise extends commonDAO {
                if (isset($r->administrateur)) {\r
                        $entreprise->ws_administrateur = $r->administrateur;\r
                }\r
+               if(isset($r->site)){\r
+                       $entreprise->site=$r->site;\r
+               }\r
                return $entreprise;\r
        }\r
 \r
@@ -137,6 +140,7 @@ class commonDAOEntreprise extends commonDAO {
                $c->code_postal = $data['code_postal'];\r
                $c->ville = $data['ville'];\r
                $c->pays = $data['pays'];\r
+               $c->site=$data['site'];\r
                if (isset($data['tva_intra'])) {\r
                        $c->tva_intra = $data['tva_intra'];\r
                }\r

diff --git a/inc/commons/DAO/class.common.dao.utilisateur.php b/inc/commons/DAO/class.common.dao.utilisateur.php
index 7dc2cdff4672ebf797aee4971d8a9d34ae2b40f3..1281cc05340f7e22db35b3916e3eb5c2b088c8d3 100644 (file)
--- a/inc/commons/DAO/class.common.dao.utilisateur.php
+++ b/inc/commons/DAO/class.common.dao.utilisateur.php
@@ -64,6 +64,9 @@ class commonDAOUtilisateur extends commonDAO {
                if (isset($r->ws_admin)) {\r
                        $utilisateur->ws_admin = $r->ws_admin;\r
                }\r
+               if(isset($r->site)){\r
+                       $utilisateur->site=$r->site;\r
+               }\r
                return $utilisateur;\r
        }\r
 \r

diff --git a/inc/commons/Metier/class.common.entreprise.php b/inc/commons/Metier/class.common.entreprise.php
index dc94e1858bf9b624156e9fda9714fc60f3aa2851..bfbb0a2fe0de36d78b605b016dd405c61076a534 100644 (file)
--- a/inc/commons/Metier/class.common.entreprise.php
+++ b/inc/commons/Metier/class.common.entreprise.php
@@ -11,6 +11,7 @@ class commonEntreprise extends cubeMetier {
        protected $tva_intra;\r
        protected $notes;\r
        protected $adresse_facturation;\r
+       protected $site;\r
        protected $ws_admin;\r
        protected $ws_grade;\r
        protected $ws_signatures;\r

diff --git a/inc/commons/Metier/class.common.utilisateur.php b/inc/commons/Metier/class.common.utilisateur.php
index da6f1fd60499886610e797dd52f7d49c5fb48b6c..ed08e5d06fc2cb956956aeceab128f1a22e17649 100644 (file)
--- a/inc/commons/Metier/class.common.utilisateur.php
+++ b/inc/commons/Metier/class.common.utilisateur.php
@@ -22,6 +22,7 @@ class commonUtilisateur extends cubeMetier {
        protected $entreprise;\r
        protected $tva_intra;\r
        protected $rs;\r
+       protected $site;\r
        protected $collegues;\r
        protected $ws_admin;\r
        protected $ws_grade;\r

diff --git a/inc/commons/class.common.core.php b/inc/commons/class.common.core.php
index d9bc11340c80edad08ad3fa2179f69aa52922a80..b201fc487d098e50ea5a5dbaf22d8382c027ae87 100644 (file)
--- a/inc/commons/class.common.core.php
+++ b/inc/commons/class.common.core.php
@@ -7,6 +7,7 @@ class commonCore extends cubeCore {
        public $agences;\r
        public $categories;\r
        public $ws_grades;\r
+       public $demandes_type;\r
 \r
        public function __construct() {\r
                parent::__construct();\r
@@ -467,12 +468,12 @@ class commonCore extends cubeCore {
                                . 'LEFT JOIN utilisateurs ur ON e.ws_admin=ur.utilisateur_id '\r
                                . 'LEFT JOIN entreprises r ON ur.entreprise=r.entreprise_id '\r
                                . 'LEFT JOIN utilisateurs a ON ri.administrateur_id=a.utilisateur_id ');\r
-               $this->views->createView('clients_entreprise', 'SELECT u.*,e.nom AS rs, e.adresse_facturation AS adresse_facturation '\r
+               $this->views->createView('clients_entreprise', 'SELECT u.*,e.nom AS rs, e.adresse_facturation AS adresse_facturation, e.site AS site '\r
                                . 'FROM entreprises e LEFT JOIN utilisateurs u ON u.entreprise=e.entreprise_id AND u.grade=0');\r
                $this->views->createView('utilisateurs_entreprise', 'SELECT u.*,e.nom AS rs, e.adresse_facturation AS adresse_facturation, '\r
-                               . 'e.ws_grade, e.ws_admin, e.ws_signatures AS ws_signatures '\r
+                               . 'e.ws_grade, e.ws_admin, e.ws_signatures AS ws_signatures, e.site AS site '\r
                                . 'FROM entreprises e LEFT JOIN utilisateurs u ON u.entreprise=e.entreprise_id');\r
-               $this->views->createView('clients', 'SELECT u.*,e.nom AS rs, e.adresse_facturation AS adresse_facturation, i.impaye, '\r
+               $this->views->createView('clients', 'SELECT u.*,e.nom AS rs, e.adresse_facturation AS adresse_facturation, e.site AS site, i.impaye, '\r
                                . 'SUM(f.total_ht) AS ca '\r
                                . 'FROM entreprises e LEFT JOIN impayes_entreprises i ON e.entreprise_id=i.entreprise LEFT JOIN utilisateurs u ON u.entreprise=e.entreprise_id AND u.grade=0 LEFT JOIN projets p ON p.client=u.utilisateur_id LEFT JOIN factures f ON f.projet=p.projet_id AND f.status IN(1,2) '\r
                                . 'GROUP BY u.utilisateur_id', 'TEMPTABLE');\r

diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php
index b0c622d41955f7c62584e44fddcfceeea78d20b5..812534d2844c0dfcd69239310ce9402b3c365a66 100644 (file)
--- a/inc/ws/Controlleur/class.ws.ajax.php
+++ b/inc/ws/Controlleur/class.ws.ajax.php
@@ -41,6 +41,7 @@ class wsAjax extends cubeAjax {
                        $data['code_postal'] = $entreprise->code_postal;\r
                        $data['ville'] = $entreprise->ville;\r
                        $data['pays'] = $entreprise->pays;\r
+                       $data['site']=$entreprise->site;\r
                        $data['grade'] = 0;\r
                        $daoClient = new commonDAOClient($core->con);\r
                        try {\r
@@ -410,6 +411,7 @@ class wsAjax extends cubeAjax {
                        $datas['code_postal'] = $_POST['code_postal'];\r
                        $datas['ville'] = $_POST['ville'];\r
                        $datas['pays'] = $_POST['pays'];\r
+                       $datas['site']=$_POST['site'];\r
                        if ($_POST['rs'] == '') {\r
                                $datas['nom'] = $_POST['prenom'] . ' ' . $_POST['nom'];\r
                        } else {\r
@@ -479,6 +481,8 @@ class wsAjax extends cubeAjax {
                        if ($_POST[$f] != '') {\r
                                if ($f == 'pays') {\r
                                        $body .= ' * ' . $d . ' : ' . cubeCountry::getCountry($_POST[$f], 'fr') . "\r\n";\r
+                               } else if ($f == 'type') {\r
+                                       $body .= ' * ' . $d . ' : ' . $core->demandes_type[$_POST[$f]] . "\r\n";\r
                                } else {\r
                                        $body .= ' * ' . $d . ' : ' . $_POST[$f] . "\r\n";\r
                                }\r
@@ -714,7 +718,7 @@ class wsAjax extends cubeAjax {
                global $core;\r
 \r
                set_time_limit(0);\r
-               \r
+\r
                $book_id = $args[1];\r
                $time = $args[2];\r
 \r
@@ -724,7 +728,7 @@ class wsAjax extends cubeAjax {
 \r
                self::getLinksFromExcel($xls, $links, $rulers);\r
 \r
-               \r
+\r
 \r
                $dao = new wsDAODocument($core->con);\r
                $dao->setLinksAndRulers($book_id, json_encode($links), json_encode($rulers), 'Restore links from ' . date('Y-m-d H:i:s', $time), $core->user->utilisateur_id);\r
@@ -792,26 +796,25 @@ class wsAjax extends cubeAjax {
 \r
                $dao = new wsDAODocument($core->con);\r
                $dao->setLinksAndRulers($book_id, json_encode($links), json_encode($rulers), 'Import from excel', $core->user->utilisateur_id);\r
-               \r
-               $specialLinks=array();\r
-               foreach($links as $l){\r
-                       if(is_int($l['page'])){\r
+\r
+               $specialLinks = array();\r
+               foreach ($links as $l) {\r
+                       if (is_int($l['page'])) {\r
                                continue;\r
                        }\r
-                       $specialLinks[]=$l;\r
+                       $specialLinks[] = $l;\r
                }\r
-               $specialRulers=array();\r
-               foreach($rulers as $r){\r
-                       if(is_int($r['page'])){\r
+               $specialRulers = array();\r
+               foreach ($rulers as $r) {\r
+                       if (is_int($r['page'])) {\r
                                continue;\r
                        }\r
-                       $specialRulers[]=$r;\r
+                       $specialRulers[] = $r;\r
                }\r
-               \r
-               \r
+\r
+\r
                $daoBook = new wsDAOBook($core->con);\r
                $daoBook->setSpecialLinksAndRulers($book_id, json_encode($specialLinks), json_encode($specialRulers));\r
-               \r
        }\r
 \r
 }\r

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 4968148b11604799cde705283933388dc742025b..34254b9c59fae0c9a0b32587b1a15b9cfeaf787d 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -1193,6 +1193,7 @@ html{height:100%}' . "\n";
                $res .= '<tr><td>' . __('Code postal') . '</td><td>' . form::field('code_postal', 10, 20, $client->code_postal) . '</td></tr>';\r
                $res .= '<tr><td>' . __('Ville') . '</td><td>' . form::field('ville', 30, 128, $client->ville) . '</td></tr>';\r
                $res .= '<tr><td>' . __('Pays') . '</td><td>' . form::combo('pays', cubeCountry::getList(), $client->pays) . '</td></tr>';\r
+               $res .= '<tr><td>' . __('Site internet') . '</td><td>' . form::field('site', 30, 128, $client->site) . '</td></tr>';\r
                if (wsDroits::admin(false)) {\r
                        $res .= '<tr><td>' . __('Adresse de facturation') . '</td><td>' . form::textarea('adresse_facturation', 40, 3, $client->adresse_facturation) . '</td></tr>';\r
                        $res .= '<tr><td>' . __('Numéro de TVA intracommunautaire') . '</td><td>' . form::field('tva_intra', 15, 13, $client->tva_intra) . '</td></tr>';\r

diff --git a/inc/ws/Metier/class.ws.demande.php b/inc/ws/Metier/class.ws.demande.php
index 30bd75acc52a02f395123972cc5f7fd9db880b49..d6eb470965b7279471d8bac8c28d2faa02bc3724 100644 (file)
--- a/inc/ws/Metier/class.ws.demande.php
+++ b/inc/ws/Metier/class.ws.demande.php
@@ -37,13 +37,17 @@ class wsDemande extends cubeMetier {
                        'prenom' => __('Prenom'),\r
                        'nom' => __('Nom'),\r
                        'rs' => __('Entreprise'),\r
+                       'site' => __('Site internet'),\r
+                       'telephone' => __('Téléphone'),\r
                        'adresse' => __('Adresse'),\r
                        'code_postal' => __('Code postal'),\r
                        'ville' => __('Ville'),\r
                        'pays' => 'Pays');\r
                foreach ($fields as $p => $t) {\r
-                       if ($utilisateur->$p != '') {\r
+                       if (isset($utilisateur->$p) && $utilisateur->$p != '') {\r
                                $body .= ' * ' . $t . ' : ' . $utilisateur->$p . "\r\n";\r
+                       } else if (isset($demande->$p) && $demande->$p != '') {\r
+                               $body .= ' * ' . $t . ' : ' . $demande->$p . "\r\n";\r
                        }\r
                }\r
                return $body;\r