diff --git a/dev/tools/codespell/codespell-ignore.txt b/dev/tools/codespell/codespell-ignore.txt index 6fc432481d1..fde71bfed92 100644 --- a/dev/tools/codespell/codespell-ignore.txt +++ b/dev/tools/codespell/codespell-ignore.txt @@ -1,7 +1,9 @@ # List of words codespell will ignore # one per line, case-sensitive (when not lowercase) + # PROVid provid + # PostgreSQL postgresql @@ -9,6 +11,7 @@ postgresql noe Udo Tim + # Inside email ba blacklist @@ -36,28 +39,35 @@ thead ue whitelist ws + # Thirdparty should be Third party or Third-party but ignoring it because it's omnipresent thirdparty + # Code string ect tempdate sav files' + # Used as array key seeked tweek + # Used as key marge + # moral (var name) mor + # Strings used as keys for translation uptodate reenable + # Function - rename to devalidate ? unvalidate + # Some french strings somme -caracteres cas sur Datas diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php index 677c71d31de..0ff56583c74 100644 --- a/htdocs/compta/prelevement/class/bonprelevement.class.php +++ b/htdocs/compta/prelevement/class/bonprelevement.class.php @@ -2342,7 +2342,7 @@ class BonPrelevement extends CommonObject fwrite($this->file, substr($this->raison_sociale . " ", 0, 24)); - // Reference de la remise creancier D1 sur 7 caracteres + // Ref of thirdparty on 7 characters fwrite($this->file, substr($this->reference_remise . " ", 0, 7)); diff --git a/htdocs/core/class/commonstickergenerator.class.php b/htdocs/core/class/commonstickergenerator.class.php index 9e32529e9b1..76ca7efff3b 100644 --- a/htdocs/core/class/commonstickergenerator.class.php +++ b/htdocs/core/class/commonstickergenerator.class.php @@ -85,15 +85,15 @@ abstract class CommonStickerGenerator extends CommonDocGenerator protected $_Y_Space = 0; // NX Nombre d'etiquettes sur la largeur de la page protected $_X_Number = 0; - // NY Nombre d'etiquettes sur la hauteur de la page + // NY Number of labels on the height of a page protected $_Y_Number = 0; - // Largeur de chaque etiquette + // width of label protected $_Width = 0; - // Hauteur de chaque etiquette + // Height of label protected $_Height = 0; - // Hauteur des caracteres + // Height of characters protected $_Char_Size = 10; - // Hauteur par default d'une ligne + // Height by default of a line protected $_Line_Height = 10; // Type of metric.. Will help to calculate good values protected $_Metric = 'mm'; @@ -145,11 +145,11 @@ abstract class CommonStickerGenerator extends CommonDocGenerator // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps /** - * Methode qui permet de modifier la taille des caracteres - * Cela modiera aussi l'espace entre chaque ligne + * Method to modify the size of characters + * This will also modify the space between lines * - * @param TCPDF $pdf PDF reference - * @param int $pt point + * @param TCPDF $pdf PDF reference + * @param int $pt Point * @return void */ public function Set_Char_Size(&$pdf, $pt) diff --git a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php index 8b6233c40dc..16fc1284e34 100644 --- a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php +++ b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php @@ -411,21 +411,6 @@ class pdf_standard extends ModeleExpenseReport $pdf->setTopMargin($this->marge_haute); $pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it. - //$nblineFollowComment = 1; - // Search number of lines coming to know if there is enough room - // if ($i < ($nblines - 1)) // If it's not last line - // { - // //Fetch current description to know on which line the next one should be placed - // $follow_comment = $object->lines[$i]->comments; - // $follow_type = $object->lines[$i]->type_fees_code; - - // //on compte le nombre de ligne afin de verifier la place disponible (largeur de ligne 52 caracteres) - // $nbLineCommentNeed = dol_nboflines_bis($follow_comment,52,$outputlangs->charset_output); - // $nbLineTypeNeed = dol_nboflines_bis($follow_type,4,$outputlangs->charset_output); - - // $nblineFollowComment = max($nbLineCommentNeed, $nbLineTypeNeed); - // } - //$nexY+=$nblineFollowComment*($pdf->getFontSize()*1.3); // Add space between lines $nexY += ($pdf->getFontSize() * 1.3); // Add space between lines diff --git a/htdocs/install/mysql/tables/llx_const.sql b/htdocs/install/mysql/tables/llx_const.sql index 96594bb60b4..7ca1946808e 100644 --- a/htdocs/install/mysql/tables/llx_const.sql +++ b/htdocs/install/mysql/tables/llx_const.sql @@ -28,14 +28,14 @@ create table llx_const rowid integer AUTO_INCREMENT PRIMARY KEY, name varchar(180) NOT NULL, entity integer DEFAULT 1 NOT NULL, -- multi company id - value text NOT NULL, -- max 65535 caracteres - type varchar(64) DEFAULT 'string', -- null or 'encrypted' if param has been encrypted + value text NOT NULL, -- max 65535 characters + type varchar(64) DEFAULT 'string', -- null or 'encrypted' if param has been encrypted visible tinyint DEFAULT 1 NOT NULL, note text, tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP ) ENGINE=innodb; --- +-- -- List of codes for the field entity -- -- 0 : common constant