@@ -149,7 +149,7 @@ |
||
| 149 | 149 | $sql .= " AND cp.statut = ".Holiday::STATUS_APPROVED; |
| 150 | 150 | $sql .= " AND ("; |
| 151 | 151 | $sql .= " (date_format(cp.date_debut, '%Y-%m') = '".$db->escape($year_month)."' OR date_format(cp.date_fin, '%Y-%m') = '".$db->escape($year_month)."')"; |
| 152 | -$sql .= " OR"; // For leave over several months |
|
| 152 | +$sql .= " OR"; // For leave over several months |
|
| 153 | 153 | $sql .= " (date_format(cp.date_debut, '%Y-%m') < '".$db->escape($year_month)."' AND date_format(cp.date_fin, '%Y-%m') > '".$db->escape($year_month)."') "; |
| 154 | 154 | $sql .= " )"; |
| 155 | 155 | if (!empty($search_ref)) { |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | */ |
| 77 | 77 | public function getExample() |
| 78 | 78 | { |
| 79 | - return $this->prefix.'0-0501-0001'; // TC0-0501-0001 |
|
| 79 | + return $this->prefix.'0-0501-0001'; // TC0-0501-0001 |
|
| 80 | 80 | } |
| 81 | 81 | |
| 82 | 82 | /** |
@@ -92,10 +92,10 @@ discard block |
||
| 92 | 92 | $pryymm = ''; |
| 93 | 93 | $max = ''; |
| 94 | 94 | |
| 95 | - $pos_source = 0; // POS source = Terminal ID |
|
| 95 | + $pos_source = 0; // POS source = Terminal ID |
|
| 96 | 96 | |
| 97 | 97 | // First, we get the max value |
| 98 | - $posindice = strlen($this->prefix.$pos_source.'-____-') + 1; // So posindice is position after TCX-YYMM- |
|
| 98 | + $posindice = strlen($this->prefix.$pos_source.'-____-') + 1; // So posindice is position after TCX-YYMM- |
|
| 99 | 99 | |
| 100 | 100 | $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; |
| 101 | 101 | $sql .= " FROM ".MAIN_DB_PREFIX."facture"; |
@@ -135,10 +135,10 @@ discard block |
||
| 135 | 135 | { |
| 136 | 136 | global $db; |
| 137 | 137 | |
| 138 | - $pos_source = is_object($invoice) && $invoice->pos_source > 0 ? $invoice->pos_source : 0; // POS source = Terminal ID |
|
| 138 | + $pos_source = is_object($invoice) && $invoice->pos_source > 0 ? $invoice->pos_source : 0; // POS source = Terminal ID |
|
| 139 | 139 | |
| 140 | 140 | // First, we get the max value |
| 141 | - $posindice = strlen($this->prefix.$pos_source.'-____-') + 1; // So posindice is position after TCX-YYMM- |
|
| 141 | + $posindice = strlen($this->prefix.$pos_source.'-____-') + 1; // So posindice is position after TCX-YYMM- |
|
| 142 | 142 | $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL |
| 143 | 143 | $sql .= " FROM ".MAIN_DB_PREFIX."facture"; |
| 144 | 144 | $sql .= " WHERE ref LIKE '".$db->escape($this->prefix.$pos_source."-____-%")."'"; |
@@ -80,7 +80,7 @@ |
||
| 80 | 80 | } else { |
| 81 | 81 | dol_print_error($db); |
| 82 | 82 | } |
| 83 | - dol_setcache($cachekey, $nbProject, 120); // If setting cache fails, this is not a problem, so we do not test result. |
|
| 83 | + dol_setcache($cachekey, $nbProject, 120); // If setting cache fails, this is not a problem, so we do not test result. |
|
| 84 | 84 | } |
| 85 | 85 | $head[$tab][0] = DOL_URL_ROOT.'/contact/project.php?id='.$object->id; |
| 86 | 86 | $head[$tab][1] = $langs->trans("Projects"); |
@@ -235,7 +235,7 @@ |
||
| 235 | 235 | $this->dateh = $this->db->jdate($obj->dateh); |
| 236 | 236 | $this->datef = $this->db->jdate($obj->datef); |
| 237 | 237 | $this->amount = $obj->subscription; |
| 238 | - $this->note = $obj->note_public; // deprecated |
|
| 238 | + $this->note = $obj->note_public; // deprecated |
|
| 239 | 239 | $this->note_public = $obj->note_public; |
| 240 | 240 | $this->fk_bank = $obj->fk_bank; |
| 241 | 241 | return 1; |
@@ -421,7 +421,7 @@ |
||
| 421 | 421 | $allowupgrade = true; |
| 422 | 422 | } |
| 423 | 423 | |
| 424 | - $dir = DOL_DOCUMENT_ROOT."/install/mysql/migration/"; // We use mysql migration scripts whatever is database driver |
|
| 424 | + $dir = DOL_DOCUMENT_ROOT."/install/mysql/migration/"; // We use mysql migration scripts whatever is database driver |
|
| 425 | 425 | dolibarr_install_syslog("Scan sql files for migration files in ".$dir); |
| 426 | 426 | |
| 427 | 427 | // Get files list of migration file x.y.z-a.b.c.sql into /install/mysql/migration |
@@ -41,7 +41,7 @@ |
||
| 41 | 41 | |
| 42 | 42 | $action = GETPOST('action', 'aZ09'); |
| 43 | 43 | $value = GETPOST('value', 'alpha'); |
| 44 | -$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
| 44 | +$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php |
|
| 45 | 45 | |
| 46 | 46 | |
| 47 | 47 | /* |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | |
| 92 | 92 | // Object card |
| 93 | 93 | // ------------------------------------------------------------ |
| 94 | - $linkback = '<a href="' . DOL_URL_ROOT . '/asset/list.php?restore_lastsearch_values=1' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>'; |
|
| 94 | + $linkback = '<a href="'.DOL_URL_ROOT.'/asset/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>'; |
|
| 95 | 95 | |
| 96 | 96 | $morehtmlref = '<div class="refidno">'; |
| 97 | 97 | $morehtmlref .= '</div>'; |
@@ -105,7 +105,7 @@ discard block |
||
| 105 | 105 | |
| 106 | 106 | |
| 107 | 107 | $cssclass = "titlefield"; |
| 108 | - include DOL_DOCUMENT_ROOT . '/core/tpl/notes.tpl.php'; |
|
| 108 | + include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php'; |
|
| 109 | 109 | |
| 110 | 110 | print '</div>'; |
| 111 | 111 | |
@@ -91,7 +91,7 @@ |
||
| 91 | 91 | |
| 92 | 92 | // Object card |
| 93 | 93 | // ------------------------------------------------------------ |
| 94 | - $linkback = '<a href="' . DOL_URL_ROOT . '/asset/list.php?restore_lastsearch_values=1' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>'; |
|
| 94 | + $linkback = '<a href="'.DOL_URL_ROOT.'/asset/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>'; |
|
| 95 | 95 | |
| 96 | 96 | $morehtmlref = '<div class="refidno">'; |
| 97 | 97 | $morehtmlref .= '</div>'; |
@@ -221,7 +221,7 @@ |
||
| 221 | 221 | } |
| 222 | 222 | }); |
| 223 | 223 | </script> |
| 224 | -SCRIPT; |
|
| 224 | +script; |
|
| 225 | 225 | } |
| 226 | 226 | |
| 227 | 227 | ?> |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | } |
| 58 | 58 | |
| 59 | 59 | if (!isset($formadmin) || !is_object($formadmin)) { |
| 60 | - require_once DOL_DOCUMENT_ROOT . '/core/class/html.formadmin.class.php'; |
|
| 60 | + require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php'; |
|
| 61 | 61 | $formadmin = new FormAdmin($db); |
| 62 | 62 | } |
| 63 | 63 | |
@@ -91,14 +91,14 @@ discard block |
||
| 91 | 91 | 'mode_key' => $info[0], |
| 92 | 92 | 'field_key' => $info[1], |
| 93 | 93 | 'value' => $info[2], |
| 94 | - 'target' => 'block_' . $mode_key, |
|
| 94 | + 'target' => 'block_'.$mode_key, |
|
| 95 | 95 | ); |
| 96 | 96 | } |
| 97 | 97 | |
| 98 | 98 | $assetdepreciationoptions->setInfosForMode($mode_key, $class_type, true); |
| 99 | - $prefix_html_name = $mode_key . '_'; |
|
| 99 | + $prefix_html_name = $mode_key.'_'; |
|
| 100 | 100 | $width = ($mode_key == "economic") ? "width50p pull-left" : "width50p"; |
| 101 | - print '<table class="border '. $width .'" id="block_' . $mode_key . '">' . "\n"; |
|
| 101 | + print '<table class="border '.$width.'" id="block_'.$mode_key.'">'."\n"; |
|
| 102 | 102 | print '<tr><td class="info-box-title">'.$langs->trans($mode_info['label']).'</td></tr>'; |
| 103 | 103 | if ($mode_key == "economic") { |
| 104 | 104 | print '<hr>'; |
@@ -114,14 +114,14 @@ discard block |
||
| 114 | 114 | } |
| 115 | 115 | |
| 116 | 116 | |
| 117 | - $html_name = $prefix_html_name . $field_key; |
|
| 117 | + $html_name = $prefix_html_name.$field_key; |
|
| 118 | 118 | if (!empty($field_info['enabled_field'])) { |
| 119 | 119 | $info = explode(':', $field_info['enabled_field']); |
| 120 | 120 | $enabled_field_info[] = array( |
| 121 | 121 | 'mode_key' => $info[0], |
| 122 | 122 | 'field_key' => $info[1], |
| 123 | 123 | 'value' => $info[2], |
| 124 | - 'target' => 'field_' . $html_name, |
|
| 124 | + 'target' => 'field_'.$html_name, |
|
| 125 | 125 | ); |
| 126 | 126 | } |
| 127 | 127 | |
@@ -133,8 +133,8 @@ discard block |
||
| 133 | 133 | $more_class .= ' tdtop'; |
| 134 | 134 | } |
| 135 | 135 | |
| 136 | - print '<tr class="field_' . $html_name . '" id="field_' . $html_name . '"><td'; |
|
| 137 | - print ' class="' . $more_class . '">'; |
|
| 136 | + print '<tr class="field_'.$html_name.'" id="field_'.$html_name.'"><td'; |
|
| 137 | + print ' class="'.$more_class.'">'; |
|
| 138 | 138 | if (!empty($field_info['help'])) { |
| 139 | 139 | print $form->textwithpicto($langs->trans($field_info['label']), $langs->trans($field_info['help'])); |
| 140 | 140 | } else { |