#extranet Fix TVA number not displayed on invoices

diff --git a/inc/commons/DAO/class.common.dao.utilisateur.php b/inc/commons/DAO/class.common.dao.utilisateur.php
index 2bc8fa69b8692776c74d0ec1e37560088a2a5523..d641265c55d61499d812532d3f0ace6737612e9a 100644 (file)
--- a/inc/commons/DAO/class.common.dao.utilisateur.php
+++ b/inc/commons/DAO/class.common.dao.utilisateur.php
@@ -68,6 +68,9 @@ class commonDAOUtilisateur extends commonDAO {
                if (isset($r->site)) {\r
                        $utilisateur->site = $r->site;\r
                }\r
+               if (isset($r->tva_intra)) {\r
+                       $utilisateur->tva_intra = $r->tva_intra;\r
+               }\r
                return $utilisateur;\r
        }\r
 \r
@@ -92,7 +95,7 @@ class commonDAOUtilisateur extends commonDAO {
                $utilisateur->settings = array();\r
                $utilisateur->notes = '';\r
                $utilisateur->entreprise = 0;\r
-               $utilisateur->enabled=1;\r
+               $utilisateur->enabled = 1;\r
                $utilisateur->ws_settings = array('resolution' => 150, 'method' => 0, 'quality' => 85, 'objects' => 1800);\r
                return $utilisateur;\r
        }\r
@@ -211,8 +214,8 @@ class commonDAOUtilisateur extends commonDAO {
                } else {\r
                        $c->password = crypt::createPassword();\r
                }\r
-               if(isset($data['enabled'])){\r
-                       $c->enabled=$data['enabled'];\r
+               if (isset($data['enabled'])) {\r
+                       $c->enabled = $data['enabled'];\r
                }\r
                $c->adresse = $data['adresse'];\r
                $c->code_postal = $data['code_postal'];\r
@@ -288,6 +291,4 @@ class commonDAOUtilisateur extends commonDAO {
                return '1=1';\r
        }\r
 \r
-}\r
-\r
-?>
\ No newline at end of file
+}
\ No newline at end of file

diff --git a/inc/commons/Metier/class.common.entreprise.php b/inc/commons/Metier/class.common.entreprise.php
index c05ba2111bd6670a779ae3c75fe33eabd769049c..9255c2407a09ce6df9b435a4046ffd470ff067c3 100644 (file)
--- a/inc/commons/Metier/class.common.entreprise.php
+++ b/inc/commons/Metier/class.common.entreprise.php
@@ -23,5 +23,3 @@ class commonEntreprise extends cubeMetier {
        protected $ws_revendeur;\r
        protected $ws_administrateur;\r
 }\r
-\r
-?>
\ No newline at end of file

diff --git a/inc/commons/class.common.core.php b/inc/commons/class.common.core.php
index e3ecbdea333f8470258dafa8aa38f9cb16718c05..bd9bef9795093bf2c21aa3e2bcbe34d958972e10 100644 (file)
--- a/inc/commons/class.common.core.php
+++ b/inc/commons/class.common.core.php
@@ -555,7 +555,7 @@ class commonCore extends cubeCore {
                $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, 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, e.site AS site, i.impaye, '\r
+               $this->views->createView('clients', 'SELECT u.*,e.nom AS rs, e.adresse_facturation AS adresse_facturation, e.site AS site, e.tva_intra AS tva_intra, 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