From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Wed, 19 Jan 2011 11:20:19 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=85276249aa97dd25a04d434fea7d58330515af61;p=cubeextranet.git

---

diff --git a/inc/commons/DAO/class.common.dao.entreprise.php b/inc/commons/DAO/class.common.dao.entreprise.php
index d43d12f78..481b455ea 100644
--- a/inc/commons/DAO/class.common.dao.entreprise.php
+++ b/inc/commons/DAO/class.common.dao.entreprise.php
@@ -61,7 +61,6 @@ class commonDAOEntreprise extends commonDAO {
 
 	public function getListe($orderby = null, $sens = null, $limit = null, $limitedToUserRights = false)
 	{
-
 		if (!is_null($this->q)) {
 			$daoClients = new commonDAOClient($this->con);
 			$where = '';
@@ -111,7 +110,7 @@ class commonDAOEntreprise extends commonDAO {
 	protected function limitToUserRights($user)
 	{
 		if ($user) {
-			return ' AND entreprise_id IN (SELECT entreprise FROM utilisateurs WHERE utilisateur_id IN(' . $user->ws_rights . ') AND utilisateur_id!=\''.$this->con->escape($user->utilisateur_id).'\') ';
+			return ' AND entreprise_id IN (SELECT entreprise FROM utilisateurs WHERE utilisateur_id IN(' . $user->ws_rights . ') AND utilisateur_id!=\'' . $this->con->escape($user->utilisateur_id) . '\') ';
 		}
 		return '';
 	}
@@ -125,8 +124,12 @@ class commonDAOEntreprise extends commonDAO {
 		$c->code_postal = $data['code_postal'];
 		$c->ville = $data['ville'];
 		$c->pays = $data['pays'];
-		$c->tva_intra = $data['tva_intra'];
-		$c->adresse_facturation = $data['adresse_facturation'];
+		if (isset($data['tva_intra'])) {
+			$c->tva_intra = $data['tva_intra'];
+		}
+		if (isset($data['adresse_facturation'])) {
+			$c->adresse_facturation = $data['adresse_facturation'];
+		}
 		if (isset($data['ws_admin'])) {
 			$c->ws_admin = $data['ws_admin'];
 		}
diff --git a/inc/commons/class.common.page.php b/inc/commons/class.common.page.php
index a48e2dba6..1ea161cbf 100644
--- a/inc/commons/class.common.page.php
+++ b/inc/commons/class.common.page.php
@@ -75,12 +75,13 @@ class commonPage {
 			}
 		}
 
-		fb($args);
+		$supp = array('stats' => 'publication');
+
 		$res = '<div id="nav">';
 		foreach($onglets as $titre => $url) {
 			// Si cet onglet correspond à la page active, on le place actif
-			$active = ($args[0] == $url)?' class="active"':'';
-			$res .= '<a href="' . SITE_PATH . $url . '"'.$active.'>' . cubeMedia::cssRollover($core->typo->Onglet($titre, '', false)) . '</a>';
+			$active = ($args[0] == $url || (isset($supp[$args[0]]) && $supp[$args[0]] == $url))?' class="active"':'';
+			$res .= '<a href="' . SITE_PATH . $url . '"' . $active . '>' . cubeMedia::cssRollover($core->typo->Onglet($titre, '', false)) . '</a>';
 		}
 		$res .= '</div>';
 		return $res;
diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php
index 554fc43ab..d8ebbce80 100644
--- a/inc/ws/Controlleur/class.ws.ajax.php
+++ b/inc/ws/Controlleur/class.ws.ajax.php
@@ -44,7 +44,6 @@ class wsAjax extends cubeAjax {
 			$data['ville'] = $entreprise->ville;
 			$data['pays'] = $entreprise->pays;
 			$data['grade'] = 0;
-			$data['adresse_facturation'] = $entreprise->adresse_facturation;
 			$daoClient = new commonDAOClient($core->con);
 			try {
 				$daoClient->sauve($data);
diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 4caa4767a..e1e1984e6 100644
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -508,8 +508,10 @@ html{height:100%}' . "\n";
 		$res .= '<tr><td>' . __('Code postal') . '</td><td>' . form::field('code_postal', 10, 20, $client->code_postal) . '</td></tr>';
 		$res .= '<tr><td>' . __('Ville') . '</td><td>' . form::field('ville', 30, 128, $client->ville) . '</td></tr>';
 		$res .= '<tr><td>' . __('Pays') . '</td><td>' . form::combo('pays', cubeCountry::getList(), $client->pays) . '</td></tr>';
-		$res .= '<tr><td>' . __('Adresse de facturation') . '</td><td>' . form::textarea('adresse_facturation', 40, 3, $client->adresse_facturation) . '</td></tr>';
-		$res .= '<tr><td>' . __('Numéro de TVA intracommunautaire') . '</td><td>' . form::field('tva_intra', 15, 13, $client->tva_intra) . '</td></tr>';
+		if (wsDroits::admin(false)) {
+			$res .= '<tr><td>' . __('Adresse de facturation') . '</td><td>' . form::textarea('adresse_facturation', 40, 3, $client->adresse_facturation) . '</td></tr>';
+			$res .= '<tr><td>' . __('Numéro de TVA intracommunautaire') . '</td><td>' . form::field('tva_intra', 15, 13, $client->tva_intra) . '</td></tr>';
+		}
 		// Bloc Fluidbook Workshop
 		if (wsDroits::admin(false)) {
 			$res .= '<tr class="light"><th colspan="2" class="light"><strong>' . __('Fluidbook Workshop') . '</strong></th></tr>';