Completed
Push — master ( f63f4b...0cae82 )
by Laurent
01:38
created
readFlights.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
     print '<td class="liste_titre" colspan="2">' . $langs->trans("Type 2 : Baptême") . '</td>';
156 156
     print '<td class="liste_titre" colspan="2">' . $langs->trans("Organisateur (T1/T2)") . '</td>';
157 157
     print '<td class="liste_titre" colspan="2">' . $langs->trans("Instructeur (orga T6)") . '</td>';
158
-    print '<td class="liste_titre" >'            . $langs->trans("Total bonus") . '</td>';
158
+    print '<td class="liste_titre" >' . $langs->trans("Total bonus") . '</td>';
159 159
     print '<td class="liste_titre" colspan="2">' . $langs->trans("Type 3 : Privé") . '</td>';
160 160
     print '<td class="liste_titre" colspan="2">' . $langs->trans("Type 4: Meeting") . '</td>';
161 161
     print '<td class="liste_titre" colspan="1">' . $langs->trans("Type 5: Chambley") . '</td>';
@@ -259,7 +259,7 @@  discard block
 block discarded – undo
259 259
     print "<tr>";
260 260
     print "<td colspan='20'></td>";
261 261
     print "<td>Total à reçevoir</td>";
262
-    print "<td>".price($total)."€</td>";
262
+    print "<td>" . price($total) . "€</td>";
263 263
     print "</tr>";
264 264
 
265 265
     print '</tbody>';
Please login to merge, or discard this patch.
card.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
 
67 67
 $isAllowedEdit = ($user->rights->flightlog->vol->edit || ($user->rights->flightlog->vol->add && $object->fk_pilot == $user->id));
68 68
 $isAllowedDelete = ($user->rights->flightlog->vol->delete || ($user->rights->flightlog->vol->add && $object->fk_pilot == $user->id && !$object->is_facture));
69
-$permissiondellink=$user->rights->flightlog->vol->financial;
69
+$permissiondellink = $user->rights->flightlog->vol->financial;
70 70
 
71 71
 $search_idBBC_vols = GETPOST('search_idBBC_vols', 'int');
72 72
 $search_lieuD = GETPOST('search_lieuD', 'alpha');
@@ -113,8 +113,8 @@  discard block
 block discarded – undo
113 113
 $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
114 114
 
115 115
 // Load object
116
-include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php';  // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
117
-include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';
116
+include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
117
+include DOL_DOCUMENT_ROOT . '/core/actions_dellink.inc.php';
118 118
 
119 119
 // Initialize technical object to manage hooks of modules. Note that conf->hooks_modules contains array array
120 120
 $hookmanager->initHooks(array('bbcvols'));
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
 
140 140
 $parameters = array();
141 141
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object,
142
-    $action);    // Note that $action and $object may have been modified by some hooks
142
+    $action); // Note that $action and $object may have been modified by some hooks
143 143
 if ($reshook < 0) {
144 144
     setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
145 145
 }
@@ -197,7 +197,7 @@  discard block
 block discarded – undo
197 197
                 header("Location: " . $urltogo);
198 198
                 exit;
199 199
             }
200
-            else{
200
+            else {
201 201
                 // Creation KO
202 202
                 if (!empty($object->errors)) {
203 203
                     setEventMessages(null, $object->errors, 'errors');
@@ -481,7 +481,7 @@  discard block
 block discarded – undo
481 481
     print '<div class="tabsAction">' . "\n";
482 482
     $parameters = array();
483 483
     $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object,
484
-        $action);    // Note that $action and $object may have been modified by hook
484
+        $action); // Note that $action and $object may have been modified by hook
485 485
     if ($reshook < 0) {
486 486
         setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
487 487
     }
@@ -494,13 +494,13 @@  discard block
 block discarded – undo
494 494
         print '<div class="inline-block divButAction"><a class="butActionDelete" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=delete">' . $langs->trans('Delete') . '</a></div>' . "\n";
495 495
     }
496 496
 
497
-    if($user->rights->flightlog->vol->financial && $object->fk_type == 2 && !$object->hasFacture()){
498
-        print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/flightlog/facture.php?id=' . $object->id.'">' . $langs->trans("Facturer") . '</a></div>' . "\n";
497
+    if ($user->rights->flightlog->vol->financial && $object->fk_type == 2 && !$object->hasFacture()) {
498
+        print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/flightlog/facture.php?id=' . $object->id . '">' . $langs->trans("Facturer") . '</a></div>' . "\n";
499 499
     }
500 500
 
501 501
     print '</div>' . "\n";
502 502
 
503
-    if($user->rights->flightlog->vol->financial){
503
+    if ($user->rights->flightlog->vol->financial) {
504 504
         print '<div class="fichecenter"><div class="fichehalfleft">';
505 505
         $form->showLinkedObjectBlock($object);
506 506
         print '</div></div>';
Please login to merge, or discard this patch.
core/triggers/interface_50001_modFlightLog_mailOnIncident.class.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
  */
17 17
 
18 18
 
19
-require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
19
+require_once DOL_DOCUMENT_ROOT . '/core/triggers/dolibarrtriggers.class.php';
20 20
 dol_include_once('/flightlog/class/bbcvols.class.php');
21 21
 dol_include_once('/core/class/CMailFile.class.php');
22 22
 
@@ -78,23 +78,23 @@  discard block
 block discarded – undo
78 78
 	 */
79 79
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
80 80
 	{
81
-        if (empty($conf->flightlog->enabled) || empty($conf->workflow->enabled)){
81
+        if (empty($conf->flightlog->enabled) || empty($conf->workflow->enabled)) {
82 82
             return 0;
83 83
         }
84 84
 
85
-        if(empty($conf->global->WORKFLOW_BBC_FLIGHTLOG_SEND_MAIL_ON_INCIDENT)){
85
+        if (empty($conf->global->WORKFLOW_BBC_FLIGHTLOG_SEND_MAIL_ON_INCIDENT)) {
86 86
             return 0;
87 87
         }
88 88
 
89
-        if($action !== 'BBC_FLIGHT_LOG_ADD_FLIGHT'){
89
+        if ($action !== 'BBC_FLIGHT_LOG_ADD_FLIGHT') {
90 90
             return 0;
91 91
         }
92 92
 
93
-        if(empty(trim($object->incidents)) && empty(trim($object->remarque))){
93
+        if (empty(trim($object->incidents)) && empty(trim($object->remarque))) {
94 94
             return 0;
95 95
         }
96 96
 
97
-        if(!empty($conf->global->MAIN_DISABLE_ALL_MAILS)){
97
+        if (!empty($conf->global->MAIN_DISABLE_ALL_MAILS)) {
98 98
             return 0;
99 99
         }
100 100
 
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
         );
128 128
 
129 129
 
130
-        if (! $mailfile->sendfile())
130
+        if (!$mailfile->sendfile())
131 131
         {
132 132
             dol_syslog("Error while sending mail in flight log module : incident", LOG_ERR);
133 133
         }
Please login to merge, or discard this patch.
class/bbcvols.class.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -885,7 +885,7 @@  discard block
 block discarded – undo
885 885
     /**
886 886
      * @return boolean 
887 887
      */
888
-    public function hasFacture(){
888
+    public function hasFacture() {
889 889
         return count($this->linkedObjectsIds) > 0;
890 890
     }
891 891
 
@@ -918,7 +918,7 @@  discard block
 block discarded – undo
918 918
      */
919 919
     public function getBalloon()
920 920
     {
921
-        if(!$this->balloon){
921
+        if (!$this->balloon) {
922 922
             $this->balloon = $this->fetchBalloon();
923 923
         }
924 924
 
@@ -930,7 +930,7 @@  discard block
 block discarded – undo
930 930
      */
931 931
     public function getPilot()
932 932
     {
933
-        if(!$this->pilot){
933
+        if (!$this->pilot) {
934 934
             $this->pilot = $this->fetchUser($this->fk_pilot);
935 935
         }
936 936
 
Please login to merge, or discard this patch.