@@ -399,7 +399,7 @@ |
||
399 | 399 | ?> |
400 | 400 | <div class="center login_main_message"> |
401 | 401 | <?php |
402 | - $message = $_SESSION['dol_loginmesg']; // By default this is an error message |
|
402 | + $message = $_SESSION['dol_loginmesg']; // By default this is an error message |
|
403 | 403 | if (preg_match('/<!-- warning -->/', $message)) { // if it contains this comment, this is a warning message |
404 | 404 | $message = str_replace('<!-- warning -->', '', $message); |
405 | 405 | print '<div class="warning" role="alert">'; |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | $result = $objecttmp->fetch($toselectid); |
186 | 186 | if ($result > 0) { |
187 | 187 | $listofselectedid[$toselectid] = $toselectid; |
188 | - $thirdpartyid = ($objecttmp->fk_soc ? $objecttmp->fk_soc : $objecttmp->socid); // For proposal, order, invoice, conferenceorbooth, ... |
|
188 | + $thirdpartyid = ($objecttmp->fk_soc ? $objecttmp->fk_soc : $objecttmp->socid); // For proposal, order, invoice, conferenceorbooth, ... |
|
189 | 189 | if (in_array($objecttmp->element, array('societe', 'conferenceorboothattendee'))) { |
190 | 190 | $thirdpartyid = $objecttmp->id; |
191 | 191 | } elseif ($objecttmp->element == 'contact') { |
@@ -266,7 +266,7 @@ discard block |
||
266 | 266 | $formmail->withfile = 0; |
267 | 267 | $formmail->withmaindocfile = 0; // Add a checkbox "Attach also main document" |
268 | 268 | } else { |
269 | - $formmail->withfile = 1; // $formmail->withfile = 2 to allow to upload files is not yet supported in mass action |
|
269 | + $formmail->withfile = 1; // $formmail->withfile = 2 to allow to upload files is not yet supported in mass action |
|
270 | 270 | // Add a checkbox "Attach also main document" |
271 | 271 | if (isset($withmaindocfilemail)) { |
272 | 272 | $formmail->withmaindocfile = $withmaindocfilemail; |
@@ -303,7 +303,7 @@ discard block |
||
303 | 303 | |
304 | 304 | // Tableau des parameters complementaires du post |
305 | 305 | $formmail->param['action'] = $action; |
306 | - $formmail->param['models'] = $modelmail; // the filter to know which kind of template emails to show. 'none' means no template suggested. |
|
306 | + $formmail->param['models'] = $modelmail; // the filter to know which kind of template emails to show. 'none' means no template suggested. |
|
307 | 307 | $formmail->param['models_id'] = GETPOSTINT('modelmailselected') ? GETPOSTINT('modelmailselected') : '-1'; |
308 | 308 | $formmail->param['id'] = implode(',', $arrayofselected); |
309 | 309 | // $formmail->param['returnurl']=$_SERVER['PHP_SELF'].'?id='.$object->id; |
@@ -57,7 +57,7 @@ |
||
57 | 57 | $mode_search = 2; // Search on a foreign key int |
58 | 58 | } |
59 | 59 | if (in_array($typ, array('sellist')) && !is_numeric($crit)) { |
60 | - $mode_search = 0;// Search on a foreign key string |
|
60 | + $mode_search = 0; // Search on a foreign key string |
|
61 | 61 | } |
62 | 62 | if (in_array($typ, array('chkbxlst', 'checkbox', 'select'))) { |
63 | 63 | $mode_search = 4; // Search on a multiselect field with sql type = text |
@@ -45,7 +45,7 @@ |
||
45 | 45 | $valuetoshow = $extrafields->showOutputField($key, $value, '', $extrafieldsobjectkey); |
46 | 46 | $title = dol_string_nohtmltag($valuetoshow); |
47 | 47 | |
48 | - print '<td' . ($cssclass ? ' class="' . $cssclass . '"' : ''); // TODO Add 'css' and 'cssview' and 'csslist' for extrafields and use here 'csslist' |
|
48 | + print '<td' . ($cssclass ? ' class="' . $cssclass . '"' : ''); // TODO Add 'css' and 'cssview' and 'csslist' for extrafields and use here 'csslist' |
|
49 | 49 | print ' data-key="' . $extrafieldsobjectkey . '.' . $key . '"'; |
50 | 50 | print($title ? ' title="' . dol_escape_htmltag($title) . '"' : ''); |
51 | 51 | print '>'; |
@@ -198,7 +198,7 @@ |
||
198 | 198 | // we need to fetch product associated to line for some test |
199 | 199 | if ($object->element == 'propal' || $object->element == 'order' || $object->element == 'facture' || $object->element == 'propal_supplier' || $object->element == 'supplier_proposal' || $object->element == 'commande') { |
200 | 200 | $res = $line->fetch_product(); |
201 | - if ($res > 0) { |
|
201 | + if ($res > 0) { |
|
202 | 202 | if ($line->product->isService() && $line->product->isMandatoryPeriod()) { |
203 | 203 | print '<div><span class="clearboth nowraponall warning">' . $langs->trans("mandatoryPeriodNeedTobeSet") . '</span></div>'; |
204 | 204 | } |
@@ -398,7 +398,7 @@ |
||
398 | 398 | $object->actionmsg = $message; // Long text |
399 | 399 | $object->actionmsg2 = $actionmsg2; // Short text ($langs->transnoentities('MailSentBy')...); |
400 | 400 | if (getDolGlobalString('MAIN_MAIL_REPLACE_EVENT_TITLE_BY_EMAIL_SUBJECT')) { |
401 | - $object->actionmsg2 = $subject; // Short text |
|
401 | + $object->actionmsg2 = $subject; // Short text |
|
402 | 402 | } |
403 | 403 | |
404 | 404 | $object->trackid = $trackid; |
@@ -112,7 +112,7 @@ |
||
112 | 112 | } |
113 | 113 | |
114 | 114 | |
115 | - $line = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
115 | + $line = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
116 | 116 | $this->info_box_contents[$line][] = array( |
117 | 117 | 'td' => 'class=""', |
118 | 118 | 'text' => $langs->trans("Year"), |
@@ -85,7 +85,7 @@ |
||
85 | 85 | $sql .= " WHERE u.entity IN (" . getEntity('adherent') . ")"; |
86 | 86 | $sql .= " AND u.statut = " . Adherent::STATUS_VALIDATED; |
87 | 87 | $sql .= dolSqlDateFilter('u.birth', 0, $tmparray['mon'], 0); |
88 | - $sql .= " ORDER BY daya ASC"; // We want to have date of the month sorted by the day without taking into consideration the year |
|
88 | + $sql .= " ORDER BY daya ASC"; // We want to have date of the month sorted by the day without taking into consideration the year |
|
89 | 89 | $sql .= $this->db->plimit($max, 0); |
90 | 90 | |
91 | 91 | dol_syslog(get_class($this) . "::loadBox", LOG_DEBUG); |
@@ -94,7 +94,7 @@ |
||
94 | 94 | $sql .= " AND u.statut = " . User::STATUS_ENABLED; |
95 | 95 | $sql .= dolSqlDateFilter('u.dateemployment', 0, $tmparray['mon'], 0); |
96 | 96 | $sql .= " AND u.dateemployment < '" . $this->db->idate(dol_get_first_day($tmparray['year'])) . "'"; |
97 | - $sql .= " ORDER BY daya ASC"; // We want to have date of the month sorted by the day without taking into consideration the year |
|
97 | + $sql .= " ORDER BY daya ASC"; // We want to have date of the month sorted by the day without taking into consideration the year |
|
98 | 98 | $sql .= $this->db->plimit($max, 0); |
99 | 99 | |
100 | 100 | dol_syslog(get_class($this) . "::loadBox", LOG_DEBUG); |