@@ -107,7 +107,7 @@ |
||
| 107 | 107 | $out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>'; |
| 108 | 108 | } else { |
| 109 | 109 | $disabled = 0; |
| 110 | - if (!$obj->fk_statut > 0 && ! $draftonly) { |
|
| 110 | + if (!$obj->fk_statut > 0 && !$draftonly) { |
|
| 111 | 111 | $disabled = 1; |
| 112 | 112 | $labeltoshow .= ' ('.$langs->trans("Draft").')'; |
| 113 | 113 | } |
@@ -81,7 +81,9 @@ discard block |
||
| 81 | 81 | $sql .= " AND f.fk_soc = ".((int) $socid); |
| 82 | 82 | } |
| 83 | 83 | } |
| 84 | - if ($draftonly) $sql .= " AND f.fk_statut = 0"; |
|
| 84 | + if ($draftonly) { |
|
| 85 | + $sql .= " AND f.fk_statut = 0"; |
|
| 86 | + } |
|
| 85 | 87 | |
| 86 | 88 | dol_syslog(get_class($this)."::select_intervention", LOG_DEBUG); |
| 87 | 89 | $resql = $this->db->query($sql); |
@@ -89,8 +91,11 @@ discard block |
||
| 89 | 91 | $out .= '<select id="interventionid" class="flat" name="'.dol_escape_htmltag($htmlname).'">'; |
| 90 | 92 | if ($showempty) { |
| 91 | 93 | $out .= '<option value="0">'; |
| 92 | - if (!is_numeric($showempty)) $out .= $showempty; |
|
| 93 | - else $out .= ' '; |
|
| 94 | + if (!is_numeric($showempty)) { |
|
| 95 | + $out .= $showempty; |
|
| 96 | + } else { |
|
| 97 | + $out .= ' '; |
|
| 98 | + } |
|
| 94 | 99 | $out .= '</option>'; |
| 95 | 100 | } |
| 96 | 101 | $num = $this->db->num_rows($resql); |
@@ -136,7 +136,7 @@ |
||
| 136 | 136 | $dataseries = dol_sort_array($dataseries, 1, 'desc'); |
| 137 | 137 | |
| 138 | 138 | // Merge all entrie after the $KEEPNFIRST one into one entry called "Other..." (to avoid to have too much entries in graphic). |
| 139 | -$KEEPNFIRST = 7; // Keep first $KEEPNFIRST one + 1 with the remain |
|
| 139 | +$KEEPNFIRST = 7; // Keep first $KEEPNFIRST one + 1 with the remain |
|
| 140 | 140 | $i = 0; |
| 141 | 141 | if (count($dataseries) > ($KEEPNFIRST + 1)) { |
| 142 | 142 | foreach ($dataseries as $key => $val) { |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | $sql .= " AND entity = ".$conf->entity; |
| 92 | 92 | |
| 93 | 93 | $resql = $db->query($sql); |
| 94 | - if ($resql) { |
|
| 94 | + if ($resql) { |
|
| 95 | 95 | $obj = $db->fetch_object($resql); |
| 96 | 96 | if ($obj) { |
| 97 | 97 | $max = intval($obj->max); |
@@ -127,7 +127,7 @@ discard block |
||
| 127 | 127 | $sql .= " AND entity = ".$conf->entity; |
| 128 | 128 | |
| 129 | 129 | $resql = $db->query($sql); |
| 130 | - if ($resql) { |
|
| 130 | + if ($resql) { |
|
| 131 | 131 | $obj = $db->fetch_object($resql); |
| 132 | 132 | if ($obj) { |
| 133 | 133 | $max = intval($obj->max); |
@@ -143,8 +143,13 @@ |
||
| 143 | 143 | $date = dol_now(); |
| 144 | 144 | $yymm = strftime("%y%m", $date); |
| 145 | 145 | |
| 146 | - if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is |
|
| 147 | - else $num = sprintf("%04s", $max + 1); |
|
| 146 | + if ($max >= (pow(10, 4) - 1)) { |
|
| 147 | + $num = $max + 1; |
|
| 148 | + } |
|
| 149 | + // If counter > 9999, we do not format on 4 chars, we take number as it is |
|
| 150 | + else { |
|
| 151 | + $num = sprintf("%04s", $max + 1); |
|
| 152 | + } |
|
| 148 | 153 | |
| 149 | 154 | dol_syslog("mod_sn_standard::getNextValue return ".$this->prefix.$yymm."-".$num); |
| 150 | 155 | return $this->prefix.$yymm."-".$num; |
@@ -127,7 +127,7 @@ |
||
| 127 | 127 | $sql .= " AND entity = ".$conf->entity; |
| 128 | 128 | |
| 129 | 129 | $resql = $db->query($sql); |
| 130 | - if ($resql) { |
|
| 130 | + if ($resql) { |
|
| 131 | 131 | $obj = $db->fetch_object($resql); |
| 132 | 132 | if ($obj) { |
| 133 | 133 | $max = intval($obj->max); |
@@ -143,8 +143,13 @@ |
||
| 143 | 143 | $date = dol_now(); |
| 144 | 144 | $yymm = strftime("%y%m", $date); |
| 145 | 145 | |
| 146 | - if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is |
|
| 147 | - else $num = sprintf("%04s", $max + 1); |
|
| 146 | + if ($max >= (pow(10, 4) - 1)) { |
|
| 147 | + $num = $max + 1; |
|
| 148 | + } |
|
| 149 | + // If counter > 9999, we do not format on 4 chars, we take number as it is |
|
| 150 | + else { |
|
| 151 | + $num = sprintf("%04s", $max + 1); |
|
| 152 | + } |
|
| 148 | 153 | |
| 149 | 154 | dol_syslog("mod_lot_standard::getNextValue return ".$this->prefix.$yymm."-".$num); |
| 150 | 155 | return $this->prefix.$yymm."-".$num; |
@@ -221,7 +221,7 @@ |
||
| 221 | 221 | |
| 222 | 222 | if (!$notrigger) { |
| 223 | 223 | // Call triggers |
| 224 | - $result=$this->call_trigger('LINERECEPTION_CREATE', $user); |
|
| 224 | + $result = $this->call_trigger('LINERECEPTION_CREATE', $user); |
|
| 225 | 225 | if ($result < 0) { |
| 226 | 226 | $error++; |
| 227 | 227 | } |
@@ -51,7 +51,9 @@ |
||
| 51 | 51 | $object->fetch($id); |
| 52 | 52 | $object->fetch_thirdparty(); |
| 53 | 53 | $result = $object->add_object_linked($addlink, $objecttmp->id); |
| 54 | - if (isset($_POST['reftolinkto'])) unset($_POST['reftolinkto']); |
|
| 54 | + if (isset($_POST['reftolinkto'])) { |
|
| 55 | + unset($_POST['reftolinkto']); |
|
| 56 | + } |
|
| 55 | 57 | } elseif ($ret < 0) { |
| 56 | 58 | setEventMessages($objecttmp->error, $objecttmp->errors, 'errors'); |
| 57 | 59 | } else { |
@@ -43,7 +43,7 @@ |
||
| 43 | 43 | if ($action == 'addlinkbyref' && !empty($permissiondellink) && !$cancellink && $id > 0 && !empty($addlinkref) && !empty($conf->global->MAIN_LINK_BY_REF_IN_LINKTO)) { |
| 44 | 44 | $element_prop = getElementProperties($addlink); |
| 45 | 45 | if (is_array($element_prop)) { |
| 46 | - dol_include_once('/' . $element_prop['classpath'] . '/' . $element_prop['classfile'] . '.class.php'); |
|
| 46 | + dol_include_once('/'.$element_prop['classpath'].'/'.$element_prop['classfile'].'.class.php'); |
|
| 47 | 47 | |
| 48 | 48 | $objecttmp = new $element_prop['classname']($db); |
| 49 | 49 | $ret = $objecttmp->fetch(0, $addlinkref); |
@@ -34,22 +34,22 @@ |
||
| 34 | 34 | $total = 0; |
| 35 | 35 | foreach ($linkedObjectBlock as $key => $objectlink) { |
| 36 | 36 | echo '<tr class="oddeven">'; |
| 37 | - echo '<td>' . $langs->trans(get_class($objectlink)) . '</td>'; |
|
| 37 | + echo '<td>'.$langs->trans(get_class($objectlink)).'</td>'; |
|
| 38 | 38 | echo '<td>'.$objectlink->getNomUrl(1).'</td>'; |
| 39 | 39 | echo '<td class="center">'; |
| 40 | - if (get_class($objectlink)=='ConferenceOrBooth') { |
|
| 40 | + if (get_class($objectlink) == 'ConferenceOrBooth') { |
|
| 41 | 41 | print dol_trunc($objectlink->label, 20); |
| 42 | 42 | } |
| 43 | 43 | print '</td>'; |
| 44 | 44 | echo '<td class="center">'; |
| 45 | - if (get_class($objectlink)=='ConferenceOrBoothAttendee') { |
|
| 45 | + if (get_class($objectlink) == 'ConferenceOrBoothAttendee') { |
|
| 46 | 46 | print dol_print_date($objectlink->date_subscription); |
| 47 | 47 | } else { |
| 48 | 48 | print dol_print_date($objectlink->datep); |
| 49 | 49 | } |
| 50 | 50 | print '</td>'; |
| 51 | 51 | echo '<td class="right">'; |
| 52 | - if (get_class($objectlink)=='ConferenceOrBoothAttendee') { |
|
| 52 | + if (get_class($objectlink) == 'ConferenceOrBoothAttendee') { |
|
| 53 | 53 | print price($objectlink->amount); |
| 54 | 54 | } |
| 55 | 55 | print '</td>'; |
@@ -102,8 +102,8 @@ |
||
| 102 | 102 | |
| 103 | 103 | |
| 104 | 104 | // List of targets fields |
| 105 | -$headerlinefields = array(); // Array of fields (label to show) |
|
| 106 | -$contentlinevalues = array(); // Array of example values |
|
| 105 | +$headerlinefields = array(); // Array of fields (label to show) |
|
| 106 | +$contentlinevalues = array(); // Array of example values |
|
| 107 | 107 | $i = 0; |
| 108 | 108 | foreach ($fieldstarget as $code => $label) { |
| 109 | 109 | $withoutstar = preg_replace('/\*/', '', $fieldstarget[$code]); |
@@ -170,7 +170,7 @@ |
||
| 170 | 170 | $sql = array(); |
| 171 | 171 | |
| 172 | 172 | // If already used, we add an entry to show we enable module |
| 173 | - require_once DOL_DOCUMENT_ROOT . '/blockedlog/class/blockedlog.class.php'; |
|
| 173 | + require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php'; |
|
| 174 | 174 | |
| 175 | 175 | $object = new stdClass(); |
| 176 | 176 | $object->id = 1; |