Merge branch 'master' of https://github.com/InfotelGLPI/manageentities

inc/cri.class.php

@@ -333,6 +333,7 @@ function generatePdf($params, $options = []) {
       $p['REPORT_ACTIVITE'] = '';
       $p['documents_id']    = 0;
       $p['number_moving']   = 0;
+
       foreach ($params as $key => $val) {
          $p[$key] = $val;
          if($key == 'REPORT_DESCRIPTION'){

inc/cridetail.class.php

@@ -379,8 +379,7 @@ static function showReports($item, $instID, $entity = -1, $options = []) {
            OR ISNULL(plugin_manageentities_contractstates_id))";
 
          if ($entity != -1)
-            $query .= " AND `glpi_documents`.`entities_id` IN (" . $entity . ") ";
-         else
+            $query .= " AND `glpi_documents`.`entities_id` IN (" . $entity . ") "; else
             $query .= " AND `glpi_documents`.`tickets_id` = '" . $instID . "' ";
          $query .= " ORDER BY `glpi_plugin_manageentities_cridetails`.`date` DESC LIMIT 10";
 
@@ -454,10 +453,10 @@ static function showReports($item, $instID, $entity = -1, $options = []) {
             echo "</table>";
          } else {
             echo __('No item found');
+            if ($entity == -1) {
+               self::addReports($item, $options);
+            }
          }
-
-      } else if ($entity == -1) {
-         self::addReports($item, $options);
       }
    }
 

locales/fr_FR.po

@@ -5,15 +5,16 @@
 # 
 # Translators:
 # Xavier CAILLAUD <[email protected]>, 2020
+# Kevin HAINRY <[email protected]>, 2020
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: GLPI - Manageentities plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-11 11:24+0000\n"
+"POT-Creation-Date: 2020-12-14 15:07+0000\n"
 "PO-Revision-Date: 2020-11-02 16:08+0000\n"
-"Last-Translator: Xavier CAILLAUD <thetsmr@gmail.com>, 2020\n"
+"Last-Translator: Kevin HAINRY <kevin.hainry@infotel.com>, 2020\n"
 "Language-Team: French (France) (https://www.transifex.com/infotelGLPI/teams/79674/fr_FR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -73,7 +74,7 @@ msgstr "Rapport concernant les déplacements des techniciens"
 #: front/entity.php:49 front/generatecri.form.php:83 front/generatecri.php:36
 #: front/generatecri.php:39 front/generatecri.php:42 front/report.form.php:32
 #: front/report_moving.form.php:32 front/report_occupation.form.php:32
-#: inc/followup.class.php:968 inc/generatecri.class.php:1124
+#: inc/followup.class.php:968 inc/generatecri.class.php:1149
 #: inc/monthly.class.php:548 inc/preference.class.php:75
 #: inc/profile.class.php:42 inc/profile.class.php:96
 #: inc/taskcategory.class.php:55
@@ -897,21 +898,21 @@ msgstr "Merci de configurer une catégorie de tâche de ticket avec le plugin"
 msgid "No tasks"
 msgstr "Pas de tâches"
 
-#: inc/cri.class.php:488
+#: inc/cri.class.php:492
 msgid "Please fill the contract period begin and end dates."
 msgstr ""
 "Merci de renseigner les dates de début et de fin de la prestation du "
 "contrat."
 
-#: inc/cri.class.php:493
+#: inc/cri.class.php:497
 msgid "Please fill the contract period end date."
 msgstr "Merci de renseigner la date de fin de la prestation du contrat."
 
-#: inc/cri.class.php:498
+#: inc/cri.class.php:502
 msgid "Please fill the contract period begin date."
 msgstr "Merci de renseigner la date de début de la prestation du contrat."
 
-#: inc/cri.class.php:802
+#: inc/cri.class.php:806
 msgid "Save the intervention report"
 msgstr "Enregistrer le compte-rendu d'intervention"
 
@@ -936,7 +937,7 @@ msgid "Crossed time (itinerary including)"
 msgstr "Temps passé (trajet inclus)"
 
 #: inc/cridetail.class.php:197 inc/cridetail.class.php:407
-#: inc/cridetail.class.php:1126 inc/generatecri.class.php:1166
+#: inc/cridetail.class.php:1126 inc/generatecri.class.php:1191
 msgid "Intervention with contract"
 msgstr "Intervention sous contrat"
 
@@ -978,7 +979,7 @@ msgid "To compute"
 msgstr "Décompte"
 
 #: inc/cridetail.class.php:517 inc/cridetail.class.php:1185
-#: inc/cridetail.class.php:1212 inc/generatecri.class.php:1220
+#: inc/cridetail.class.php:1212 inc/generatecri.class.php:1245
 msgid "Periods of contract"
 msgstr "Prestations du contrat"
 
@@ -1027,7 +1028,7 @@ msgstr "Associer à un contrat"
 msgid "With contrat"
 msgstr "Avec contrat"
 
-#: inc/cridetail.class.php:1164 inc/generatecri.class.php:1197
+#: inc/cridetail.class.php:1164 inc/generatecri.class.php:1222
 msgid "No active contracts"
 msgstr "Aucun contrats en cours"
 
@@ -1309,28 +1310,32 @@ msgstr "Informations sur les tâches accomplies"
 msgid "Add this Task"
 msgstr "Ajouter cette tâche"
 
-#: inc/generatecri.class.php:636
+#: inc/generatecri.class.php:648
 msgid "Content, end and begin date are mandatory for a task !"
 msgstr ""
 "Le contenu, la date de fin et de début sont obligatoires pour une tâche!"
 
-#: inc/generatecri.class.php:638
+#: inc/generatecri.class.php:650
+msgid "Task category must be defined"
+msgstr "La catégorie de tâche doit être définie"
+
+#: inc/generatecri.class.php:652
 msgid "End date must be after the begin date !"
 msgstr "La date de fin doit être postérieure à la date de début!"
 
-#: inc/generatecri.class.php:670
+#: inc/generatecri.class.php:685
 msgid "Description"
 msgstr "Description"
 
-#: inc/generatecri.class.php:671
+#: inc/generatecri.class.php:686
 msgid "Technician as assigned"
 msgstr "Technicien assigné"
 
-#: inc/generatecri.class.php:731
+#: inc/generatecri.class.php:747
 msgid "Non-accomplished tasks informations"
 msgstr "Informations sur les tâches non accomplies"
 
-#: inc/generatecri.class.php:771
+#: inc/generatecri.class.php:787
 msgctxt "button"
 msgid "Generate"
 msgstr "Générer"

locales/glpi.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GLPI - Manageentities plugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-11 11:24+0000\n"
+"POT-Creation-Date: 2020-12-15 08:08+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -31,8 +31,8 @@ msgid "Study and advice"
 msgstr ""
 
 #: hook.php:550 inc/addelementsview.class.php:2164 inc/cri.class.php:156
-#: inc/cridetail.class.php:194 inc/cridetail.class.php:404
-#: inc/cridetail.class.php:499 inc/cridetail.class.php:878
+#: inc/cridetail.class.php:194 inc/cridetail.class.php:403
+#: inc/cridetail.class.php:498 inc/cridetail.class.php:877
 #: inc/criprice.class.php:335 inc/critype.class.php:39
 msgid "Intervention type"
 msgid_plural "Intervention types"
@@ -70,7 +70,7 @@ msgstr ""
 #: front/entity.php:49 front/generatecri.form.php:83 front/generatecri.php:36
 #: front/generatecri.php:39 front/generatecri.php:42 front/report.form.php:32
 #: front/report_moving.form.php:32 front/report_occupation.form.php:32
-#: inc/followup.class.php:968 inc/generatecri.class.php:1124
+#: inc/followup.class.php:968 inc/generatecri.class.php:1149
 #: inc/monthly.class.php:548 inc/preference.class.php:75
 #: inc/profile.class.php:42 inc/profile.class.php:96
 #: inc/taskcategory.class.php:55
@@ -840,13 +840,13 @@ msgstr ""
 msgid "Interventions reports"
 msgstr ""
 
-#: inc/cri.class.php:84 inc/cridetail.class.php:1049 inc/cripdf.class.php:401
+#: inc/cri.class.php:84 inc/cridetail.class.php:1048 inc/cripdf.class.php:401
 msgid "Out of contract"
 msgstr ""
 
-#: inc/cri.class.php:99 inc/cridetail.class.php:192 inc/cridetail.class.php:402
-#: inc/cridetail.class.php:502 inc/cridetail.class.php:882
-#: inc/cridetail.class.php:890 inc/cridetail.class.php:963
+#: inc/cri.class.php:99 inc/cridetail.class.php:192 inc/cridetail.class.php:401
+#: inc/cridetail.class.php:501 inc/cridetail.class.php:881
+#: inc/cridetail.class.php:889 inc/cridetail.class.php:962
 #: inc/report.class.php:215
 msgid "Technicians"
 msgstr ""
@@ -883,19 +883,19 @@ msgstr ""
 msgid "No tasks"
 msgstr ""
 
-#: inc/cri.class.php:488
+#: inc/cri.class.php:493
 msgid "Please fill the contract period begin and end dates."
 msgstr ""
 
-#: inc/cri.class.php:493
+#: inc/cri.class.php:498
 msgid "Please fill the contract period end date."
 msgstr ""
 
-#: inc/cri.class.php:498
+#: inc/cri.class.php:503
 msgid "Please fill the contract period begin date."
 msgstr ""
 
-#: inc/cri.class.php:802
+#: inc/cri.class.php:807
 msgid "Save the intervention report"
 msgstr ""
 
@@ -913,105 +913,105 @@ msgstr ""
 msgid "Impossible action as an intervention report exists"
 msgstr ""
 
-#: inc/cridetail.class.php:196 inc/cridetail.class.php:406
-#: inc/cridetail.class.php:501 inc/cridetail.class.php:881
+#: inc/cridetail.class.php:196 inc/cridetail.class.php:405
+#: inc/cridetail.class.php:500 inc/cridetail.class.php:880
 #: inc/cripdf.class.php:414
 msgid "Crossed time (itinerary including)"
 msgstr ""
 
-#: inc/cridetail.class.php:197 inc/cridetail.class.php:407
-#: inc/cridetail.class.php:1126 inc/generatecri.class.php:1166
+#: inc/cridetail.class.php:197 inc/cridetail.class.php:406
+#: inc/cridetail.class.php:1125 inc/generatecri.class.php:1191
 msgid "Intervention with contract"
 msgstr ""
 
 #: inc/cridetail.class.php:199
 msgid "Associated ticket"
 msgstr ""
 
-#: inc/cridetail.class.php:393
+#: inc/cridetail.class.php:392
 msgid "Associated intervention reports"
 msgstr ""
 
-#: inc/cridetail.class.php:397 inc/entity.class.php:408
+#: inc/cridetail.class.php:396 inc/entity.class.php:408
 msgid "All reports"
 msgstr ""
 
-#: inc/cridetail.class.php:408 inc/cripdf.class.php:390
+#: inc/cridetail.class.php:407 inc/cripdf.class.php:390
 msgid "Contract number"
 msgstr ""
 
-#: inc/cridetail.class.php:495
+#: inc/cridetail.class.php:494
 msgid "Intervention of contract"
 msgstr ""
 
-#: inc/cridetail.class.php:498 inc/cridetail.class.php:877
-#: inc/cridetail.class.php:962
+#: inc/cridetail.class.php:497 inc/cridetail.class.php:876
+#: inc/cridetail.class.php:961
 msgid "Object of intervention"
 msgstr ""
 
-#: inc/cridetail.class.php:504 inc/cridetail.class.php:884
+#: inc/cridetail.class.php:503 inc/cridetail.class.php:883
 msgid "Applied daily rate"
 msgstr ""
 
-#: inc/cridetail.class.php:506 inc/cridetail.class.php:886
+#: inc/cridetail.class.php:505 inc/cridetail.class.php:885
 msgid "Applied hourly rate"
 msgstr ""
 
-#: inc/cridetail.class.php:508 inc/cridetail.class.php:893
+#: inc/cridetail.class.php:507 inc/cridetail.class.php:892
 msgid "To compute"
 msgstr ""
 
-#: inc/cridetail.class.php:517 inc/cridetail.class.php:1185
-#: inc/cridetail.class.php:1212 inc/generatecri.class.php:1220
+#: inc/cridetail.class.php:516 inc/cridetail.class.php:1184
+#: inc/cridetail.class.php:1211 inc/generatecri.class.php:1245
 msgid "Periods of contract"
 msgstr ""
 
-#: inc/cridetail.class.php:841 inc/cridetail.class.php:1240
+#: inc/cridetail.class.php:840 inc/cridetail.class.php:1239
 msgid "Ticket not validated"
 msgstr ""
 
-#: inc/cridetail.class.php:849 inc/cridetail.class.php:1247
+#: inc/cridetail.class.php:848 inc/cridetail.class.php:1246
 msgid "Type of service contract missing"
 msgstr ""
 
-#: inc/cridetail.class.php:874 inc/cridetail.class.php:959
+#: inc/cridetail.class.php:873 inc/cridetail.class.php:958
 msgid "Intervention periods of contract"
 msgstr ""
 
-#: inc/cridetail.class.php:889 inc/cripdf.class.php:198
+#: inc/cridetail.class.php:888 inc/cripdf.class.php:198
 #: inc/cripdf.class.php:439
 msgid "of this intervention"
 msgstr ""
 
-#: inc/cridetail.class.php:891
+#: inc/cridetail.class.php:890
 msgid "Applied rate"
 msgstr ""
 
-#: inc/cridetail.class.php:934
+#: inc/cridetail.class.php:933
 msgid "Total yearly consumption"
 msgstr ""
 
-#: inc/cridetail.class.php:941
+#: inc/cridetail.class.php:940
 msgid "Estimated number of remaining days"
 msgstr ""
 
-#: inc/cridetail.class.php:946 inc/cridetail.class.php:977
+#: inc/cridetail.class.php:945 inc/cridetail.class.php:976
 msgid "No interventions in the dates of the period"
 msgstr ""
 
-#: inc/cridetail.class.php:964
+#: inc/cridetail.class.php:963
 msgid "Consumption"
 msgstr ""
 
-#: inc/cridetail.class.php:1045
+#: inc/cridetail.class.php:1044
 msgid "Associate to a contract"
 msgstr ""
 
-#: inc/cridetail.class.php:1049
+#: inc/cridetail.class.php:1048
 msgid "With contrat"
 msgstr ""
 
-#: inc/cridetail.class.php:1164 inc/generatecri.class.php:1197
+#: inc/cridetail.class.php:1163 inc/generatecri.class.php:1222
 msgid "No active contracts"
 msgstr ""
 
@@ -1293,27 +1293,31 @@ msgstr ""
 msgid "Add this Task"
 msgstr ""
 
-#: inc/generatecri.class.php:636
+#: inc/generatecri.class.php:648
 msgid "Content, end and begin date are mandatory for a task !"
 msgstr ""
 
-#: inc/generatecri.class.php:638
+#: inc/generatecri.class.php:650
+msgid "Task category must be defined"
+msgstr ""
+
+#: inc/generatecri.class.php:652
 msgid "End date must be after the begin date !"
 msgstr ""
 
-#: inc/generatecri.class.php:670
+#: inc/generatecri.class.php:685
 msgid "Description"
 msgstr ""
 
-#: inc/generatecri.class.php:671
+#: inc/generatecri.class.php:686
 msgid "Technician as assigned"
 msgstr ""
 
-#: inc/generatecri.class.php:731
+#: inc/generatecri.class.php:747
 msgid "Non-accomplished tasks informations"
 msgstr ""
 
-#: inc/generatecri.class.php:771
+#: inc/generatecri.class.php:787
 msgctxt "button"
 msgid "Generate"
 msgstr ""