@@ -452,7 +452,7 @@ discard block |
||
452 | 452 | return $solde; |
453 | 453 | } |
454 | 454 | |
455 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
455 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
456 | 456 | /** |
457 | 457 | * Total of the VAT from invoices emitted by the thirdparty. |
458 | 458 | * |
@@ -461,7 +461,7 @@ discard block |
||
461 | 461 | */ |
462 | 462 | public function tva_sum_collectee($year = 0) |
463 | 463 | { |
464 | - // phpcs:enable |
|
464 | + // phpcs:enable |
|
465 | 465 | |
466 | 466 | $sql = "SELECT sum(f.total_tva) as amount"; |
467 | 467 | $sql .= " FROM " . MAIN_DB_PREFIX . "facture as f WHERE f.paye = 1"; |
@@ -486,7 +486,7 @@ discard block |
||
486 | 486 | } |
487 | 487 | } |
488 | 488 | |
489 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
489 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
490 | 490 | /** |
491 | 491 | * VAT paid |
492 | 492 | * |
@@ -495,7 +495,7 @@ discard block |
||
495 | 495 | */ |
496 | 496 | public function tva_sum_payee($year = 0) |
497 | 497 | { |
498 | - // phpcs:enable |
|
498 | + // phpcs:enable |
|
499 | 499 | |
500 | 500 | $sql = "SELECT sum(f.total_tva) as total_tva"; |
501 | 501 | $sql .= " FROM " . MAIN_DB_PREFIX . "facture_fourn as f"; |
@@ -521,7 +521,7 @@ discard block |
||
521 | 521 | } |
522 | 522 | |
523 | 523 | |
524 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
524 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
525 | 525 | /** |
526 | 526 | * Total of the VAT paid |
527 | 527 | * |
@@ -530,7 +530,7 @@ discard block |
||
530 | 530 | */ |
531 | 531 | public function tva_sum_reglee($year = 0) |
532 | 532 | { |
533 | - // phpcs:enable |
|
533 | + // phpcs:enable |
|
534 | 534 | |
535 | 535 | $sql = "SELECT sum(f.amount) as amount"; |
536 | 536 | $sql .= " FROM " . MAIN_DB_PREFIX . "tva as f"; |
@@ -701,7 +701,7 @@ discard block |
||
701 | 701 | } |
702 | 702 | } |
703 | 703 | |
704 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
704 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
705 | 705 | /** |
706 | 706 | * Update link between payment tva and line generate into llx_bank |
707 | 707 | * |
@@ -710,7 +710,7 @@ discard block |
||
710 | 710 | */ |
711 | 711 | public function update_fk_bank($id_bank) |
712 | 712 | { |
713 | - // phpcs:enable |
|
713 | + // phpcs:enable |
|
714 | 714 | $sql = 'UPDATE ' . MAIN_DB_PREFIX . 'tva SET fk_bank = ' . (int) $id_bank; |
715 | 715 | $sql .= ' WHERE rowid = ' . (int) $this->id; |
716 | 716 | $result = $this->db->query($sql); |
@@ -867,7 +867,7 @@ discard block |
||
867 | 867 | return $this->LibStatut($this->paye, $mode, $alreadypaid); |
868 | 868 | } |
869 | 869 | |
870 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
870 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
871 | 871 | /** |
872 | 872 | * Return the label of a given VAT status |
873 | 873 | * |
@@ -878,7 +878,7 @@ discard block |
||
878 | 878 | */ |
879 | 879 | public function LibStatut($status, $mode = 0, $alreadypaid = -1) |
880 | 880 | { |
881 | - // phpcs:enable |
|
881 | + // phpcs:enable |
|
882 | 882 | global $langs; |
883 | 883 | |
884 | 884 | // Load translation files required by the page |
@@ -638,7 +638,7 @@ discard block |
||
638 | 638 | return $this->LibStatut($this->status, $mode); |
639 | 639 | } |
640 | 640 | |
641 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
641 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
642 | 642 | /** |
643 | 643 | * Return the status |
644 | 644 | * |
@@ -648,7 +648,7 @@ discard block |
||
648 | 648 | */ |
649 | 649 | public function LibStatut($status, $mode = 0) |
650 | 650 | { |
651 | - // phpcs:enable |
|
651 | + // phpcs:enable |
|
652 | 652 | if (empty($this->labelStatus) || empty($this->labelStatusShort)) { |
653 | 653 | global $langs; |
654 | 654 | //$langs->load("mymodule"); |
@@ -615,7 +615,7 @@ discard block |
||
615 | 615 | } |
616 | 616 | } |
617 | 617 | |
618 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
618 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
619 | 619 | /** |
620 | 620 | * Update link between payment various and line generate into llx_bank |
621 | 621 | * |
@@ -624,7 +624,7 @@ discard block |
||
624 | 624 | */ |
625 | 625 | public function update_fk_bank($id_bank) |
626 | 626 | { |
627 | - // phpcs:enable |
|
627 | + // phpcs:enable |
|
628 | 628 | $sql = 'UPDATE ' . MAIN_DB_PREFIX . 'payment_various SET fk_bank = ' . ((int) $id_bank); |
629 | 629 | $sql .= " WHERE rowid = " . ((int) $this->id); |
630 | 630 | $result = $this->db->query($sql); |
@@ -648,7 +648,7 @@ discard block |
||
648 | 648 | return $this->LibStatut($this->statut, $mode); |
649 | 649 | } |
650 | 650 | |
651 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
651 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
652 | 652 | /** |
653 | 653 | * Return the label of a given status |
654 | 654 | * |
@@ -658,7 +658,7 @@ discard block |
||
658 | 658 | */ |
659 | 659 | public function LibStatut($status, $mode = 0) |
660 | 660 | { |
661 | - // phpcs:enable |
|
661 | + // phpcs:enable |
|
662 | 662 | global $langs; |
663 | 663 | |
664 | 664 | if (empty($status)) { |
@@ -342,7 +342,7 @@ discard block |
||
342 | 342 | $this->type_payment = $obj->fk_typepayment; |
343 | 343 | $this->num_payment = $obj->num_payment; |
344 | 344 | $this->label = $obj->label; |
345 | - $this->note = $obj->note_private; // For backward compatibility |
|
345 | + $this->note = $obj->note_private; // For backward compatibility |
|
346 | 346 | $this->note_private = $obj->note_private; |
347 | 347 | $this->subledger_account = $obj->subledger_account; |
348 | 348 | $this->accountancy_code = $obj->accountancy_code; |
@@ -523,7 +523,7 @@ discard block |
||
523 | 523 | $sql .= ", " . ($this->fk_project > 0 ? ((int) $this->fk_project) : 0); |
524 | 524 | $sql .= ", " . ((int) $user->id); |
525 | 525 | $sql .= ", '" . $this->db->idate($now) . "'"; |
526 | - $sql .= ", NULL"; // Filled later |
|
526 | + $sql .= ", NULL"; // Filled later |
|
527 | 527 | $sql .= ", " . ((int) $conf->entity); |
528 | 528 | $sql .= ")"; |
529 | 529 |
@@ -675,7 +675,7 @@ discard block |
||
675 | 675 | } |
676 | 676 | |
677 | 677 | |
678 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
678 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
679 | 679 | /** |
680 | 680 | * Get lines of template invoices into this->lines |
681 | 681 | * |
@@ -683,7 +683,7 @@ discard block |
||
683 | 683 | */ |
684 | 684 | public function fetch_lines() |
685 | 685 | { |
686 | - // phpcs:enable |
|
686 | + // phpcs:enable |
|
687 | 687 | |
688 | 688 | $this->lines = array(); |
689 | 689 | |
@@ -1527,7 +1527,7 @@ discard block |
||
1527 | 1527 | return $this->LibStatut($this->frequency ? 1 : 0, $this->suspended, $mode, $alreadypaid, empty($this->type) ? 0 : $this->type); |
1528 | 1528 | } |
1529 | 1529 | |
1530 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1530 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1531 | 1531 | /** |
1532 | 1532 | * Return label of a status |
1533 | 1533 | * |
@@ -1540,7 +1540,7 @@ discard block |
||
1540 | 1540 | */ |
1541 | 1541 | public function LibStatut($recur, $status, $mode = 0, $alreadypaid = -1, $type = 0) |
1542 | 1542 | { |
1543 | - // phpcs:enable |
|
1543 | + // phpcs:enable |
|
1544 | 1544 | global $langs; |
1545 | 1545 | $langs->load('bills'); |
1546 | 1546 |
@@ -804,7 +804,7 @@ discard block |
||
804 | 804 | { |
805 | 805 | $rowid = $this->id; |
806 | 806 | |
807 | - dol_syslog(get_only_class($this) . "::delete rowid=" . ((int)$rowid), LOG_DEBUG); |
|
807 | + dol_syslog(get_only_class($this) . "::delete rowid=" . ((int) $rowid), LOG_DEBUG); |
|
808 | 808 | |
809 | 809 | $error = 0; |
810 | 810 | $this->db->begin(); |
@@ -1359,7 +1359,7 @@ discard block |
||
1359 | 1359 | |
1360 | 1360 | $facture->type = self::TYPE_STANDARD; |
1361 | 1361 | $facture->subtype = $facturerec->subtype; |
1362 | - $facture->statut = self::STATUS_DRAFT; // deprecated |
|
1362 | + $facture->statut = self::STATUS_DRAFT; // deprecated |
|
1363 | 1363 | $facture->status = self::STATUS_DRAFT; |
1364 | 1364 | $facture->date = (empty($facturerec->date_when) ? $now : $facturerec->date_when); // We could also use dol_now here but we prefer date_when so invoice has real date when we would like even if we generate later. |
1365 | 1365 | $facture->socid = $facturerec->socid; |
@@ -363,7 +363,7 @@ discard block |
||
363 | 363 | return $solde; |
364 | 364 | } |
365 | 365 | |
366 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
366 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
367 | 367 | /** |
368 | 368 | * Total de la localtax des factures emises par la societe. |
369 | 369 | * |
@@ -372,7 +372,7 @@ discard block |
||
372 | 372 | */ |
373 | 373 | public function localtax_sum_collectee($year = 0) |
374 | 374 | { |
375 | - // phpcs:enable |
|
375 | + // phpcs:enable |
|
376 | 376 | $sql = "SELECT sum(f.localtax) as amount"; |
377 | 377 | $sql .= " FROM " . MAIN_DB_PREFIX . "facture as f"; |
378 | 378 | $sql .= " WHERE f.paye = 1"; |
@@ -397,7 +397,7 @@ discard block |
||
397 | 397 | } |
398 | 398 | } |
399 | 399 | |
400 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
400 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
401 | 401 | /** |
402 | 402 | * Total of localtax paid in invoice |
403 | 403 | * |
@@ -406,7 +406,7 @@ discard block |
||
406 | 406 | */ |
407 | 407 | public function localtax_sum_payee($year = 0) |
408 | 408 | { |
409 | - // phpcs:enable |
|
409 | + // phpcs:enable |
|
410 | 410 | |
411 | 411 | $sql = "SELECT sum(f.total_localtax) as total_localtax"; |
412 | 412 | $sql .= " FROM " . MAIN_DB_PREFIX . "facture_fourn as f"; |
@@ -432,7 +432,7 @@ discard block |
||
432 | 432 | } |
433 | 433 | |
434 | 434 | |
435 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
435 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
436 | 436 | /** |
437 | 437 | * Total of localtax paid |
438 | 438 | * |
@@ -441,7 +441,7 @@ discard block |
||
441 | 441 | */ |
442 | 442 | public function localtax_sum_reglee($year = 0) |
443 | 443 | { |
444 | - // phpcs:enable |
|
444 | + // phpcs:enable |
|
445 | 445 | |
446 | 446 | $sql = "SELECT sum(f.amount) as amount"; |
447 | 447 | $sql .= " FROM " . MAIN_DB_PREFIX . "localtax as f"; |
@@ -572,7 +572,7 @@ discard block |
||
572 | 572 | } |
573 | 573 | } |
574 | 574 | |
575 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
575 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
576 | 576 | /** |
577 | 577 | * Update the link between localtax payment and the line into llx_bank |
578 | 578 | * |
@@ -581,7 +581,7 @@ discard block |
||
581 | 581 | */ |
582 | 582 | public function update_fk_bank($id) |
583 | 583 | { |
584 | - // phpcs:enable |
|
584 | + // phpcs:enable |
|
585 | 585 | $sql = 'UPDATE ' . MAIN_DB_PREFIX . 'localtax SET fk_bank = ' . ((int) $id); |
586 | 586 | $sql .= ' WHERE rowid = ' . ((int) $this->id); |
587 | 587 | $result = $this->db->query($sql); |
@@ -636,7 +636,7 @@ discard block |
||
636 | 636 | return $this->LibStatut($this->statut, $mode); |
637 | 637 | } |
638 | 638 | |
639 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
639 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
640 | 640 | /** |
641 | 641 | * Return the label of a given status |
642 | 642 | * |
@@ -646,7 +646,7 @@ discard block |
||
646 | 646 | */ |
647 | 647 | public function LibStatut($status, $mode = 0) |
648 | 648 | { |
649 | - // phpcs:enable |
|
649 | + // phpcs:enable |
|
650 | 650 | //global $langs; |
651 | 651 | |
652 | 652 | return ''; |
@@ -501,13 +501,13 @@ discard block |
||
501 | 501 | $sql = "INSERT INTO " . MAIN_DB_PREFIX . "bank_url ("; |
502 | 502 | $sql .= "fk_bank"; |
503 | 503 | $sql .= ", url_id"; |
504 | - $sql .= ", url"; // deprecated |
|
504 | + $sql .= ", url"; // deprecated |
|
505 | 505 | $sql .= ", label"; |
506 | 506 | $sql .= ", type"; |
507 | 507 | $sql .= ") VALUES ("; |
508 | 508 | $sql .= ((int) $line_id); |
509 | 509 | $sql .= ", " . ((int) $url_id); |
510 | - $sql .= ", '" . $this->db->escape($url) . "'"; // deprecated |
|
510 | + $sql .= ", '" . $this->db->escape($url) . "'"; // deprecated |
|
511 | 511 | $sql .= ", '" . $this->db->escape($label) . "'"; |
512 | 512 | $sql .= ", '" . $this->db->escape($type) . "'"; |
513 | 513 | $sql .= ")"; |
@@ -1634,7 +1634,7 @@ discard block |
||
1634 | 1634 | $this->error = 'SwiftNotValid'; |
1635 | 1635 | } |
1636 | 1636 | |
1637 | - if (! $error) { |
|
1637 | + if (!$error) { |
|
1638 | 1638 | return 1; |
1639 | 1639 | } else { |
1640 | 1640 | return 0; |
@@ -490,7 +490,7 @@ discard block |
||
490 | 490 | } |
491 | 491 | |
492 | 492 | |
493 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
493 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
494 | 494 | /** |
495 | 495 | * Add a link between bank line record and its source |
496 | 496 | * |
@@ -503,7 +503,7 @@ discard block |
||
503 | 503 | */ |
504 | 504 | public function add_url_line($line_id, $url_id, $url, $label, $type) |
505 | 505 | { |
506 | - // phpcs:enable |
|
506 | + // phpcs:enable |
|
507 | 507 | $sql = "INSERT INTO " . MAIN_DB_PREFIX . "bank_url ("; |
508 | 508 | $sql .= "fk_bank"; |
509 | 509 | $sql .= ", url_id"; |
@@ -528,7 +528,7 @@ discard block |
||
528 | 528 | } |
529 | 529 | } |
530 | 530 | |
531 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
531 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
532 | 532 | /** |
533 | 533 | * TODO Move this into AccountLine |
534 | 534 | * Return array with links from llx_bank_url |
@@ -540,7 +540,7 @@ discard block |
||
540 | 540 | */ |
541 | 541 | public function get_url($fk_bank = 0, $url_id = 0, $type = '') |
542 | 542 | { |
543 | - // phpcs:enable |
|
543 | + // phpcs:enable |
|
544 | 544 | $lines = array(); |
545 | 545 | |
546 | 546 | // Check parameters |
@@ -998,7 +998,7 @@ discard block |
||
998 | 998 | } |
999 | 999 | |
1000 | 1000 | |
1001 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1001 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1002 | 1002 | /** |
1003 | 1003 | * Update BBAN (RIB) account fields |
1004 | 1004 | * |
@@ -1007,7 +1007,7 @@ discard block |
||
1007 | 1007 | */ |
1008 | 1008 | public function update_bban(User $user = null) |
1009 | 1009 | { |
1010 | - // phpcs:enable |
|
1010 | + // phpcs:enable |
|
1011 | 1011 | global $conf, $langs; |
1012 | 1012 | |
1013 | 1013 | // Load library to get BAN control function |
@@ -1245,7 +1245,7 @@ discard block |
||
1245 | 1245 | return $this->LibStatut($this->status, $mode); |
1246 | 1246 | } |
1247 | 1247 | |
1248 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1248 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1249 | 1249 | /** |
1250 | 1250 | * Return label of given object status |
1251 | 1251 | * |
@@ -1255,7 +1255,7 @@ discard block |
||
1255 | 1255 | */ |
1256 | 1256 | public function LibStatut($status, $mode = 0) |
1257 | 1257 | { |
1258 | - // phpcs:enable |
|
1258 | + // phpcs:enable |
|
1259 | 1259 | global $langs; |
1260 | 1260 | $langs->load('banks'); |
1261 | 1261 | |
@@ -1273,7 +1273,7 @@ discard block |
||
1273 | 1273 | } |
1274 | 1274 | |
1275 | 1275 | |
1276 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1276 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1277 | 1277 | /** |
1278 | 1278 | * Indicates if an account can be deleted or not (without movements) |
1279 | 1279 | * |
@@ -1281,7 +1281,7 @@ discard block |
||
1281 | 1281 | */ |
1282 | 1282 | public function can_be_deleted() |
1283 | 1283 | { |
1284 | - // phpcs:enable |
|
1284 | + // phpcs:enable |
|
1285 | 1285 | $can_be_deleted = false; |
1286 | 1286 | |
1287 | 1287 | $sql = "SELECT COUNT(rowid) as nb"; |
@@ -1345,7 +1345,7 @@ discard block |
||
1345 | 1345 | return (float) price2num($solde, 'MU'); |
1346 | 1346 | } |
1347 | 1347 | |
1348 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1348 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1349 | 1349 | /** |
1350 | 1350 | * Load indicators for dashboard (this->nbtodo and this->nbtodolate) |
1351 | 1351 | * |
@@ -1355,7 +1355,7 @@ discard block |
||
1355 | 1355 | */ |
1356 | 1356 | public function load_board(User $user, $filteraccountid = 0) |
1357 | 1357 | { |
1358 | - // phpcs:enable |
|
1358 | + // phpcs:enable |
|
1359 | 1359 | global $conf, $langs; |
1360 | 1360 | |
1361 | 1361 | if ($user->socid) { |
@@ -458,7 +458,7 @@ discard block |
||
458 | 458 | return $this->LibStatut($this->status, $mode); |
459 | 459 | }*/ |
460 | 460 | |
461 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
461 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
462 | 462 | /** |
463 | 463 | * Return the label of a given status |
464 | 464 | * |
@@ -468,7 +468,7 @@ discard block |
||
468 | 468 | */ |
469 | 469 | public function LibStatut($status, $mode = 0) |
470 | 470 | { |
471 | - // phpcs:enable |
|
471 | + // phpcs:enable |
|
472 | 472 | global $langs; |
473 | 473 | |
474 | 474 | if ($mode == 0) { |
@@ -738,8 +738,8 @@ |
||
738 | 738 | |
739 | 739 | // if dolibarr currency != bank currency then we received an amount in customer currency (currently I don't manage the case : my currency is USD, the customer currency is EUR and he paid me in GBP. Seems no sense for me) |
740 | 740 | if (isModEnabled('multicurrency') && $conf->currency != $acc->currency_code) { |
741 | - $totalamount = $this->multicurrency_amount; // We will insert into llx_bank.amount in foreign currency |
|
742 | - $totalamount_main_currency = $this->amount; // We will also save the amount in main currency into column llx_bank.amount_main_currency |
|
741 | + $totalamount = $this->multicurrency_amount; // We will insert into llx_bank.amount in foreign currency |
|
742 | + $totalamount_main_currency = $this->amount; // We will also save the amount in main currency into column llx_bank.amount_main_currency |
|
743 | 743 | } |
744 | 744 | |
745 | 745 | if ($mode == 'payment_supplier') { |
@@ -886,7 +886,7 @@ discard block |
||
886 | 886 | } |
887 | 887 | |
888 | 888 | |
889 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
889 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
890 | 890 | /** |
891 | 891 | * Mise a jour du lien entre le paiement et la ligne generee dans llx_bank |
892 | 892 | * |
@@ -895,7 +895,7 @@ discard block |
||
895 | 895 | */ |
896 | 896 | public function update_fk_bank($id_bank) |
897 | 897 | { |
898 | - // phpcs:enable |
|
898 | + // phpcs:enable |
|
899 | 899 | $sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' set fk_bank = ' . ((int) $id_bank); |
900 | 900 | $sql .= " WHERE rowid = " . ((int) $this->id); |
901 | 901 | |
@@ -910,7 +910,7 @@ discard block |
||
910 | 910 | } |
911 | 911 | } |
912 | 912 | |
913 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
913 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
914 | 914 | /** |
915 | 915 | * Updates the payment date |
916 | 916 | * |
@@ -919,7 +919,7 @@ discard block |
||
919 | 919 | */ |
920 | 920 | public function update_date($date) |
921 | 921 | { |
922 | - // phpcs:enable |
|
922 | + // phpcs:enable |
|
923 | 923 | $error = 0; |
924 | 924 | |
925 | 925 | if (!empty($date) && $this->statut != 1) { |
@@ -967,7 +967,7 @@ discard block |
||
967 | 967 | return -1; //no date given or already validated |
968 | 968 | } |
969 | 969 | |
970 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
970 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
971 | 971 | /** |
972 | 972 | * Updates the payment number |
973 | 973 | * |
@@ -976,7 +976,7 @@ discard block |
||
976 | 976 | */ |
977 | 977 | public function update_num($num_payment) |
978 | 978 | { |
979 | - // phpcs:enable |
|
979 | + // phpcs:enable |
|
980 | 980 | if (!empty($num_payment) && $this->statut != 1) { |
981 | 981 | $sql = "UPDATE " . MAIN_DB_PREFIX . $this->table_element; |
982 | 982 | $sql .= " SET num_paiement = '" . $this->db->escape($num_payment) . "'"; |
@@ -1373,7 +1373,7 @@ discard block |
||
1373 | 1373 | return $this->LibStatut($this->statut, $mode); |
1374 | 1374 | } |
1375 | 1375 | |
1376 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1376 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1377 | 1377 | /** |
1378 | 1378 | * Return the label of a given status |
1379 | 1379 | * |
@@ -1383,7 +1383,7 @@ discard block |
||
1383 | 1383 | */ |
1384 | 1384 | public function LibStatut($status, $mode = 0) |
1385 | 1385 | { |
1386 | - // phpcs:enable |
|
1386 | + // phpcs:enable |
|
1387 | 1387 | global $langs; // TODO Renvoyer le libelle anglais et faire traduction a affichage |
1388 | 1388 | |
1389 | 1389 | $langs->load('compta'); |
@@ -1425,7 +1425,7 @@ discard block |
||
1425 | 1425 | return ''; |
1426 | 1426 | } |
1427 | 1427 | |
1428 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1428 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
1429 | 1429 | /** |
1430 | 1430 | * Load the third party of object, from id into this->thirdparty. |
1431 | 1431 | * For payments, take the thirdparty linked to the first invoice found. This is enough because payments are done on invoices of the same thirdparty. |
@@ -1435,7 +1435,7 @@ discard block |
||
1435 | 1435 | */ |
1436 | 1436 | public function fetch_thirdparty($force_thirdparty_id = 0) |
1437 | 1437 | { |
1438 | - // phpcs:enable |
|
1438 | + // phpcs:enable |
|
1439 | 1439 | |
1440 | 1440 | if (empty($force_thirdparty_id)) { |
1441 | 1441 | $billsarray = $this->getBillsArray(); // From payment, the fk_soc isn't available, we should load the first supplier invoice to get him |
@@ -145,7 +145,7 @@ discard block |
||
145 | 145 | } |
146 | 146 | } |
147 | 147 | |
148 | - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
148 | + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps |
|
149 | 149 | /** |
150 | 150 | * Return list of event types: array(id=>label) or array(code=>label) |
151 | 151 | * |
@@ -159,7 +159,7 @@ discard block |
||
159 | 159 | */ |
160 | 160 | public function liste_array($active = '', $idorcode = 'id', $excludetype = '', $onlyautoornot = 0, $morefilter = '', $shortlabel = 0) |
161 | 161 | { |
162 | - // phpcs:enable |
|
162 | + // phpcs:enable |
|
163 | 163 | global $langs, $conf, $user; |
164 | 164 | $langs->load("commercial"); |
165 | 165 |
@@ -263,7 +263,7 @@ discard block |
||
263 | 263 | } |
264 | 264 | } |
265 | 265 | // For the case type is not 'system...' neither 'module', we just check module is on |
266 | - if (! in_array($obj->type, array('system', 'systemauto', 'module', 'moduleauto'))) { |
|
266 | + if (!in_array($obj->type, array('system', 'systemauto', 'module', 'moduleauto'))) { |
|
267 | 267 | $tmpmodule = $obj->module; |
268 | 268 | //var_dump($tmpmodule); |
269 | 269 | if ($tmpmodule && isset($conf->$tmpmodule) && isModEnabled($tmpmodule)) { |
@@ -351,10 +351,10 @@ discard block |
||
351 | 351 | $idorcode = 'all'; |
352 | 352 | } |
353 | 353 | $TType = $TSystem[$idorcode]; |
354 | - if (! empty($TSystemAuto[$idorcode])) { |
|
354 | + if (!empty($TSystemAuto[$idorcode])) { |
|
355 | 355 | $TType = array_merge($TType, $TSystemAuto[$idorcode]); |
356 | 356 | } |
357 | - if (! empty($TModule[$idorcode])) { |
|
357 | + if (!empty($TModule[$idorcode])) { |
|
358 | 358 | $TType = array_merge($TType, $TModule[$idorcode]); |
359 | 359 | } |
360 | 360 | $this->liste_array = $TType; |