fix #1071 @1

diff --git a/inc/ws/Controlleur/class.ws.maintenance.php b/inc/ws/Controlleur/class.ws.maintenance.php
index d12407c0b305ea1f3cd84b7dbbfbb32a491b7cbc..8b530336b0e7e838af4a9d7f7e076eef160969c6 100644 (file)
--- 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);
                        }
                }