@@ -136,12 +136,12 @@ discard block |
||
| 136 | 136 | |
| 137 | 137 | //'t.entity'=>array('label'=>$langs->trans("Entity"), 'checked'=>1, 'enabled'=>(! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode))), |
| 138 | 138 | 't.datec' => array('label' => $langs->trans("DateCreationShort"), |
| 139 | - 'checked' => 0, |
|
| 140 | - 'position' => 500 |
|
| 139 | + 'checked' => 0, |
|
| 140 | + 'position' => 500 |
|
| 141 | 141 | ), |
| 142 | 142 | 't.tms' => array('label' => $langs->trans("DateModificationShort"), |
| 143 | - 'checked' => 0, |
|
| 144 | - 'position' => 500 |
|
| 143 | + 'checked' => 0, |
|
| 144 | + 'position' => 500 |
|
| 145 | 145 | ), |
| 146 | 146 | //'t.statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000), |
| 147 | 147 | ); |
@@ -149,9 +149,9 @@ discard block |
||
| 149 | 149 | if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) { |
| 150 | 150 | foreach ($extrafields->attribute_label as $key => $val) { |
| 151 | 151 | $arrayfields["ef." . $key] = array('label' => $extrafields->attribute_label[$key], |
| 152 | - 'checked' => $extrafields->attribute_list[$key], |
|
| 153 | - 'position' => $extrafields->attribute_pos[$key], |
|
| 154 | - 'enabled' => $extrafields->attribute_perms[$key] |
|
| 152 | + 'checked' => $extrafields->attribute_list[$key], |
|
| 153 | + 'position' => $extrafields->attribute_pos[$key], |
|
| 154 | + 'enabled' => $extrafields->attribute_perms[$key] |
|
| 155 | 155 | ); |
| 156 | 156 | } |
| 157 | 157 | } |
@@ -26,58 +26,58 @@ discard block |
||
| 26 | 26 | */ |
| 27 | 27 | class InterfaceMailOnIncident extends DolibarrTriggers |
| 28 | 28 | { |
| 29 | - /** |
|
| 30 | - * @var DoliDB Database handler |
|
| 31 | - */ |
|
| 32 | - protected $db; |
|
| 33 | - |
|
| 34 | - /** |
|
| 35 | - * Constructor |
|
| 36 | - * |
|
| 37 | - * @param DoliDB $db Database handler |
|
| 38 | - */ |
|
| 39 | - public function __construct($db) |
|
| 40 | - { |
|
| 41 | - $this->db = $db; |
|
| 42 | - |
|
| 43 | - $this->name = preg_replace('/^Interface/i', '', get_class($this)); |
|
| 44 | - $this->family = "Belgian balloon club"; |
|
| 45 | - $this->description = "Trigger that send an e-mail on flight incident."; |
|
| 46 | - $this->version = '1.0'; |
|
| 47 | - $this->picto = 'flightlog@flightlog'; |
|
| 48 | - } |
|
| 49 | - |
|
| 50 | - /** |
|
| 51 | - * Trigger name |
|
| 52 | - * |
|
| 53 | - * @return string Name of trigger file |
|
| 54 | - */ |
|
| 55 | - public function getName() |
|
| 56 | - { |
|
| 57 | - return $this->name; |
|
| 58 | - } |
|
| 59 | - |
|
| 60 | - /** |
|
| 61 | - * Trigger description |
|
| 62 | - * |
|
| 63 | - * @return string Description of trigger file |
|
| 64 | - */ |
|
| 65 | - public function getDesc() |
|
| 66 | - { |
|
| 67 | - return $this->description; |
|
| 68 | - } |
|
| 69 | - |
|
| 70 | - |
|
| 71 | - /** |
|
| 72 | - * @param string $action Event action code |
|
| 73 | - * @param Bbcvols $object Object |
|
| 74 | - * @param User $user Object user |
|
| 75 | - * @param Translate $langs Object langs |
|
| 76 | - * @param Conf $conf Object conf |
|
| 77 | - * @return int <0 if KO, 0 if no triggered ran, >0 if OK |
|
| 78 | - */ |
|
| 79 | - public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf) |
|
| 80 | - { |
|
| 29 | + /** |
|
| 30 | + * @var DoliDB Database handler |
|
| 31 | + */ |
|
| 32 | + protected $db; |
|
| 33 | + |
|
| 34 | + /** |
|
| 35 | + * Constructor |
|
| 36 | + * |
|
| 37 | + * @param DoliDB $db Database handler |
|
| 38 | + */ |
|
| 39 | + public function __construct($db) |
|
| 40 | + { |
|
| 41 | + $this->db = $db; |
|
| 42 | + |
|
| 43 | + $this->name = preg_replace('/^Interface/i', '', get_class($this)); |
|
| 44 | + $this->family = "Belgian balloon club"; |
|
| 45 | + $this->description = "Trigger that send an e-mail on flight incident."; |
|
| 46 | + $this->version = '1.0'; |
|
| 47 | + $this->picto = 'flightlog@flightlog'; |
|
| 48 | + } |
|
| 49 | + |
|
| 50 | + /** |
|
| 51 | + * Trigger name |
|
| 52 | + * |
|
| 53 | + * @return string Name of trigger file |
|
| 54 | + */ |
|
| 55 | + public function getName() |
|
| 56 | + { |
|
| 57 | + return $this->name; |
|
| 58 | + } |
|
| 59 | + |
|
| 60 | + /** |
|
| 61 | + * Trigger description |
|
| 62 | + * |
|
| 63 | + * @return string Description of trigger file |
|
| 64 | + */ |
|
| 65 | + public function getDesc() |
|
| 66 | + { |
|
| 67 | + return $this->description; |
|
| 68 | + } |
|
| 69 | + |
|
| 70 | + |
|
| 71 | + /** |
|
| 72 | + * @param string $action Event action code |
|
| 73 | + * @param Bbcvols $object Object |
|
| 74 | + * @param User $user Object user |
|
| 75 | + * @param Translate $langs Object langs |
|
| 76 | + * @param Conf $conf Object conf |
|
| 77 | + * @return int <0 if KO, 0 if no triggered ran, >0 if OK |
|
| 78 | + */ |
|
| 79 | + public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf) |
|
| 80 | + { |
|
| 81 | 81 | if (empty($conf->flightlog->enabled) || empty($conf->workflow->enabled)){ |
| 82 | 82 | return 0; |
| 83 | 83 | } |
@@ -132,6 +132,6 @@ discard block |
||
| 132 | 132 | dol_syslog("Error while sending mail in flight log module : incident", LOG_ERR); |
| 133 | 133 | } |
| 134 | 134 | |
| 135 | - return 0; |
|
| 136 | - } |
|
| 135 | + return 0; |
|
| 136 | + } |
|
| 137 | 137 | } |
@@ -262,7 +262,7 @@ |
||
| 262 | 262 | <td class="fieldrequired"><?php echo $langs->trans('Commande du vol')?></td> |
| 263 | 263 | <td class="js-order"> |
| 264 | 264 | <?php |
| 265 | - echo $html->selectarray('order_id',$commande->liste_array(2),$_POST['order_id'], 1,0,0,'',0,0,0,'','minwidth200',1); |
|
| 265 | + echo $html->selectarray('order_id',$commande->liste_array(2),$_POST['order_id'], 1,0,0,'',0,0,0,'','minwidth200',1); |
|
| 266 | 266 | ?> |
| 267 | 267 | </td> |
| 268 | 268 | </tr> |