@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | |
104 | 104 | // Permissions |
105 | 105 | $this->rights = array(); // Permission array used by this module |
106 | - $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
106 | + $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
107 | 107 | |
108 | 108 | // Add here list of permission defined by an id, a label, a boolean and two constant strings. |
109 | 109 | // Example: |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | |
118 | 118 | // Main menu entries |
119 | 119 | $this->menu = array(); // List of menus to add |
120 | - $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
120 | + $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
121 | 121 | |
122 | 122 | // Add here entries to declare new menus |
123 | 123 | // Example to declare the Top Menu entry: |
@@ -433,7 +433,7 @@ discard block |
||
433 | 433 | $maxfilesizearray = getMaxFileSizeArray(); |
434 | 434 | $maxmin = $maxfilesizearray['maxmin']; |
435 | 435 | if ($maxmin > 0) { |
436 | - $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
436 | + $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
437 | 437 | } |
438 | 438 | $texte .= ' <input type="file" name="uploadfile">'; |
439 | 439 | $texte .= '<input type="hidden" value="PROJECT_TASK_ADDON_PDF_ODT_PATH" name="keyforuploaddir">'; |
@@ -766,7 +766,7 @@ discard block |
||
766 | 766 | } |
767 | 767 | |
768 | 768 | // Replace tags of lines for contacts |
769 | - $sourcearray = array('internal', 'external'); // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
769 | + $sourcearray = array('internal', 'external'); // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
770 | 770 | $contact_arrray = array(); |
771 | 771 | foreach ($sourcearray as $source) { |
772 | 772 | $contact_temp = $project->liste_contact(-1, $source); |
@@ -466,7 +466,7 @@ |
||
466 | 466 | $maxfilesizearray = getMaxFileSizeArray(); |
467 | 467 | $maxmin = $maxfilesizearray['maxmin']; |
468 | 468 | if ($maxmin > 0) { |
469 | - $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
469 | + $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
470 | 470 | } |
471 | 471 | $texte .= ' <input type="file" name="uploadfile">'; |
472 | 472 | $texte .= '<input type="hidden" value="PROJECT_ADDON_PDF_ODT_PATH" name="keyforuploaddir">'; |
@@ -336,7 +336,7 @@ |
||
336 | 336 | |
337 | 337 | $multicurrency = new MultiCurrency($this->db); |
338 | 338 | |
339 | - if (! $multicurrency->checkCodeAlreadyExists($conf->currency)) { |
|
339 | + if (!$multicurrency->checkCodeAlreadyExists($conf->currency)) { |
|
340 | 340 | $langs->loadCacheCurrencies(''); |
341 | 341 | |
342 | 342 | $multicurrency->code = $conf->currency; |
@@ -322,7 +322,7 @@ |
||
322 | 322 | $storage->clearToken('Google'); |
323 | 323 | |
324 | 324 | $tmpuser = new User($db); |
325 | - $res = $tmpuser->fetch(0, '', '', 0, $entitytosearchuser, $useremail, 0, 1); // Load user. Can load with email_oauth2. |
|
325 | + $res = $tmpuser->fetch(0, '', '', 0, $entitytosearchuser, $useremail, 0, 1); // Load user. Can load with email_oauth2. |
|
326 | 326 | |
327 | 327 | if ($res > 0) { |
328 | 328 | $username = $tmpuser->login; |
@@ -237,7 +237,7 @@ discard block |
||
237 | 237 | |
238 | 238 | $keyforselect = 'societe'; |
239 | 239 | $keyforelement = 'company'; |
240 | - $keyforaliasextra = 'extra'; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
240 | + $keyforaliasextra = 'extra'; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
241 | 241 | include DOL_DOCUMENT_ROOT . '/core/extrafieldsinexport.inc.php'; |
242 | 242 | |
243 | 243 | $this->export_sql_start[$r] = 'SELECT DISTINCT '; |
@@ -283,9 +283,9 @@ discard block |
||
283 | 283 | 't.libelle' => 'company', 'pl.code' => 'company', 'st.code' => 'company' |
284 | 284 | ); // We define here only fields that use another picto |
285 | 285 | |
286 | - $keyforselect = 'societe'; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
287 | - $keyforelement = 'company'; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
288 | - $keyforaliasextra = 'extra'; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
286 | + $keyforselect = 'societe'; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
287 | + $keyforelement = 'company'; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
288 | + $keyforaliasextra = 'extra'; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
289 | 289 | include DOL_DOCUMENT_ROOT . '/core/extrafieldsinexport.inc.php'; |
290 | 290 | |
291 | 291 | $this->export_sql_start[$r] = 'SELECT DISTINCT '; |
@@ -314,7 +314,7 @@ discard block |
||
314 | 314 | |
315 | 315 | $keyforselect = 'adherent'; |
316 | 316 | $keyforelement = 'member'; |
317 | - $keyforaliasextra = 'extra'; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
317 | + $keyforaliasextra = 'extra'; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
318 | 318 | include DOL_DOCUMENT_ROOT . '/core/extrafieldsinexport.inc.php'; |
319 | 319 | |
320 | 320 | $this->export_sql_start[$r] = 'SELECT DISTINCT '; |
@@ -369,7 +369,7 @@ discard block |
||
369 | 369 | |
370 | 370 | $keyforselect = 'socpeople'; |
371 | 371 | $keyforelement = 'contact'; |
372 | - $keyforaliasextra = 'extra'; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
372 | + $keyforaliasextra = 'extra'; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
373 | 373 | include DOL_DOCUMENT_ROOT . '/core/extrafieldsinexport.inc.php'; |
374 | 374 | |
375 | 375 | $this->export_sql_start[$r] = 'SELECT DISTINCT '; |
@@ -399,7 +399,7 @@ discard block |
||
399 | 399 | |
400 | 400 | $keyforselect = 'projet'; |
401 | 401 | $keyforelement = 'project'; |
402 | - $keyforaliasextra = 'extra'; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
402 | + $keyforaliasextra = 'extra'; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
403 | 403 | include DOL_DOCUMENT_ROOT . '/core/extrafieldsinexport.inc.php'; |
404 | 404 | |
405 | 405 | $this->export_sql_start[$r] = 'SELECT DISTINCT '; |
@@ -425,7 +425,7 @@ discard block |
||
425 | 425 | |
426 | 426 | $keyforselect = 'user'; |
427 | 427 | $keyforelement = 'user'; |
428 | - $keyforaliasextra = 'extra'; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
428 | + $keyforaliasextra = 'extra'; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
429 | 429 | include DOL_DOCUMENT_ROOT . '/core/extrafieldsinexport.inc.php'; |
430 | 430 | |
431 | 431 | $this->export_sql_start[$r] = 'SELECT DISTINCT '; |
@@ -307,7 +307,7 @@ discard block |
||
307 | 307 | $notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs); |
308 | 308 | $notetoshow = convertBackOfficeMediasLinksToPublicLinks($notetoshow); |
309 | 309 | |
310 | - $tab_top = 95; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
310 | + $tab_top = 95; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
311 | 311 | |
312 | 312 | $pdf->SetFont('', '', $default_font_size - 1); |
313 | 313 | $pdf->writeHTMLCell(190, 3, $this->posxpiece - 1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1); |
@@ -796,7 +796,7 @@ discard block |
||
796 | 796 | } |
797 | 797 | |
798 | 798 | // Show recipient |
799 | - $posy = 50; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
799 | + $posy = 50; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
800 | 800 | $posx = 100; |
801 | 801 | if (getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) { |
802 | 802 | $posx = $this->marge_gauche; |
@@ -170,7 +170,7 @@ |
||
170 | 170 | $maxfilesizearray = getMaxFileSizeArray(); |
171 | 171 | $maxmin = $maxfilesizearray['maxmin']; |
172 | 172 | if ($maxmin > 0) { |
173 | - $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
173 | + $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
174 | 174 | } |
175 | 175 | $texte .= ' <input type="file" name="uploadfile">'; |
176 | 176 | $texte .= '<input type="hidden" value="BOM_ADDON_PDF_ODT_PATH" name="keyforuploaddir">'; |
@@ -207,7 +207,7 @@ discard block |
||
207 | 207 | 'p.duration' => "Duration", |
208 | 208 | 'p.finished' => 'Nature', |
209 | 209 | 'p.price_base_type' => "PriceBase", 'p.price' => "UnitPriceHT", 'p.price_ttc' => "UnitPriceTTC", |
210 | - 'p.price_min' => "MinPriceHT",'p.price_min_ttc' => "MinPriceTTC", |
|
210 | + 'p.price_min' => "MinPriceHT", 'p.price_min_ttc' => "MinPriceTTC", |
|
211 | 211 | 'p.tva_tx' => 'VATRate', |
212 | 212 | 'p.datec' => 'DateCreation', 'p.tms' => 'DateModification' |
213 | 213 | ); |
@@ -305,7 +305,7 @@ discard block |
||
305 | 305 | $this->export_dependencies_array[$r] = array('category' => 'p.rowid'); |
306 | 306 | } |
307 | 307 | $this->export_sql_start[$r] = 'SELECT DISTINCT '; |
308 | - $this->export_sql_end[$r] = ' FROM ' . MAIN_DB_PREFIX . 'product as p'; |
|
308 | + $this->export_sql_end[$r] = ' FROM ' . MAIN_DB_PREFIX . 'product as p'; |
|
309 | 309 | if (getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) { |
310 | 310 | $this->export_sql_end[$r] .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity); |
311 | 311 | } |
@@ -453,14 +453,14 @@ discard block |
||
453 | 453 | $this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.barcode' => 'virtualproduct')); |
454 | 454 | } |
455 | 455 | $this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('pa.qty' => "subproduct", 'pa.incdec' => 'subproduct')); |
456 | - $keyforselect = 'product'; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
457 | - $keyforelement = 'product'; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
458 | - $keyforaliasextra = 'extra'; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
456 | + $keyforselect = 'product'; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
457 | + $keyforelement = 'product'; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
458 | + $keyforaliasextra = 'extra'; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
459 | 459 | include DOL_DOCUMENT_ROOT . '/core/extrafieldsinexport.inc.php'; |
460 | 460 | $this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p2.rowid' => "Id", 'p2.ref' => "Ref", 'p2.label' => "Label", 'p2.description' => "Description")); |
461 | 461 | $this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p2.rowid' => "subproduct", 'p2.ref' => "subproduct", 'p2.label' => "subproduct", 'p2.description' => "subproduct")); |
462 | 462 | $this->export_sql_start[$r] = 'SELECT DISTINCT '; |
463 | - $this->export_sql_end[$r] = ' FROM ' . MAIN_DB_PREFIX . 'product as p'; |
|
463 | + $this->export_sql_end[$r] = ' FROM ' . MAIN_DB_PREFIX . 'product as p'; |
|
464 | 464 | if (getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) { |
465 | 465 | $this->export_sql_end[$r] .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity); |
466 | 466 | } |