@@ -155,7 +155,7 @@ discard block |
||
| 155 | 155 | if ($val['type'] == 'text' || $val['type'] == 'html') { |
| 156 | 156 | $rightpart .= ' tdtop'; |
| 157 | 157 | } |
| 158 | - $rightpart.= '">'; |
|
| 158 | + $rightpart .= '">'; |
|
| 159 | 159 | $labeltoshow = ''; |
| 160 | 160 | if (!empty($val['help'])) { |
| 161 | 161 | $labeltoshow .= $form->textwithpicto($langs->trans($val['label']), $langs->trans($val['help'])); |
@@ -195,7 +195,7 @@ discard block |
||
| 195 | 195 | $out = $object->showOutputField($val, $key, $value, '', '', '', 0); |
| 196 | 196 | $rightpart .= showValueWithClipboardCPButton($out, 0, $out); |
| 197 | 197 | } else { |
| 198 | - $rightpart.= $object->showOutputField($val, $key, $value, '', '', '', 0); |
|
| 198 | + $rightpart .= $object->showOutputField($val, $key, $value, '', '', '', 0); |
|
| 199 | 199 | } |
| 200 | 200 | } |
| 201 | 201 | if (preg_match('/^(text|html)/', $val['type'])) { |
@@ -150,9 +150,9 @@ |
||
| 150 | 150 | $productstatic->accountancy_code_buy_export = $objp->accountancy_code_buy_export; |
| 151 | 151 | $productstatic->date_modification = $datem; |
| 152 | 152 | |
| 153 | - $usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS')?$user->hasRight('product', 'product_advance', 'read_prices'):$user->hasRight('product', 'read'); |
|
| 153 | + $usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS') ? $user->hasRight('product', 'product_advance', 'read_prices') : $user->hasRight('product', 'read'); |
|
| 154 | 154 | if ($productstatic->isService()) { |
| 155 | - $usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS')?$user->hasRight('service', 'service_advance', 'read_prices'):$user->hasRight('service', 'read'); |
|
| 155 | + $usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS') ? $user->hasRight('service', 'service_advance', 'read_prices') : $user->hasRight('service', 'read'); |
|
| 156 | 156 | } |
| 157 | 157 | |
| 158 | 158 | $this->info_box_contents[$line][] = array( |
@@ -83,8 +83,8 @@ discard block |
||
| 83 | 83 | $badgeStatus7 = '#baa32b'; |
| 84 | 84 | $badgeStatus8 = '#993013'; |
| 85 | 85 | $badgeStatus9 = '#e7f0f0'; |
| 86 | - if (file_exists(DOL_DOCUMENT_ROOT . '/theme/' . $conf->theme . '/theme_vars.inc.php')) { |
|
| 87 | - include DOL_DOCUMENT_ROOT . '/theme/' . $conf->theme . '/theme_vars.inc.php'; |
|
| 86 | + if (file_exists(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php')) { |
|
| 87 | + include DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php'; |
|
| 88 | 88 | } |
| 89 | 89 | $this->max = $max; |
| 90 | 90 | |
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | $colorseriesstat = array(); |
| 102 | 102 | if ($user->hasRight('ticket', 'read')) { |
| 103 | 103 | $sql = "SELECT cts.rowid, cts.label, cts.code"; |
| 104 | - $sql .= " FROM " . MAIN_DB_PREFIX . "c_ticket_severity as cts"; |
|
| 104 | + $sql .= " FROM ".MAIN_DB_PREFIX."c_ticket_severity as cts"; |
|
| 105 | 105 | $sql .= " WHERE cts.active = 1"; |
| 106 | 106 | $sql .= $this->db->order('cts.rowid', 'ASC'); |
| 107 | 107 | $resql = $this->db->query($sql); |
@@ -138,7 +138,7 @@ discard block |
||
| 138 | 138 | $dataseries = array(); |
| 139 | 139 | $data = array(); |
| 140 | 140 | $sql = "SELECT t.severity_code, COUNT(t.severity_code) as nb"; |
| 141 | - $sql .= " FROM " . MAIN_DB_PREFIX . "ticket as t"; |
|
| 141 | + $sql .= " FROM ".MAIN_DB_PREFIX."ticket as t"; |
|
| 142 | 142 | $sql .= " WHERE t.fk_statut <> 8"; |
| 143 | 143 | $sql .= " GROUP BY t.severity_code"; |
| 144 | 144 | $resql = $this->db->query($sql); |
@@ -152,7 +152,7 @@ discard block |
||
| 152 | 152 | } |
| 153 | 153 | foreach ($listofoppcode as $rowid => $code) { |
| 154 | 154 | $dataseries[] = array( |
| 155 | - 'label' => $langs->getLabelFromKey($this->db, 'TicketSeverityShort' . $code, 'c_ticket_severity', 'code', 'label', $code), |
|
| 155 | + 'label' => $langs->getLabelFromKey($this->db, 'TicketSeverityShort'.$code, 'c_ticket_severity', 'code', 'label', $code), |
|
| 156 | 156 | 'data' => (empty($data[$code]) ? 0 : $data[$code]) |
| 157 | 157 | ); |
| 158 | 158 | } |
@@ -190,7 +190,7 @@ discard block |
||
| 190 | 190 | $stringtoprint .= $px1->show($totalnb ? 0 : 1); |
| 191 | 191 | } |
| 192 | 192 | $stringtoprint .= '</div>'; |
| 193 | - $this->info_box_contents[][]=array( |
|
| 193 | + $this->info_box_contents[][] = array( |
|
| 194 | 194 | 'td' => 'class="center"', |
| 195 | 195 | 'text' => $stringtoprint |
| 196 | 196 | ); |
@@ -756,10 +756,10 @@ |
||
| 756 | 756 | public function regexpsql($subject, $pattern, $sqlstring = false) |
| 757 | 757 | { |
| 758 | 758 | if ($sqlstring) { |
| 759 | - return "(". $subject ." ~ '" . $pattern . "')"; |
|
| 759 | + return "(".$subject." ~ '".$pattern."')"; |
|
| 760 | 760 | } |
| 761 | 761 | |
| 762 | - return "('". $subject ."' ~ '" . $pattern . "')"; |
|
| 762 | + return "('".$subject."' ~ '".$pattern."')"; |
|
| 763 | 763 | } |
| 764 | 764 | |
| 765 | 765 | |
@@ -132,7 +132,7 @@ discard block |
||
| 132 | 132 | if ($reshook > 0) { |
| 133 | 133 | $perm = $hookmanager->resArray['perm']; |
| 134 | 134 | } |
| 135 | - if (! $perm) { |
|
| 135 | + if (!$perm) { |
|
| 136 | 136 | // We should not be here. If we are not allowed to reorder rows, feature should not be visible on script. |
| 137 | 137 | // If we are here, it is a hack attempt, so we report a warning. |
| 138 | 138 | print 'Bad permission to modify position of lines for object in table '.$table_element_line; |
@@ -154,7 +154,7 @@ discard block |
||
| 154 | 154 | |
| 155 | 155 | // Reorder line to have position of children lines sharing same counter than parent lines |
| 156 | 156 | // This should be useless because there is no need to have children sharing same counter than parent, but well, it's cleaner into database. |
| 157 | - if (in_array($fk_element, array('fk_facture', 'fk_propal', 'fk_commande','fk_contrat'))) { |
|
| 157 | + if (in_array($fk_element, array('fk_facture', 'fk_propal', 'fk_commande', 'fk_contrat'))) { |
|
| 158 | 158 | $result = $row->line_order(true); |
| 159 | 159 | } |
| 160 | 160 | } else { |
@@ -38,11 +38,11 @@ discard block |
||
| 38 | 38 | $langs->load("products"); |
| 39 | 39 | |
| 40 | 40 | $label = $langs->trans('Product'); |
| 41 | - $usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS')?$user->hasRight('product', 'product_advance', 'read_prices'):$user->hasRight('product', 'read'); |
|
| 41 | + $usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS') ? $user->hasRight('product', 'product_advance', 'read_prices') : $user->hasRight('product', 'read'); |
|
| 42 | 42 | |
| 43 | 43 | if ($object->isService()) { |
| 44 | 44 | $label = $langs->trans('Service'); |
| 45 | - $usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS')?$user->hasRight('service', 'service_advance', 'read_prices'):$user->hasRight('service', 'read'); |
|
| 45 | + $usercancreadprice = getDolGlobalString('MAIN_USE_ADVANCED_PERMS') ? $user->hasRight('service', 'service_advance', 'read_prices') : $user->hasRight('service', 'read'); |
|
| 46 | 46 | } |
| 47 | 47 | |
| 48 | 48 | $h = 0; |
@@ -276,10 +276,10 @@ discard block |
||
| 276 | 276 | if (!empty($object->note_public)) { |
| 277 | 277 | $nbNote++; |
| 278 | 278 | } |
| 279 | - $head[$h][0] = DOL_URL_ROOT .'/product/stock/productlot_note.php?id=' . $object->id; |
|
| 279 | + $head[$h][0] = DOL_URL_ROOT.'/product/stock/productlot_note.php?id='.$object->id; |
|
| 280 | 280 | $head[$h][1] = $langs->trans('Notes'); |
| 281 | 281 | if ($nbNote > 0) { |
| 282 | - $head[$h][1] .= '<span class="badge marginleftonlyshort">' . $nbNote . '</span>'; |
|
| 282 | + $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>'; |
|
| 283 | 283 | } |
| 284 | 284 | $head[$h][2] = 'note'; |
| 285 | 285 | $h++; |
@@ -175,10 +175,10 @@ |
||
| 175 | 175 | $dispachedLines = $object->getDispachedLines(1); |
| 176 | 176 | $nbDispachedLines = count($dispachedLines); |
| 177 | 177 | |
| 178 | - for ($line = 0 ; $line < $nbDispachedLines; $line++) { |
|
| 178 | + for ($line = 0; $line < $nbDispachedLines; $line++) { |
|
| 179 | 179 | $sumQtyAllreadyDispatched = $sumQtyAllreadyDispatched + $dispachedLines[$line]['qty']; |
| 180 | 180 | } |
| 181 | - for ($line = 0 ; $line < $nbLinesOrdered; $line++) { |
|
| 181 | + for ($line = 0; $line < $nbLinesOrdered; $line++) { |
|
| 182 | 182 | //If line is a product of conf to manage stocks for services |
| 183 | 183 | if ($object->lines[$line]->product_type == 0 || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) { |
| 184 | 184 | $sumQtyOrdered = $sumQtyOrdered + $object->lines[$line]->qty; |
@@ -78,19 +78,19 @@ discard block |
||
| 78 | 78 | |
| 79 | 79 | $listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim(getDolGlobalString($keyforuploaddir)))); |
| 80 | 80 | foreach ($listofdir as $key => $tmpdir) { |
| 81 | - $tmpdir = preg_replace('/DOL_DATA_ROOT\/*/', '', $tmpdir); // Clean string if we found a hardcoded DOL_DATA_ROOT |
|
| 81 | + $tmpdir = preg_replace('/DOL_DATA_ROOT\/*/', '', $tmpdir); // Clean string if we found a hardcoded DOL_DATA_ROOT |
|
| 82 | 82 | if (!$tmpdir) { |
| 83 | 83 | unset($listofdir[$key]); |
| 84 | 84 | continue; |
| 85 | 85 | } |
| 86 | - $tmpdir = DOL_DATA_ROOT.'/'.$tmpdir; // Complete with DOL_DATA_ROOT. Only files into DOL_DATA_ROOT can be reach/set |
|
| 86 | + $tmpdir = DOL_DATA_ROOT.'/'.$tmpdir; // Complete with DOL_DATA_ROOT. Only files into DOL_DATA_ROOT can be reach/set |
|
| 87 | 87 | if (!is_dir($tmpdir)) { |
| 88 | 88 | if (empty($nomessageinsetmoduleoptions)) { |
| 89 | 89 | setEventMessages($langs->trans("ErrorDirNotFound", $tmpdir), null, 'warnings'); |
| 90 | 90 | } |
| 91 | 91 | } else { |
| 92 | 92 | $upload_dir = $tmpdir; |
| 93 | - break; // So we take the first directory found into setup $conf->global->$keyforuploaddir |
|
| 93 | + break; // So we take the first directory found into setup $conf->global->$keyforuploaddir |
|
| 94 | 94 | } |
| 95 | 95 | } |
| 96 | 96 | |
@@ -130,19 +130,19 @@ discard block |
||
| 130 | 130 | |
| 131 | 131 | foreach ($listofdir as $key => $tmpdir) { |
| 132 | 132 | $tmpdir = trim($tmpdir); |
| 133 | - $tmpdir = preg_replace('/DOL_DATA_ROOT\/*/', '', $tmpdir); // Clean string if we found a hardcoded DOL_DATA_ROOT |
|
| 133 | + $tmpdir = preg_replace('/DOL_DATA_ROOT\/*/', '', $tmpdir); // Clean string if we found a hardcoded DOL_DATA_ROOT |
|
| 134 | 134 | if (!$tmpdir) { |
| 135 | 135 | unset($listofdir[$key]); |
| 136 | 136 | continue; |
| 137 | 137 | } |
| 138 | - $tmpdir = DOL_DATA_ROOT.'/'.$tmpdir; // Complete with DOL_DATA_ROOT. Only files into DOL_DATA_ROOT can be reach/set |
|
| 138 | + $tmpdir = DOL_DATA_ROOT.'/'.$tmpdir; // Complete with DOL_DATA_ROOT. Only files into DOL_DATA_ROOT can be reach/set |
|
| 139 | 139 | if (!is_dir($tmpdir)) { |
| 140 | 140 | if (empty($nomessageinsetmoduleoptions)) { |
| 141 | 141 | setEventMessages($langs->trans("ErrorDirNotFound", $tmpdir), null, 'warnings'); |
| 142 | 142 | } |
| 143 | 143 | } else { |
| 144 | 144 | $upload_dir = $tmpdir; |
| 145 | - break; // So we take the first directory found into setup $conf->global->$keyforuploaddir |
|
| 145 | + break; // So we take the first directory found into setup $conf->global->$keyforuploaddir |
|
| 146 | 146 | } |
| 147 | 147 | } |
| 148 | 148 | |
@@ -429,7 +429,7 @@ |
||
| 429 | 429 | if ($mode == 'short_label') { |
| 430 | 430 | return dol_getIdFromCode($this->db, $code, 'c_units', 'short_label', 'rowid', 0, " AND unit_type = '".$this->db->escape($unit_type)."'"); |
| 431 | 431 | } elseif ($mode == 'code') { |
| 432 | - return dol_getIdFromCode($this->db, $code, 'c_units', 'code', 'rowid', 0, " AND unit_type = '". $this->db->escape($unit_type) ."'"); |
|
| 432 | + return dol_getIdFromCode($this->db, $code, 'c_units', 'code', 'rowid', 0, " AND unit_type = '".$this->db->escape($unit_type)."'"); |
|
| 433 | 433 | } |
| 434 | 434 | |
| 435 | 435 | return $code; |