Révision e7ace819
| inc/entity.class.php | ||
|---|---|---|
| 190 | 190 |
echo "<td align='center' rowspan='4'><textarea cols='35' rows='4' name='address' >".$entdata->fields["address"]."</textarea>"; |
| 191 | 191 |
echo "<td>".$LANG["financial"][100]."</td>"; |
| 192 | 192 |
echo "<td>"; |
| 193 |
autocompletionTextField("postcode","glpi_entities_data","postcode",$entdata->fields["postcode"],25);
|
|
| 193 |
autocompletionTextField("postcode","glpi_entities_data","postcode",$entdata->fields["postcode"],25);
|
|
| 194 | 194 |
echo "</td>"; |
| 195 | 195 |
echo "</tr>"; |
| 196 | 196 |
|
| plugins/anet_epacks/front/plugin_anet_epacks.view_array_recap.php | ||
|---|---|---|
| 37 | 37 |
LEFT JOIN glpi_entities AS g3 ON e.FK_client=g3.ID |
| 38 | 38 |
LEFT JOIN glpi_computers AS g4 ON e.FK_serveur=g4.ID |
| 39 | 39 |
LEFT JOIN glpi_plugin_anet_epacks_recencement_max AS g5 ON e.FK_serveur=g5.FK_serveur\n"; |
| 40 |
|
|
| 40 | 41 |
//WHERE e.Fk_Serveur > '0'\n"; |
| 41 | 42 |
if($data['name'] == "revendeur" || $data['name'] == "dsi") {
|
| 42 |
$query .= "WHERE e.FK_activation='" . $entityid . "'\n"; |
|
| 43 |
$query .= "WHERE e.FK_contract >= '0' AND e.FK_activation='" . $entityid . "'\n";
|
|
| 43 | 44 |
//GROUP BY e.FK_serveur |
| 44 | 45 |
$query .= "GROUP BY e.FK_client |
| 45 |
ORDER BY serveur,client
|
|
| 46 |
ORDER BY client |
|
| 46 | 47 |
LIMIT 500;"; |
| 47 | 48 |
} |
| 48 | 49 |
else {
|
| 49 | 50 |
//On n'affiche pas les serveurs qui ne sont pas "Zen" |
| 50 |
$query .= "WHERE e.FK_Serveur>'0'\n"; |
|
| 51 |
$query .= "WHERE e.FK_contract >= '0' AND e.FK_Serveur>'0'\n";
|
|
| 51 | 52 |
//GROUP BY e.FK_serveur |
| 52 | 53 |
//On ne peut pas group by client a cause de l'historique ou on avait pas la meme structure |
| 53 | 54 |
//de base |
| 54 | 55 |
$query .= "GROUP BY e.FK_serveur |
| 55 |
ORDER BY serveur,client
|
|
| 56 |
ORDER BY client |
|
| 56 | 57 |
LIMIT 500;"; |
| 57 | 58 |
} |
| 58 | 59 |
|
Formats disponibles : Unified diff