From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Mon, 7 Dec 2015 12:51:35 +0000 (+0000)
Subject: #extranet Fix TVA number not displayed on invoices
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=57f1fc9341580bbaab06cbdc4c6b49567b1e6789;p=cubeextranet.git

#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 2bc8fa69b..d641265c5 100644
--- 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)) {
 			$utilisateur->site = $r->site;
 		}
+		if (isset($r->tva_intra)) {
+			$utilisateur->tva_intra = $r->tva_intra;
+		}
 		return $utilisateur;
 	}
 
@@ -92,7 +95,7 @@ class commonDAOUtilisateur extends commonDAO {
 		$utilisateur->settings = array();
 		$utilisateur->notes = '';
 		$utilisateur->entreprise = 0;
-		$utilisateur->enabled=1;
+		$utilisateur->enabled = 1;
 		$utilisateur->ws_settings = array('resolution' => 150, 'method' => 0, 'quality' => 85, 'objects' => 1800);
 		return $utilisateur;
 	}
@@ -211,8 +214,8 @@ class commonDAOUtilisateur extends commonDAO {
 		} else {
 			$c->password = crypt::createPassword();
 		}
-		if(isset($data['enabled'])){
-			$c->enabled=$data['enabled'];
+		if (isset($data['enabled'])) {
+			$c->enabled = $data['enabled'];
 		}
 		$c->adresse = $data['adresse'];
 		$c->code_postal = $data['code_postal'];
@@ -288,6 +291,4 @@ class commonDAOUtilisateur extends commonDAO {
 		return '1=1';
 	}
 
-}
-
-?>
\ 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 c05ba2111..9255c2407 100644
--- 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;
 	protected $ws_administrateur;
 }
-
-?>
\ No newline at end of file
diff --git a/inc/commons/class.common.core.php b/inc/commons/class.common.core.php
index e3ecbdea3..bd9bef979 100644
--- 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, '
 			. 'e.ws_grade, e.ws_admin, e.ws_signatures AS ws_signatures, e.site AS site '
 			. 'FROM entreprises e LEFT JOIN utilisateurs u ON u.entreprise=e.entreprise_id');
-		$this->views->createView('clients', 'SELECT u.*,e.nom AS rs, e.adresse_facturation AS adresse_facturation, e.site AS site, i.impaye, '
+		$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, '
 			. 'SUM(f.total_ht) AS ca '
 			. '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) '
 			. 'GROUP BY u.utilisateur_id', 'TEMPTABLE');