From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Thu, 5 Jan 2017 16:54:04 +0000 (+0000)
Subject: fix #1071 @1
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=0e8334dc95e2bf4ec9e7b4cb9551d4f6f68a0ae6;p=cubeextranet.git

fix #1071 @1
---

diff --git a/inc/ws/Controlleur/class.ws.maintenance.php b/inc/ws/Controlleur/class.ws.maintenance.php
index d12407c0b..8b530336b 100644
--- a/inc/ws/Controlleur/class.ws.maintenance.php
+++ b/inc/ws/Controlleur/class.ws.maintenance.php
@@ -1056,7 +1056,7 @@ class wsMaintenance {
 
 		$r = $core->con->select("SELECT * FROM entreprises_ws WHERE revendeur='Kadreo' AND ws_grade<=4 AND ws_grade>0");
 		while ($r->fetch()) {
-			$e[$r->entreprise_id] = array('COUNTRY' => $r->pays, 'CONTACT' => date('d/m/Y', $r->date_creation), 'COMPANY' => $r->nom);
+			$e[$r->entreprise_id] = array('COUNTRY' => $r->pays, 'CONTACT' => date('m/d/Y', $r->date_creation), 'COMPANY' => $r->nom);
 		}
 
 		$batch = array();
@@ -1092,12 +1092,12 @@ class wsMaintenance {
 
 		$r = $core->con->select("SELECT * FROM entreprises_ws WHERE revendeur='Cubedesigners' AND ws_grade<=4 AND ws_grade>0");
 		while ($r->fetch()) {
-			$e[$r->entreprise_id] = array('COUNTRY' => $r->pays, 'CONTACT' => date('d/m/Y', $r->date_creation), 'LASTACTION' => date('d/m/Y', $r->date_creation), 'COMPANY' => $r->nom, 'RESSELER' => ($r->ws_grade > 2) ? 1 : 0, 'FLUIDBOOKS' => 0, 'TURNOVER' => 0);
+			$e[$r->entreprise_id] = array('COUNTRY' => $r->pays, 'CONTACT' => date('m/d/Y', $r->date_creation), 'LASTACTION' => date('m/d/Y', $r->date_creation), 'COMPANY' => $r->nom, 'RESSELER' => ($r->ws_grade > 2) ? 1 : 0, 'FLUIDBOOKS' => 0, 'TURNOVER' => 0);
 		}
 
 		$r = $core->con->select("SELECT * FROM entreprises_vue");
 		while ($r->fetch()) {
-			if (isset($e[$r->entreprise_id])) {
+			if ($r->ca && isset($e[$r->entreprise_id])) {
 				$e[$r->entreprise_id]['TURNOVER'] = $r->ca;
 			}
 		}
@@ -1107,7 +1107,7 @@ class wsMaintenance {
 			$eid = $u[$rr->facturable_id]['entreprise'];
 			if (isset($e[$eid])) {
 				$e[$eid]['FLUIDBOOKS'] = $rr->nb;
-				$e[$eid]['LASTACTION'] = date('d/m/Y', $rr->lastdate);
+				$e[$eid]['LASTACTION'] = date('m/d/Y', $rr->lastdate);
 			}
 		}