@@ -496,7 +496,7 @@ |
||
496 | 496 | |
497 | 497 | // Imports profiles provided by this module |
498 | 498 | |
499 | - $r = 1; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
499 | + $r = 1; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
500 | 500 | /* BEGIN MODULEBUILDER IMPORT AVAILABILITIES */ |
501 | 501 | /* |
502 | 502 | $langs->load("agenda"); |
@@ -90,7 +90,7 @@ discard block |
||
90 | 90 | $this->db = $db; |
91 | 91 | $this->name = "vinci"; |
92 | 92 | $this->description = $langs->trans('DocumentModelStandardPDF'); |
93 | - $this->update_main_doc_field = 1; // Save the name of generated file as the main doc when generating a doc with this template |
|
93 | + $this->update_main_doc_field = 1; // Save the name of generated file as the main doc when generating a doc with this template |
|
94 | 94 | |
95 | 95 | // Page size for A4 format |
96 | 96 | $this->type = 'pdf'; |
@@ -519,7 +519,7 @@ discard block |
||
519 | 519 | if ($this->getColumnStatus('desc')) { |
520 | 520 | $pdf->startTransaction(); //description |
521 | 521 | $des = $prod -> description; |
522 | - $descr = $des;//implode("<br>", $des); |
|
522 | + $descr = $des; //implode("<br>", $des); |
|
523 | 523 | |
524 | 524 | $this->printStdColumnContent($pdf, $curY, 'desc', $descr); |
525 | 525 |
@@ -79,7 +79,7 @@ |
||
79 | 79 | |
80 | 80 | // Boxes |
81 | 81 | $this->boxes = array(); // List of boxes |
82 | - $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
82 | + $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
83 | 83 | |
84 | 84 | // Add here list of php file(s) stored in core/boxes that contains class to show a box. |
85 | 85 | // Example: |
@@ -118,7 +118,7 @@ |
||
118 | 118 | |
119 | 119 | // Main menu entries |
120 | 120 | $this->menu = array(); // List of menus to add |
121 | - $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
121 | + $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
122 | 122 | /* |
123 | 123 | $this->menu[$r]=array('fk_menu'=>0, |
124 | 124 | 'type'=>'top', |
@@ -153,7 +153,7 @@ |
||
153 | 153 | $res = $product->fetch($object->fk_product); |
154 | 154 | if ($res > 0 && !empty($product->batch_mask)) { |
155 | 155 | $mask = $product->batch_mask; |
156 | - $filter = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
156 | + $filter = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
157 | 157 | } |
158 | 158 | } |
159 | 159 |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | |
129 | 129 | // Array to add new pages in new tabs |
130 | 130 | $this->tabs = array(); |
131 | - $this->tabs[] = array('data' => 'user:+skill_tab:Skills:hrm:1:/hrm/skill_tab.php?id=__ID__&objecttype=user'); // To add a new tab identified by code tabname1 |
|
131 | + $this->tabs[] = array('data' => 'user:+skill_tab:Skills:hrm:1:/hrm/skill_tab.php?id=__ID__&objecttype=user'); // To add a new tab identified by code tabname1 |
|
132 | 132 | //$this->tabs[] = array('data'=>'job:+tabname1:Poste:mylangfile@hrm:1:/hrm/poste_list.php?fk_job=__ID__'); // To add a new tab identified by code tabname1 |
133 | 133 | // Example: |
134 | 134 | // $this->tabs[] = array('data'=>'objecttype:+tabname1:Title1:mylangfile@hrm:$user->rights->hrm->read:/hrm/mynewtab1.php?id=__ID__'); // To add a new tab identified by code tabname1 |
@@ -193,7 +193,7 @@ discard block |
||
193 | 193 | |
194 | 194 | // Permissions |
195 | 195 | $this->rights = array(); // Permission array used by this module |
196 | - $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
196 | + $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
197 | 197 | |
198 | 198 | // Skill / Job / Position |
199 | 199 | $this->rights[$r][0] = 4001; // Permission id (must not be already used) |
@@ -115,7 +115,7 @@ |
||
115 | 115 | $maxfilesizearray = getMaxFileSizeArray(); |
116 | 116 | $maxmin = $maxfilesizearray['maxmin']; |
117 | 117 | if ($maxmin > 0) { |
118 | - $s .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
118 | + $s .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
119 | 119 | } |
120 | 120 | $s .= '<input type="file" name="username" class="flat">'; |
121 | 121 | return $s; |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | */ |
120 | 120 | public function formFilter() |
121 | 121 | { |
122 | - global $conf,$langs; |
|
122 | + global $conf, $langs; |
|
123 | 123 | |
124 | 124 | // Load translation files required by the page |
125 | 125 | $langs->loadLangs(array("commercial", "companies", "suppliers", "categories")); |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | $sql = "SELECT sp.poste, count(distinct(sp.email)) AS nb"; |
131 | 131 | $sql .= " FROM " . MAIN_DB_PREFIX . "socpeople as sp"; |
132 | 132 | $sql .= " WHERE sp.entity IN (" . getEntity('contact') . ")"; |
133 | - $sql .= " AND sp.email <> ''"; // Note that null != '' is false |
|
133 | + $sql .= " AND sp.email <> ''"; // Note that null != '' is false |
|
134 | 134 | $sql .= " AND sp.statut = 1"; |
135 | 135 | $sql .= " AND (sp.poste IS NOT NULL AND sp.poste <> '')"; |
136 | 136 | $sql .= " GROUP BY sp.poste"; |
@@ -165,7 +165,7 @@ discard block |
||
165 | 165 | $sql .= " " . MAIN_DB_PREFIX . "categorie as c,"; |
166 | 166 | $sql .= " " . MAIN_DB_PREFIX . "categorie_contact as cs"; |
167 | 167 | $sql .= " WHERE sp.entity IN (" . getEntity('contact') . ")"; |
168 | - $sql .= " AND sp.email <> ''"; // Note that null != '' is false |
|
168 | + $sql .= " AND sp.email <> ''"; // Note that null != '' is false |
|
169 | 169 | $sql .= " AND sp.statut = 1"; |
170 | 170 | $sql .= " AND cs.fk_categorie = c.rowid"; |
171 | 171 | $sql .= " AND cs.fk_socpeople = sp.rowid"; |
@@ -239,7 +239,7 @@ discard block |
||
239 | 239 | $sql .= " " . MAIN_DB_PREFIX . "categorie as c,"; |
240 | 240 | $sql .= " " . MAIN_DB_PREFIX . "categorie_societe as cs"; |
241 | 241 | $sql .= " WHERE sp.entity IN (" . getEntity('contact') . ")"; |
242 | - $sql .= " AND sp.email <> ''"; // Note that null != '' is false |
|
242 | + $sql .= " AND sp.email <> ''"; // Note that null != '' is false |
|
243 | 243 | $sql .= " AND sp.statut = 1"; |
244 | 244 | $sql .= " AND cs.fk_categorie = c.rowid"; |
245 | 245 | $sql .= " AND cs.fk_soc = sp.fk_soc"; |
@@ -276,7 +276,7 @@ discard block |
||
276 | 276 | $sql .= " " . MAIN_DB_PREFIX . "categorie as c,"; |
277 | 277 | $sql .= " " . MAIN_DB_PREFIX . "categorie_fournisseur as cs"; |
278 | 278 | $sql .= " WHERE sp.entity IN (" . getEntity('contact') . ")"; |
279 | - $sql .= " AND sp.email <> ''"; // Note that null != '' is false |
|
279 | + $sql .= " AND sp.email <> ''"; // Note that null != '' is false |
|
280 | 280 | $sql .= " AND sp.statut = 1"; |
281 | 281 | $sql .= " AND cs.fk_categorie = c.rowid"; |
282 | 282 | $sql .= " AND cs.fk_soc = sp.fk_soc"; |
@@ -436,7 +436,7 @@ discard block |
||
436 | 436 | |
437 | 437 | // Filter on job position |
438 | 438 | $key = $filter_jobposition; |
439 | - if (!empty($key) && $key != 'all' && $key != '-1') { |
|
439 | + if (!empty($key) && $key != 'all' && $key != '-1') { |
|
440 | 440 | $sql .= " AND sp.poste = '" . $this->db->escape($key) . "'"; |
441 | 441 | } |
442 | 442 |
@@ -234,7 +234,7 @@ discard block |
||
234 | 234 | $num = $this->db->num_rows($resql); |
235 | 235 | |
236 | 236 | if (empty($conf->partnership->enabled)) { |
237 | - $num = 0; // Force empty list if category module is not enabled |
|
237 | + $num = 0; // Force empty list if category module is not enabled |
|
238 | 238 | } |
239 | 239 | |
240 | 240 | if ($num) { |
@@ -259,7 +259,7 @@ discard block |
||
259 | 259 | // filter_status_thirdparties |
260 | 260 | include_once DOL_DOCUMENT_ROOT . '/partnership/class/partnership.class.php'; |
261 | 261 | $tmppartnership = new Partnership($this->db); |
262 | - $dummy = $tmppartnership->getLibStatut(0); // We call this only to have $tmppartnership->labelStatus loaded |
|
262 | + $dummy = $tmppartnership->getLibStatut(0); // We call this only to have $tmppartnership->labelStatus loaded |
|
263 | 263 | |
264 | 264 | $s .= $form->selectarray('filter_status_partnership', $tmppartnership->labelStatus, GETPOST('filter_status_partnership'), $langs->trans("Status")); |
265 | 265 |