Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop

.travis.yml

@@ -298,7 +298,7 @@ script:
   # Ensure we catch errors
   set -e
   #parallel-lint --exclude htdocs/includes --blame .
-  parallel-lint --exclude htdocs/includes/sabre --exclude htdocs/includes/phpoffice/PhpSpreadsheet --exclude htdocs/includes/sebastian --exclude htdocs/includes/squizlabs/php_codesniffer/tests --exclude htdocs/includes/jakub-onderka/php-parallel-lint/tests --exclude htdocs/includes/mike42/escpos-php/example --exclude htdocs/includes/phpunit/php-token-stream/tests --exclude htdocs/includes/composer/autoload_static.php --blame .
+  parallel-lint --exclude htdocs/includes/sabre --exclude htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared --exclude htdocs/includes/phpoffice/PhpSpreadsheet --exclude htdocs/includes/sebastian --exclude htdocs/includes/squizlabs/php_codesniffer/tests --exclude htdocs/includes/jakub-onderka/php-parallel-lint/tests --exclude htdocs/includes/mike42/escpos-php/example --exclude htdocs/includes/phpunit/php-token-stream/tests --exclude htdocs/includes/composer/autoload_static.php --blame .
   set +e
   echo
 

COPYRIGHT

@@ -28,7 +28,7 @@ php-iban               1.4.7         LGPL-3+                     Yes
 PHPoAuthLib            0.8.2         MIT License                 Yes             Library to provide oauth1 and oauth2 to different service
 PHPPrintIPP            1.3           GPL-2+                      Yes             Library to send print IPP requests
 Restler                3.0.0RC6      LGPL-3+                     Yes             Library to develop REST Web services (+ swagger-ui js lib into dir explorer)
-TCPDF                  6.2.12        LGPL-3+                     Yes             PDF generation
+TCPDF                  6.2.25        LGPL-3+                     Yes             PDF generation
 TCPDI                  1.0.0         LGPL-3+ / Apache 2.0        Yes             FPDI replacement
 Swift Mailer           5.4.2-DEV     MIT license                 Yes             Comprehensive mailing tools for PHP
 Stripe                 4.7.0         MIT licence                 Yes             Library for Stripe module
@@ -53,9 +53,13 @@ JsTimezoneDetect       1.0.6         MIT License                 Yes
 SwaggerUI			   2.0.24		 GPL-2+                      Yes             JS library to offer the REST API explorer
 Ace                    1.2.8         BSD                         Yes             JS library to get code syntaxique coloration in a textarea.    
 
-Image libraries
+Image libraries:
 Octicons               8.1           MIT                         Yes
 
+Font libraries:
+Fontawesome            4.7           ?                           Yes
+Fontawesome            5.0           ?                           Yes
+
 
 For licenses compatibility informations:
 http://www.gnu.org/licenses/licenses.en.html

ChangeLog

@@ -4,6 +4,7 @@ English Dolibarr ChangeLog
 
 ***** ChangeLog for 10.0.0 compared to 9.0.0 *****
 For Users:
+NEW: Module ticket is available as a stable module
 NEW: Experimental module "Vendor receptions"
 
 For Developers:
@@ -12,7 +13,7 @@ For Developers:
 WARNING:
 
 Following changes may create regressions for some external modules, but were necessary to make Dolibarr better:
-* Method GetUrlTrackingStatus were renamed into getUrlTrackingStatus.
+* Method GetUrlTrackingStatus were renamed into getUrlTrackingStatus for consistency with naming rules.
 * API getListOfCivility has been renamed into getListOfCivilities for consistency with naming rules.
 
 

composer.json

@@ -1,60 +1,62 @@
 {
-    "name": "dolibarr/dolibarr",
+	"name" : "dolibarr/dolibarr",
-    "type": "project",
+	"type" : "project",
-    "description": "Dolibarr ERP & CRM is a modern and easy to use web software to manage your business",
+	"description" : "Dolibarr ERP & CRM is a modern and easy to use web software to manage your business",
-    "keywords": [
+	"keywords" : [
-	    "erp",
+		"erp",
-   		"crm",
+		"crm",
-    	"invoice",
+		"invoice",
-    	"sme",
+		"sme",
-    	"proposal",
+		"proposal",
-    	"order",
+		"order",
-    	"stock",
+		"stock",
-    	"agenda"
+		"agenda"
-    ],
+	],
-    "homepage": "https://www.dolibarr.org",
+	"homepage" : "https://www.dolibarr.org",
-    "license": "GPL-3.0-or-later",
+	"license" : "GPL-3.0-or-later",
-    "support": {
+	"support" : {
-        "issues": "https://github.com/Dolibarr/dolibarr/issues",
+		"issues" : "https://github.com/Dolibarr/dolibarr/issues",
-        "forum": "https://www.dolibarr.org/forum",
+		"forum" : "https://www.dolibarr.org/forum",
-        "wiki": "https://wiki.dolibarr.org",
+		"wiki" : "https://wiki.dolibarr.org",
-        "source": "https://github.com/Dolibarr/dolibarr"
+		"source" : "https://github.com/Dolibarr/dolibarr"
-    },
+	},
-    "config": {
+	"config" : {
-        "vendor-dir": "htdocs/includes"
+		"vendor-dir" : "htdocs/includes"
-    },
+	},
-    "require": {
+	"require" : {
-        "php": ">=5.3.0",
+		"php" : ">=5.3.0",
-        "ext-curl": "*",
+		"ext-curl" : "*",
-        "ccampbell/chromephp": "4.1.0",
+		"ccampbell/chromephp" : "4.1.0",
-        "ckeditor/ckeditor": "4.5.9",
+		"ckeditor/ckeditor" : "4.6.2",
-        "mike42/escpos-php": "1.2.1",
+		"mike42/escpos-php" : "1.2.1",
-        "mobiledetect/mobiledetectlib": "2.8.17",
+		"mobiledetect/mobiledetectlib" : "2.8.17",
-        "phpoffice/phpexcel": "1.8.1",
+		"phpoffice/phpexcel" : "1.8.1",
-        "restler/framework": "3.0.0-RC6",
+		"restler/framework" : "3.0.0-RC6",
-        "tecnickcom/tcpdf": "6.2.12"
+		"tecnickcom/tcpdf" : "^6.2",
-    },
+		"atgp/factur-x" : "^1.0",
-    "require-dev": {
+		"luracast/restler": "^3.0"
-        "jakub-onderka/php-parallel-lint": "^0",
+	},
-        "jakub-onderka/php-console-highlighter": "^0",
+	"require-dev" : {
-        "phpunit/phpunit": "^4",
+		"jakub-onderka/php-parallel-lint" : "^0",
-        "squizlabs/php_codesniffer": "^2",
+		"jakub-onderka/php-console-highlighter" : "^0",
-        "phpunit/phpunit-selenium": "^2"
+		"phpunit/phpunit" : "^4",
-    },
+		"squizlabs/php_codesniffer" : "^2",
-    "suggest": {
+		"phpunit/phpunit-selenium" : "^2"
-        "ext-mysqlnd": "To use with MySQL or MariaDB",
+	},
-        "ext-mysqli": "To use with MySQL or MariaDB",
+	"suggest" : {
-        "ext-pgsql": "To use with PostgreSQL",
+		"ext-mysqlnd" : "To use with MySQL or MariaDB",
-        "ext-mssql": "To use with MSSQL (experimental)",
+		"ext-mysqli" : "To use with MySQL or MariaDB",
-        "ext-pdo_sqlite": "To use with SQLite (experimental)",
+		"ext-pgsql" : "To use with PostgreSQL",
-        "ext-gd": "Image manipulation (Required but maybe built-in PHP)",
+		"ext-mssql" : "To use with MSSQL (experimental)",
-        "ext-imagick": "Image manipulation (TCPDF)",
+		"ext-pdo_sqlite" : "To use with SQLite (experimental)",
-        "ext-mcrypt": "(Required but maybe built-in PHP)",
+		"ext-gd" : "Image manipulation (Required but maybe built-in PHP)",
-        "ext-openssl": "Secure connections (Emails, SOAP…)",
+		"ext-imagick" : "Image manipulation (TCPDF)",
-        "ext-mbstring": "Handle non UTF-8 databases",
+		"ext-mcrypt" : "(Required but maybe built-in PHP)",
-        "ext-soap": "Native SOAP",
+		"ext-openssl" : "Secure connections (Emails, SOAP\u2026)",
-        "ext-zip": "ODT and Excel support",
+		"ext-mbstring" : "Handle non UTF-8 databases",
-        "ext-xml": "Excel support",
+		"ext-soap" : "Native SOAP",
-        "firephp/firephp-core": "Logging to Firebug console support"
+		"ext-zip" : "ODT and Excel support",
-    }
+		"ext-xml" : "Excel support",
+		"firephp/firephp-core" : "Logging to Firebug console support"
+	}
 }

composer.lock

@@ -4,9 +4,59 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "c586663818e933f26657871d86d01dc6",
+    "content-hash": "949d55d933c4e0725a2086a189595483",
-    "content-hash": "09e891bb978d35a48902a5f57760aee9",
     "packages": [
+        {
+            "name": "atgp/factur-x",
+            "version": "v1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/atgp/factur-x.git",
+                "reference": "22e22c3b5dfbb0f25afbd7c3fe69a0305199414c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/atgp/factur-x/zipball/22e22c3b5dfbb0f25afbd7c3fe69a0305199414c",
+                "reference": "22e22c3b5dfbb0f25afbd7c3fe69a0305199414c",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-fileinfo": "*",
+                "ext-libxml": "*",
+                "ext-simplexml": "*",
+                "ext-zlib": "*",
+                "php": ">=5.6",
+                "setasign/fpdi-fpdf": "^2.0",
+                "smalot/pdfparser": "^0.13.2"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Atgp\\FacturX\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Lucas Gouy-Pailler",
+                    "email": "lucas.gouypailler@atgp.net"
+                }
+            ],
+            "description": "PHP library to manage your Factur-X / ZUGFeRD 2.0 PDF invoices files",
+            "keywords": [
+                "ZUGFeRD",
+                "factur-x",
+                "invoice",
+                "pdf",
+                "php",
+                "xml"
+            ],
+            "time": "2019-01-16T10:09:35+00:00"
+        },
         {
             "name": "ccampbell/chromephp",
             "version": "4.1.0",
@@ -48,20 +98,20 @@
                 "log",
                 "logging"
             ],
-            "time": "2013-06-26 03:44:33"
+            "time": "2013-06-26T03:44:33+00:00"
         },
         {
             "name": "ckeditor/ckeditor",
-            "version": "4.5.11",
+            "version": "4.6.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ckeditor/ckeditor-releases.git",
-                "reference": "48155a1e1c7e84736b5a166ad3f33acea2a51255"
+                "reference": "268078ab43195b6004d64bc8764c41f2f829640e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ckeditor/ckeditor-releases/zipball/48155a1e1c7e84736b5a166ad3f33acea2a51255",
+                "url": "https://api.github.com/repos/ckeditor/ckeditor-releases/zipball/268078ab43195b6004d64bc8764c41f2f829640e",
-                "reference": "48155a1e1c7e84736b5a166ad3f33acea2a51255",
+                "reference": "268078ab43195b6004d64bc8764c41f2f829640e",
                 "shasum": ""
             },
             "type": "library",
@@ -89,7 +139,7 @@
                 "text",
                 "wysiwyg"
             ],
-            "time": "2016-09-07 13:32:39"
+            "time": "2017-01-12T17:36:48+00:00"
         },
         {
             "name": "mike42/escpos-php",
@@ -153,7 +203,7 @@
                 "print",
                 "receipt"
             ],
-            "time": "2016-04-25 01:14:07"
+            "time": "2016-04-25T01:14:07+00:00"
         },
         {
             "name": "mobiledetect/mobiledetectlib",
@@ -207,7 +257,7 @@
                 "mobile detector",
                 "php mobile detect"
             ],
-            "time": "2015-09-17 14:45:21"
+            "time": "2015-09-17T14:45:21+00:00"
         },
         {
             "name": "phpoffice/phpexcel",
@@ -264,7 +314,8 @@
                 "xls",
                 "xlsx"
             ],
-            "time": "2015-05-01 07:00:55"
+            "abandoned": "phpoffice/phpspreadsheet",
+            "time": "2015-05-01T07:00:55+00:00"
         },
         {
             "name": "restler/framework",
@@ -273,12 +324,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/Luracast/Restler-Framework.git",
-                "reference": "3388d76e73a81f871ce5baa906271071b12cd17f"
+                "reference": "6bc0968f8c8aa47c9a62d548b9d7e34f1ed4fc09"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Luracast/Restler-Framework/zipball/3388d76e73a81f871ce5baa906271071b12cd17f",
+                "url": "https://api.github.com/repos/Luracast/Restler-Framework/zipball/6bc0968f8c8aa47c9a62d548b9d7e34f1ed4fc09",
-                "reference": "3388d76e73a81f871ce5baa906271071b12cd17f",
+                "reference": "6bc0968f8c8aa47c9a62d548b9d7e34f1ed4fc09",
                 "shasum": ""
             },
             "require": {
@@ -325,20 +376,209 @@
                 "rest",
                 "server"
             ],
-            "time": "2016-06-21 12:42:18"
+            "time": "2018-01-06T01:39:27+00:00"
         },
         {
-            "name": "tecnickcom/tcpdf",
+            "name": "setasign/fpdf",
-            "version": "6.2.12",
+            "version": "1.8.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/tecnickcom/TCPDF.git",
+                "url": "https://github.com/Setasign/FPDF.git",
-                "reference": "2f732eaa91b5665274689b1d40b285a7bacdc37f"
+                "reference": "2c68c9e6c034ac3187d25968790139a73184cdb1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/2f732eaa91b5665274689b1d40b285a7bacdc37f",
+                "url": "https://api.github.com/repos/Setasign/FPDF/zipball/2c68c9e6c034ac3187d25968790139a73184cdb1",
-                "reference": "2f732eaa91b5665274689b1d40b285a7bacdc37f",
+                "reference": "2c68c9e6c034ac3187d25968790139a73184cdb1",
+                "shasum": ""
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "fpdf.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "no usage restriction"
+            ],
+            "authors": [
+                {
+                    "name": "Olivier Plathey",
+                    "email": "oliver@fpdf.org",
+                    "homepage": "http://fpdf.org/"
+                }
+            ],
+            "description": "FPDF is a PHP class which allows to generate PDF files with pure PHP. F from FPDF stands for Free: you may use it for any kind of usage and modify it to suit your needs.",
+            "homepage": "http://www.fpdf.org",
+            "keywords": [
+                "fpdf",
+                "pdf"
+            ],
+            "time": "2016-01-01T17:47:15+00:00"
+        },
+        {
+            "name": "setasign/fpdi",
+            "version": "v2.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Setasign/FPDI.git",
+                "reference": "3c266002f8044f61b17329f7cd702d44d73f0f7f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Setasign/FPDI/zipball/3c266002f8044f61b17329f7cd702d44d73f0f7f",
+                "reference": "3c266002f8044f61b17329f7cd702d44d73f0f7f",
+                "shasum": ""
+            },
+            "require": {
+                "ext-zlib": "*",
+                "php": "^5.6 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~5.7",
+                "setasign/fpdf": "~1.8",
+                "setasign/tfpdf": "1.25",
+                "tecnickcom/tcpdf": "~6.2"
+            },
+            "suggest": {
+                "setasign/fpdf": "FPDI will extend this class but as it is also possible to use TCPDF or tFPDF as an alternative. There's no fixed dependency configured.",
+                "setasign/fpdi-fpdf": "Use this package to automatically evaluate dependencies to FPDF.",
+                "setasign/fpdi-tcpdf": "Use this package to automatically evaluate dependencies to TCPDF.",
+                "setasign/fpdi-tfpdf": "Use this package to automatically evaluate dependencies to tFPDF."
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "setasign\\Fpdi\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jan Slabon",
+                    "email": "jan.slabon@setasign.com",
+                    "homepage": "https://www.setasign.com"
+                },
+                {
+                    "name": "Maximilian Kresse",
+                    "email": "maximilian.kresse@setasign.com",
+                    "homepage": "https://www.setasign.com"
+                }
+            ],
+            "description": "FPDI is a collection of PHP classes facilitating developers to read pages from existing PDF documents and use them as templates in FPDF. Because it is also possible to use FPDI with TCPDF, there are no fixed dependencies defined. Please see suggestions for packages which evaluates the dependencies automatically.",
+            "homepage": "https://www.setasign.com/fpdi",
+            "keywords": [
+                "fpdf",
+                "fpdi",
+                "pdf"
+            ],
+            "time": "2019-01-30T14:11:19+00:00"
+        },
+        {
+            "name": "setasign/fpdi-fpdf",
+            "version": "v2.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Setasign/FPDI-FPDF.git",
+                "reference": "e4363ac09e1b766b38ebea1c3cbe82b3480a11e9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Setasign/FPDI-FPDF/zipball/e4363ac09e1b766b38ebea1c3cbe82b3480a11e9",
+                "reference": "e4363ac09e1b766b38ebea1c3cbe82b3480a11e9",
+                "shasum": ""
+            },
+            "require": {
+                "setasign/fpdf": "^1.8",
+                "setasign/fpdi": "^2.2"
+            },
+            "type": "library",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jan Slabon",
+                    "email": "jan.slabon@setasign.com",
+                    "homepage": "https://www.setasign.com"
+                }
+            ],
+            "description": "Kind of metadata package for dependencies of the latest versions of FPDI and FPDF.",
+            "homepage": "https://www.setasign.com/fpdi",
+            "keywords": [
+                "fpdf",
+                "fpdi",
+                "pdf"
+            ],
+            "time": "2019-01-30T14:38:19+00:00"
+        },
+        {
+            "name": "smalot/pdfparser",
+            "version": "v0.13.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/smalot/pdfparser.git",
+                "reference": "c3a050fb9b47ec3a0ce1b6f1b6f48ec822ba04d6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/smalot/pdfparser/zipball/c3a050fb9b47ec3a0ce1b6f1b6f48ec822ba04d6",
+                "reference": "c3a050fb9b47ec3a0ce1b6f1b6f48ec822ba04d6",
+                "shasum": ""
+            },
+            "require": {
+                "ext-mbstring": "*",
+                "ext-zlib": "*",
+                "php": ">=5.3.0",
+                "tecnickcom/tcpdf": "~6.0"
+            },
+            "require-dev": {
+                "atoum/atoum": "^2.8 | ^3.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Smalot\\PdfParser\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-3.0"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastien MALOT",
+                    "email": "sebastien@malot.fr"
+                }
+            ],
+            "description": "Pdf parser library. Can read and extract information from pdf file.",
+            "homepage": "http://www.pdfparser.org",
+            "keywords": [
+                "extract",
+                "parse",
+                "parser",
+                "pdf",
+                "text"
+            ],
+            "time": "2019-01-11T08:49:57+00:00"
+        },
+        {
+            "name": "tecnickcom/tcpdf",
+            "version": "6.2.26",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/tecnickcom/TCPDF.git",
+                "reference": "367241059ca166e3a76490f4448c284e0a161f15"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/367241059ca166e3a76490f4448c284e0a161f15",
+                "reference": "367241059ca166e3a76490f4448c284e0a161f15",
                 "shasum": ""
             },
             "require": {
@@ -347,7 +587,6 @@
             "type": "library",
             "autoload": {
                 "classmap": [
-                    "fonts",
                     "config",
                     "include",
                     "tcpdf.php",
@@ -368,13 +607,13 @@
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "LGPLv3"
+                "LGPL-3.0"
             ],
             "authors": [
                 {
                     "name": "Nicola Asuni",
                     "email": "info@tecnick.com",
-                    "homepage": "http://nicolaasuni.tecnick.com"
+                    "role": "lead"
                 }
             ],
             "description": "TCPDF is a PHP class for generating PDF documents and barcodes.",
@@ -388,7 +627,7 @@
                 "pdf417",
                 "qrcode"
             ],
-            "time": "2015-09-12 10:08:34"
+            "time": "2018-10-16T17:24:05+00:00"
         }
     ],
     "packages-dev": [
@@ -444,7 +683,7 @@
                 "constructor",
                 "instantiate"
             ],
-            "time": "2015-06-14 21:17:01"
+            "time": "2015-06-14T21:17:01+00:00"
         },
         {
             "name": "jakub-onderka/php-console-color",
@@ -487,7 +726,7 @@
                     "homepage": "http://www.acci.cz"
                 }
             ],
-            "time": "2014-04-08 15:00:19"
+            "time": "2014-04-08T15:00:19+00:00"
         },
         {
             "name": "jakub-onderka/php-console-highlighter",
@@ -531,7 +770,7 @@
                     "homepage": "http://www.acci.cz/"
                 }
             ],
-            "time": "2015-04-20 18:58:01"
+            "time": "2015-04-20T18:58:01+00:00"
         },
         {
             "name": "jakub-onderka/php-parallel-lint",
@@ -578,7 +817,7 @@
             ],
             "description": "This tool check syntax of PHP files about 20x faster than serial check.",
             "homepage": "https://github.com/JakubOnderka/PHP-Parallel-Lint",
-            "time": "2015-12-15 10:42:16"
+            "time": "2015-12-15T10:42:16+00:00"
         },
         {
             "name": "phpdocumentor/reflection-common",
@@ -632,7 +871,7 @@
                 "reflection",
                 "static analysis"
             ],
-            "time": "2015-12-27 11:43:31"
+            "time": "2015-12-27T11:43:31+00:00"
         },
         {
             "name": "phpdocumentor/reflection-docblock",
@@ -677,7 +916,7 @@
                 }
             ],
             "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-            "time": "2016-09-30 07:12:33"
+            "time": "2016-09-30T07:12:33+00:00"
         },
         {
             "name": "phpdocumentor/type-resolver",
@@ -724,7 +963,7 @@
                     "email": "me@mikevanriel.com"
                 }
             ],
-            "time": "2016-06-10 07:14:17"
+            "time": "2016-06-10T07:14:17+00:00"
         },
         {
             "name": "phpspec/prophecy",
@@ -786,7 +1025,7 @@
                 "spy",
                 "stub"
             ],
-            "time": "2016-06-07 08:13:47"
+            "time": "2016-06-07T08:13:47+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -848,7 +1087,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2015-10-06 15:47:00"
+            "time": "2015-10-06T15:47:00+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -895,7 +1134,7 @@
                 "filesystem",
                 "iterator"
             ],
-            "time": "2015-06-21 13:08:43"
+            "time": "2015-06-21T13:08:43+00:00"
         },
         {
             "name": "phpunit/php-text-template",
@@ -936,7 +1175,7 @@
             "keywords": [
                 "template"
             ],
-            "time": "2015-06-21 13:50:34"
+            "time": "2015-06-21T13:50:34+00:00"
         },
         {
             "name": "phpunit/php-timer",
@@ -980,7 +1219,7 @@
             "keywords": [
                 "timer"
             ],
-            "time": "2016-05-12 18:03:57"
+            "time": "2016-05-12T18:03:57+00:00"
         },
         {
             "name": "phpunit/php-token-stream",
@@ -1029,7 +1268,7 @@
             "keywords": [
                 "tokenizer"
             ],
-            "time": "2015-09-15 10:49:45"
+            "time": "2015-09-15T10:49:45+00:00"
         },
         {
             "name": "phpunit/phpunit",
@@ -1101,7 +1340,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2016-07-21 06:48:14"
+            "time": "2016-07-21T06:48:14+00:00"
         },
         {
             "name": "phpunit/phpunit-mock-objects",
@@ -1157,7 +1396,7 @@
                 "mock",
                 "xunit"
             ],
-            "time": "2015-10-02 06:51:40"
+            "time": "2015-10-02T06:51:40+00:00"
         },
         {
             "name": "phpunit/phpunit-selenium",
@@ -1221,7 +1460,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2016-03-01 10:33:56"
+            "time": "2016-03-01T10:33:56+00:00"
         },
         {
             "name": "sebastian/comparator",
@@ -1285,7 +1524,7 @@
                 "compare",
                 "equality"
             ],
-            "time": "2015-07-26 15:48:44"
+            "time": "2015-07-26T15:48:44+00:00"
         },
         {
             "name": "sebastian/diff",
@@ -1337,7 +1576,7 @@
             "keywords": [
                 "diff"
             ],
-            "time": "2015-12-08 07:14:41"
+            "time": "2015-12-08T07:14:41+00:00"
         },
         {
             "name": "sebastian/environment",
@@ -1387,7 +1626,7 @@
                 "environment",
                 "hhvm"
             ],
-            "time": "2016-08-18 05:49:44"
+            "time": "2016-08-18T05:49:44+00:00"
         },
         {
             "name": "sebastian/exporter",
@@ -1454,7 +1693,7 @@
                 "export",
                 "exporter"
             ],
-            "time": "2016-06-17 09:04:28"
+            "time": "2016-06-17T09:04:28+00:00"
         },
         {
             "name": "sebastian/global-state",
@@ -1505,7 +1744,7 @@
             "keywords": [
                 "global state"
             ],
-            "time": "2015-10-12 03:26:01"
+            "time": "2015-10-12T03:26:01+00:00"
         },
         {
             "name": "sebastian/recursion-context",
@@ -1558,7 +1797,7 @@
             ],
             "description": "Provides functionality to recursively process PHP variables",
             "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-            "time": "2015-11-11 19:50:13"
+            "time": "2015-11-11T19:50:13+00:00"
         },
         {
             "name": "sebastian/version",
@@ -1593,7 +1832,7 @@
             ],
             "description": "Library that helps with managing the version number of Git-hosted PHP projects",
             "homepage": "https://github.com/sebastianbergmann/version",
-            "time": "2015-06-21 13:59:46"
+            "time": "2015-06-21T13:59:46+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",
@@ -1671,7 +1910,7 @@
                 "phpcs",
                 "standards"
             ],
-            "time": "2016-09-01 23:53:02"
+            "time": "2016-09-01T23:53:02+00:00"
         },
         {
             "name": "symfony/yaml",
@@ -1720,7 +1959,7 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
-            "time": "2016-10-24 18:41:13"
+            "time": "2016-10-24T18:41:13+00:00"
         },
         {
             "name": "webmozart/assert",
@@ -1770,7 +2009,7 @@
                 "check",
                 "validate"
             ],
-            "time": "2016-08-09 15:02:57"
+            "time": "2016-08-09T15:02:57+00:00"
         }
     ],
     "aliases": [],

dev/dolibarr_changes.txt

@@ -41,30 +41,6 @@ define('QR_FIND_FROM_RANDOM', false);
 
 * Removed useless directories ("examples", "tools")
 
-* Fix
- 	// initialize subsetchars
-	$subsetchars = array();
-into
-	// initialize subsetchars
-	$subsetchars = array_fill(0, 256, true);
-
-* Replace the continue into switch with a break:
-
-case 're': {
-	// justify block
-	if (!TCPDF_STATIC::empty_string($this->lispacer)) {
-		$this->lispacer = '';
-		continue;
-	}
-
-into 
-case 're': {
-	// justify block
-	if (!TCPDF_STATIC::empty_string($this->lispacer)) {
-		$this->lispacer = '';
-		break;
-	}
-
 * Optionnaly, removed all fonts except 
     dejavusans* (used by greek, arab, persan, romanian, turkish), 
     freemono* (russian), 
@@ -72,7 +48,7 @@ case 're': {
     helvetica* (all other languages),
     zapfdingbats.php (for special chars like form checkboxes)
 
-* Optionnaly, made freemono the default monotype font because we removed courier
+* Optionnaly, made freemono the default monotype font if we removed courier
 In htdocs/includes/tcpdf/tcpdf.php
 -       protected $default_monospaced_font = 'courier';
 +       protected $default_monospaced_font = 'freemono';
@@ -133,6 +109,13 @@ JQUERYFILETREE:
 * Remove directory htdocs/includes/jquery/plugins/jqueryFileTree/connectors
 
 
+PHPEXCEL:
+---------
+* Replace in htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE.php
+    continue;
+with:
+    continue 2;
+
 
 RESTLER:
 --------
@@ -149,7 +132,7 @@ to get
         if ($className == 'Luracast\Restler\mixed') return;
 		...
 
-Change also file Luracast/Restler/explorer/index.html
+Change also content of file htdocs/includes/restler/framework/Luracast/Restler/explorer/index.html
 
 +With swagger 2:
 

dev/examples/ical/event_recu.txt

@@ -1,7 +1,7 @@
 Example fo recurring event, 1 week, no end, exported by Google
 
 # The recurring event were recorded every monday the 20150518. This is the Recurrence-id, but then
-# first occurence was moved on tuesday. So this record were added.
+# first occurrence was moved on tuesday. So this record were added.
 BEGIN:VEVENT
 DTSTART;TZID=Europe/Paris:20150519T100000
 DTEND;TZID=Europe/Paris:20150519T110000

dev/examples/mail/README

@@ -1,5 +1,5 @@
 README (English)
 --------------------------------
 
-This directory contains example of well formated mail messages.
+This directory contains example of well formatted mail messages.
 This is to help to build the CMailFile.class.php code.

dev/initdata/generate-order.php

@@ -189,7 +189,7 @@ for ($s = 0 ; $s < GEN_NUMBER_COMMANDE ; $s++)
             $prodid = mt_rand(1, $num_prods);
             $product=new Product($db);
             $result=$product->fetch($prodids[$prodid]);
-            $result=$object->addline($product->description, $product->price, mt_rand(1, 5), 0, 0, 0, $prodids[$prodid], 0, 0, 0,  $product->price_base_type, $product->price_ttc, '', '', $product->type);
+            $result=$object->addline($product->description, $product->price, mt_rand(1, 5), 0, 0, 0, $prodids[$prodid], 0, 0, 0, $product->price_base_type, $product->price_ttc, '', '', $product->type);
             if ($result <= 0)
             {
                 dol_print_error($db, $object->error);

dev/initdata/import-products.php

@@ -93,7 +93,7 @@ if (! $confirmed)
     $input = trim(fgets(STDIN));
 }
 
-// Open input and ouput files
+// Open input and output files
 $fhandle = fopen($filepath, 'r');
 if (! $fhandle)
 {

dev/initdata/import-thirdparties.php

@@ -93,7 +93,7 @@ if (! $confirmed)
     $input = trim(fgets(STDIN));
 }
 
-// Open input and ouput files
+// Open input and output files
 $fhandle = fopen($filepath, 'r');
 if (! $fhandle)
 {

dev/initdata/import-users.php

@@ -93,7 +93,7 @@ if (! $confirmed)
     $input = trim(fgets(STDIN));
 }
 
-// Open input and ouput files
+// Open input and output files
 $fhandle = fopen($filepath, 'r');
 if (! $fhandle)
 {

dev/resources/facturx-zugferd/README.txt

@@ -0,0 +1 @@
+See https://github.com/atgp/factur-x

dev/setup/codesniffer/ruleset.xml

@@ -118,9 +118,6 @@
 	<rule ref="Generic.Functions.FunctionCallArgumentSpacing.NoSpaceAfterEquals">
 		<severity>0</severity>
 	</rule>
-	<rule ref="Generic.Functions.FunctionCallArgumentSpacing.TooMuchSpaceAfterComma">
-		<severity>0</severity>
-	</rule>
 
     <!-- Tweaks to metrics -->
     <rule ref="Generic.Metrics.CyclomaticComplexity">
@@ -166,7 +163,7 @@
 	<!-- Disallow usage of tab -->
 	<!--  <rule ref="Generic.WhiteSpace.DisallowTabIndent" /> -->
 
-	<!-- Check indent are done with spaces and wiht correct number -->
+	<!-- Check indent are done with spaces and with correct number -->
 	<!-- Disabled as this does not support tab -->
 	<!-- <rule ref="Generic.WhiteSpace.ScopeIndent" /> -->
 
@@ -348,12 +345,6 @@
 	</rule>
     <rule ref="PEAR.Functions.FunctionCallSignature.SpaceBeforeOpenBracket">
         <severity>0</severity>
-    </rule>
-	<rule ref="PEAR.Functions.FunctionCallSignature.SpaceAfterOpenBracket">
-        <severity>0</severity>
-    </rule>
-    <rule ref="PEAR.Functions.FunctionCallSignature.SpaceBeforeCloseBracket">
-        <severity>0</severity>
     </rule>
     <rule ref="PEAR.Functions.FunctionCallSignature.SpaceAfterCloseBracket">
         <severity>0</severity>

dev/translation/README

@@ -4,7 +4,7 @@ This directory contains tools to generate translation files for a new
 languages or to update translation files for existing languages.
 See Dolibarr Wiki page:
 http://wiki.dolibarr.org/index.php/Translator_documentation
-For more informations on how to use them.
+For more information on how to use them.
 
 To install transifex client:
 sudo pip install --upgrade transifex-client

htdocs/accountancy/admin/productaccount.php

@@ -188,7 +188,7 @@ if ($action == 'update') {
 
 $form = new FormAccounting($db);
 
-// Defaut AccountingAccount RowId Product / Service
+// Default AccountingAccount RowId Product / Service
 // at this time ACCOUNTING_SERVICE_SOLD_ACCOUNT & ACCOUNTING_PRODUCT_SOLD_ACCOUNT are account number not accountingacount rowid
 // so we need to get those default value rowid first
 $accounting = new AccountingAccount($db);

htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php

@@ -173,7 +173,7 @@ while ($obj = $db->fetch_object($resql)) {
 
 $sql.= $db->plimit($limit+1, $offset);
 
-dol_syslog ( "/accountancy/bookkeeping/thirdparty_lettrage_supplier.php", LOG_DEBUG );
+dol_syslog ("/accountancy/bookkeeping/thirdparty_lettrage_supplier.php", LOG_DEBUG);
 $resql = $db->query($sql);
 if (! $resql)
 {
@@ -183,7 +183,7 @@ if (! $resql)
 
 $num = $db->num_rows($resql);
 
-dol_syslog ( "/accountancy/bookkeeping/thirdparty_lettrage_supplier.php", LOG_DEBUG );
+dol_syslog ("/accountancy/bookkeeping/thirdparty_lettrage_supplier.php", LOG_DEBUG);
 $resql = $db->query($sql);
 if ($resql) {
 	$num = $db->num_rows($resql);

htdocs/accountancy/class/accountancyexport.class.php

@@ -475,7 +475,7 @@ class AccountancyExport
 			// elarifr:  date format must be fixed format : 6 char ddmmyy = %d%m%yand not defined by user / dolibarr setting
 			if (! empty($data->date_echeance))
 				//$Tab['date_echeance'] = dol_print_date($data->date_echeance, $conf->global->ACCOUNTING_EXPORT_DATE);
-				$Tab['date_echeance'] = dol_print_date($data->date_echeance,  '%d%m%y' );	 // elarifr:  format must be ddmmyy
+				$Tab['date_echeance'] = dol_print_date($data->date_echeance, '%d%m%y');	 // elarifr:  format must be ddmmyy
 			else
 				$Tab['date_echeance'] = '000000';
 

htdocs/accountancy/class/bookkeeping.class.php

@@ -226,7 +226,7 @@ class BookKeeping extends CommonObject
 			$langs->loadLangs(array("errors"));
 			if (in_array($this->doc_type, array('bank', 'expense_report')))
 			{
-				$this->errors[]=$langs->trans('ErrorFieldAccountNotDefinedForBankLine', $this->fk_docdet,  $this->doc_type);
+				$this->errors[]=$langs->trans('ErrorFieldAccountNotDefinedForBankLine', $this->fk_docdet, $this->doc_type);
 			}
 			else
 			{
@@ -248,7 +248,7 @@ class BookKeeping extends CommonObject
 
 		// First check if line not yet already in bookkeeping.
 		// Note that we must include doc_type - fk_doc - numero_compte - label to be sure to have unicity of line (we may have several lines
-		// with same doc_type, fk_odc, numero_compte for 1 invoice line when using localtaxes with same account)
+		// with same doc_type, fk_doc, numero_compte for 1 invoice line when using localtaxes with same account)
 		// WARNING: This is not reliable, label may have been modified. This is just a small protection.
 		// The page to make journalization make the test on couple doc_type - fk_doc only.
 		$sql = "SELECT count(*) as nb";
@@ -1700,11 +1700,11 @@ class BookKeeping extends CommonObject
 				$error++;
 			}
 			$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element.'(doc_date, doc_type,';
-			$sql .= ' doc_ref, fk_doc, fk_docdet, thirdparty_code, subledger_account, subledger_label,';
+			$sql .= ' doc_ref, fk_doc, fk_docdet, entity, thirdparty_code, subledger_account, subledger_label,';
 			$sql .= ' numero_compte, label_compte, label_operation, debit, credit,';
 			$sql .= ' montant, sens, fk_user_author, import_key, code_journal, journal_label, piece_num)';
 			$sql .= 'SELECT doc_date, doc_type,';
-			$sql .= ' doc_ref, fk_doc, fk_docdet, thirdparty_code, subledger_account, subledger_label,';
+			$sql .= ' doc_ref, fk_doc, fk_docdet, entity, thirdparty_code, subledger_account, subledger_label,';
 			$sql .= ' numero_compte, label_compte, label_operation, debit, credit,';
 			$sql .= ' montant, sens, fk_user_author, import_key, code_journal, journal_label, '.$next_piecenum.'';
 			$sql .= ' FROM '.MAIN_DB_PREFIX . $this->table_element.'_tmp WHERE piece_num = '.$piece_num;

htdocs/accountancy/journal/purchasesjournal.php

@@ -633,12 +633,12 @@ if ($action == 'exportcsv') {		// ISO and not UTF8 !
 				print '"' . $key . '"' . $sep;
 				print '"' . $date . '"' . $sep;
 				print '"' . $val["refsologest"] . '"' . $sep;
-				print '"' . utf8_decode ( dol_trunc($companystatic->name, 32) ). '"' . $sep;
+				print '"' . utf8_decode (dol_trunc($companystatic->name, 32)). '"' . $sep;
 				print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
 				print '"' . $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER . '"' . $sep;
 				print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
 				print '"' . $langs->trans("Thirdparty") . '"' . $sep;
-				print '"' . utf8_decode ( dol_trunc($companystatic->name, 16) ) . ' - ' . $val["refsuppliersologest"] . ' - ' . $langs->trans("Thirdparty") . '"' . $sep;
+				print '"' . utf8_decode (dol_trunc($companystatic->name, 16)) . ' - ' . $val["refsuppliersologest"] . ' - ' . $langs->trans("Thirdparty") . '"' . $sep;
 				print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
 				print '"' . ($mt >= 0 ? price($mt) : '') . '"'. $sep;
 				print '"' . $journal . '"' ;
@@ -654,12 +654,12 @@ if ($action == 'exportcsv') {		// ISO and not UTF8 !
 				print '"' . $key . '"' . $sep;
 				print '"' . $date . '"' . $sep;
 				print '"' . $val["refsologest"] . '"' . $sep;
-				print '"' . utf8_decode ( dol_trunc($companystatic->name, 32) ) . '"' . $sep;
+				print '"' . utf8_decode (dol_trunc($companystatic->name, 32)) . '"' . $sep;
 				print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
 				print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
 				print '""' . $sep;
-				print '"' . utf8_decode ( dol_trunc($accountingaccount->label, 32) ) . '"' . $sep;
+				print '"' . utf8_decode (dol_trunc($accountingaccount->label, 32)) . '"' . $sep;
-				print '"' . utf8_decode ( dol_trunc($companystatic->name, 16) ) . ' - ' . $val["refsuppliersologest"] . ' - ' . dol_trunc($accountingaccount->label, 32) . '"' . $sep;
+				print '"' . utf8_decode (dol_trunc($companystatic->name, 16)) . ' - ' . $val["refsuppliersologest"] . ' - ' . dol_trunc($accountingaccount->label, 32) . '"' . $sep;
 				print '"' . ($mt >= 0 ? price($mt) : '') . '"' . $sep;
 				print '"' . ($mt < 0 ? price(- $mt) : '') . '"'. $sep;
 				print '"' . $journal . '"' ;
@@ -679,12 +679,12 @@ if ($action == 'exportcsv') {		// ISO and not UTF8 !
 					print '"' . $key . '"' . $sep;
 					print '"' . $date . '"' . $sep;
 					print '"' . $val["refsologest"] . '"' . $sep;
-					print '"' . utf8_decode ( dol_trunc($companystatic->name, 32) ) . '"' . $sep;
+					print '"' . utf8_decode (dol_trunc($companystatic->name, 32)) . '"' . $sep;
 					print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
 					print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
 					print '""' . $sep;
 					print '"' . $langs->trans("VAT") . ' - ' . $def_tva[$key] . '"' . $sep;
-					print '"' . utf8_decode(dol_trunc($companystatic->name, 16) ) . ' - ' . $val["refsuppliersologest"] . ' - ' . $langs->trans("VAT") . join(', ', $def_tva[$key][$k]) .' %' . ($numtax?' - Localtax '.$numtax:'') . '"' . $sep;
+					print '"' . utf8_decode(dol_trunc($companystatic->name, 16)) . ' - ' . $val["refsuppliersologest"] . ' - ' . $langs->trans("VAT") . join(', ', $def_tva[$key][$k]) .' %' . ($numtax?' - Localtax '.$numtax:'') . '"' . $sep;
 					print '"' . ($mt >= 0 ? price($mt) : '') . '"' . $sep;
 					print '"' . ($mt < 0 ? price(- $mt) : '') . '"'. $sep;
 					print '"' . $journal . '"' ;
@@ -700,12 +700,12 @@ if ($action == 'exportcsv') {		// ISO and not UTF8 !
 						print '"' . $key . '"' . $sep;
 						print '"' . $date . '"' . $sep;
 						print '"' . $val["refsologest"] . '"' . $sep;
-						print '"' . utf8_decode ( dol_trunc($companystatic->name, 32) ). '"' . $sep;
+						print '"' . utf8_decode (dol_trunc($companystatic->name, 32)). '"' . $sep;
 						print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
 						print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
 						print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
 						print '"' . $langs->trans("Thirdparty") . '"' . $sep;
-						print '"' . utf8_decode ( dol_trunc($companystatic->name, 16) ) . ' - ' . $val["refsuppliersologest"] . ' - ' . $langs->trans("VAT") . ' NPR"' . $sep;
+						print '"' . utf8_decode (dol_trunc($companystatic->name, 16)) . ' - ' . $val["refsuppliersologest"] . ' - ' . $langs->trans("VAT") . ' NPR"' . $sep;
 						print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
 						print '"' . ($mt >= 0 ? price($mt) : '') . '"'. $sep;
 						print '"' . $journal . '"' ;

htdocs/adherents/card.php

@@ -1297,7 +1297,7 @@ else
 		print "</td></tr>\n";
 
 		// Categories
-		if (! empty( $conf->categorie->enabled ) && !empty( $user->rights->categorie->lire ))
+		if (! empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire))
 		{
 			print '<tr><td>' . $form->editfieldkey("Categories", 'memcats', '', $object, 0) . '</td>';
 			print '<td>';

htdocs/adherents/type.php

@@ -608,7 +608,7 @@ if ($rowid > 0)
 			print "</tr>\n";
 
 			print '<tr class="liste_titre">';
-		    print_liste_field_titre( $langs->trans("Name")." / ".$langs->trans("Company"), $_SERVER["PHP_SELF"], "d.lastname", $param, "", "", $sortfield, $sortorder);
+            print_liste_field_titre("NameSlashCompany", $_SERVER["PHP_SELF"], "d.lastname", $param, "", "", $sortfield, $sortorder);
 		    print_liste_field_titre("Login", $_SERVER["PHP_SELF"], "d.login", $param, "", "", $sortfield, $sortorder);
 		    print_liste_field_titre("Nature", $_SERVER["PHP_SELF"], "d.morphy", $param, "", "", $sortfield, $sortorder);
 		    print_liste_field_titre("EMail", $_SERVER["PHP_SELF"], "d.email", $param, "", "", $sortfield, $sortorder);

htdocs/admin/company.php

@@ -493,7 +493,7 @@ if ($action == 'edit' || $action == 'updateedit')
 		print '<tr class="oddeven"><td><label for="profid2">'.$langs->transcountry("ProfId2", $mysoc->country_code).'</label></td><td>';
 		if (! empty($mysoc->country_code))
 		{
-			print '<input name="siret" id="profid2" class="minwidth200" value="' . dol_escape_htmltag(! empty($conf->global->MAIN_INFO_SIRET) ? $conf->global->MAIN_INFO_SIRET : '' ) . '">';
+			print '<input name="siret" id="profid2" class="minwidth200" value="' . dol_escape_htmltag(! empty($conf->global->MAIN_INFO_SIRET) ? $conf->global->MAIN_INFO_SIRET : '') . '">';
 		}
 		else
 		{

htdocs/admin/defaultvalues.php

@@ -352,7 +352,6 @@ if ($result)
 	{
 		$obj = $db->fetch_object($result);
 
-
 		print "\n";
 
 		print '<tr class="oddeven">';
@@ -383,10 +382,7 @@ if ($result)
     		print '</td>';
 		}
 
-		if (! empty($conf->multicompany->enabled) && !$user->entity)
+	    print '<td></td>';
-		{
-		    print '<td></td>';
-		}
 
 		// Actions
 		print '<td align="center">';
@@ -416,7 +412,6 @@ else
     dol_print_error($db);
 }
 
-
 print '</table>';
 print '</div>';
 

htdocs/admin/dolistore/class/dolistore.class.php

@@ -262,20 +262,20 @@ class Dolistore
 			if ($this->version_compare($product->dolibarr_min, DOL_VERSION) <= 0) {
 				if ($this->version_compare($product->dolibarr_max, DOL_VERSION) >= 0) {
 					//compatible
-					$version    = '<span class="compatible">'.$langs->trans('CompatibleUpTo', $product->dolibarr_max,
+                    $version = '<span class="compatible">'.$langs->trans('CompatibleUpTo', $product->dolibarr_max,
 						$product->dolibarr_min, $product->dolibarr_max).'</span>';
-						$compatible = '';
+					$compatible = '';
 				} else {
 					//never compatible, module expired
-					$version    = '<span class="notcompatible">'.$langs->trans('NotCompatible', DOL_VERSION,
+                    $version = '<span class="notcompatible">'.$langs->trans('NotCompatible', DOL_VERSION,
 						$product->dolibarr_min, $product->dolibarr_max).'</span>';
-						$compatible = 'NotCompatible';
+					$compatible = 'NotCompatible';
 				}
 			} else {
 				//need update
 				$version    = '<span class="compatibleafterupdate">'.$langs->trans('CompatibleAfterUpdate', DOL_VERSION,
 					$product->dolibarr_min, $product->dolibarr_max).'</span>';
-					$compatible = 'NotCompatible';
+				$compatible = 'NotCompatible';
 			}
 
 			//.'<br><a class="inline-block valignmiddle" target="_blank" href="'.$this->shop_url.$product->id.'"><span class="details button">'.$langs->trans("SeeInMarkerPlace").'</span></a>

htdocs/admin/fichinter.php

@@ -207,7 +207,7 @@ elseif ($action == 'set_FICHINTER_PRINT_PRODUCTS')
     }
 } elseif ($action == 'set_FICHINTER_USE_SERVICE_DURATION') {
 	$val = GETPOST('FICHINTER_USE_SERVICE_DURATION', 'alpha');
-	$res = dolibarr_set_const($db, "FICHINTER_USE_SERVICE_DURATION", ($val == 'on' ? 1 : 0), 'bool', 0, '',
+$res = dolibarr_set_const($db, "FICHINTER_USE_SERVICE_DURATION", ($val == 'on' ? 1 : 0), 'bool', 0, '',
 		$conf->entity);
 
 	if (!$res > 0) {

htdocs/admin/menus/index.php

@@ -2,6 +2,7 @@
 /* Copyright (C) 2007      Patrick Raguin       <patrick.raguin@gmail.com>
  * Copyright (C) 2007-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2009-2012 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2019       Frédéric France     <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -256,7 +257,7 @@ if ($action == 'delete')
 print '<form name="newmenu" class="nocellnopadd" action="'.$_SERVER["PHP_SELF"].'">';
 print '<input type="hidden" action="change_menu_handler">';
 print $langs->trans("MenuHandler").': ';
-print $formadmin->select_menu_families($menu_handler.(preg_match('/_menu/', $menu_handler)?'':'_menu'), 'menu_handler', array_merge($dirstandard, $dirsmartphone));
+$formadmin->select_menu_families($menu_handler.(preg_match('/_menu/', $menu_handler)?'':'_menu'), 'menu_handler', array_merge($dirstandard, $dirsmartphone));
 print ' &nbsp; <input type="submit" class="button" value="'.$langs->trans("Refresh").'">';
 print '</form>';
 

htdocs/admin/supplier_order.php

@@ -170,7 +170,7 @@ elseif ($action == 'set_SUPPLIER_ORDER_OTHER')
 {
     $freetext = GETPOST('SUPPLIER_ORDER_FREE_TEXT', 'none');	// No alpha here, we want exact string
 	$doubleapproval = GETPOST('SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED', 'alpha');
-	$doubleapproval = price2num($doubleapproval );
+	$doubleapproval = price2num($doubleapproval);
 
     $res1 = dolibarr_set_const($db, "SUPPLIER_ORDER_FREE_TEXT", $freetext, 'chaine', 0, '', $conf->entity);
     $res2 = dolibarr_set_const($db, "SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED", $doubleapproval, 'chaine', 0, '', $conf->entity);

htdocs/admin/translation.php

@@ -281,10 +281,10 @@ if ($mode == 'overwrite')
 	print '<div class="div-table-responsive-no-min">';
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre">';
-    print_liste_field_titre( $langs->trans("Language").' (en_US, es_MX, ...)', $_SERVER["PHP_SELF"], 'lang,transkey', '', $param, '', $sortfield, $sortorder);
+    print_liste_field_titre("Language_en_US_es_MX_etc", $_SERVER["PHP_SELF"], 'lang,transkey', '', $param, '', $sortfield, $sortorder);
     print_liste_field_titre("Key", $_SERVER["PHP_SELF"], 'transkey', '', $param, '', $sortfield, $sortorder);
     print_liste_field_titre("NewTranslationStringToShow", $_SERVER["PHP_SELF"], 'transvalue', '', $param, '', $sortfield, $sortorder);
-    //if (! empty($conf->multicompany->enabled) && !$user->entity) print_liste_field_titre("Entity"),$_SERVER["PHP_SELF"],'entity,transkey','',$param,'',$sortfield,$sortorder);
+    //if (! empty($conf->multicompany->enabled) && !$user->entity) print_liste_field_titre("Entity", $_SERVER["PHP_SELF"], 'entity,transkey', '', $param, '', $sortfield, $sortorder);
     print '<td align="center"></td>';
     print "</tr>\n";
 
@@ -470,10 +470,10 @@ if ($mode == 'searchkey')
 	print '<div class="div-table-responsive-no-min">';
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre">';
-    print_liste_field_titre( $langs->trans("Language").' (en_US, es_MX, ...)', $_SERVER["PHP_SELF"], 'lang,transkey', '', $param, '', $sortfield, $sortorder).'</td>';
+    print_liste_field_titre("Language_en_US_es_MX_etc", $_SERVER["PHP_SELF"], 'lang,transkey', '', $param, '', $sortfield, $sortorder).'</td>';
     print_liste_field_titre("Key", $_SERVER["PHP_SELF"], 'transkey', '', $param, '', $sortfield, $sortorder);
     print_liste_field_titre("CurrentTranslationString", $_SERVER["PHP_SELF"], 'transvalue', '', $param, '', $sortfield, $sortorder);
-    //if (! empty($conf->multicompany->enabled) && !$user->entity) print_liste_field_titre("Entity",$_SERVER["PHP_SELF"],'entity,transkey','',$param,'',$sortfield,$sortorder);
+    //if (! empty($conf->multicompany->enabled) && !$user->entity) print_liste_field_titre("Entity", $_SERVER["PHP_SELF"], 'entity,transkey', '', $param, '', $sortfield, $sortorder);
     print '<td align="center"></td>';
     print "</tr>\n";
 

htdocs/api/README.md

@@ -43,7 +43,7 @@ Develop an API
 
 The API uses Lucarast Restler framework. Please check documentation https://www.luracast.com/products/restler and examples http://help.luracast.com/restler/examples/ 
 
-Github contains also usefull informations : https://github.com/Luracast/Restler
+Github contains also useful information : https://github.com/Luracast/Restler
 
 To implement it into Dolibarr, you need to create a specific class for object we want to use. A skeleton file is available into /modulebuilder/class directory : *api_mymodule_class.class.php* 
 The API class file must be put into object class directory, with specific file name. By example, API class file for '*myobject*' must be put as : /htdocs/*myobject*/class/api_*myobject*.class.php. Class must be named  **MyobjectApi**.
@@ -67,6 +67,6 @@ It is possible to specify url for API methods by simply use the PHPDoc tag **@ur
 **Other Annotations**
 Other annotations are used, you are encouraged to read them : https://github.com/Luracast/Restler/blob/master/ANNOTATIONS.md
 
-PHPDoc tags can also be used to specify variables informations for API. Again, rtfm : https://github.com/Luracast/Restler/blob/master/PARAM.md 
+PHPDoc tags can also be used to specify variables information for API. Again, rtfm : https://github.com/Luracast/Restler/blob/master/PARAM.md 
 
 

htdocs/blockedlog/class/authority.class.php

@@ -161,7 +161,7 @@ class BlockedLogAuthority
 		$sql.= " FROM ".MAIN_DB_PREFIX."blockedlog_authority as b";
 
 		if ($id) $sql.= " WHERE b.rowid = ". $id;
-		elseif($signature)$sql.= " WHERE b.signature = '". $this->db->escape( $signature ) ."'" ;
+		elseif($signature)$sql.= " WHERE b.signature = '". $this->db->escape($signature) ."'" ;
 
 		$resql=$this->db->query($sql);
 		if ($resql)

htdocs/blockedlog/class/blockedlog.class.php

@@ -394,7 +394,7 @@ class BlockedLog
 		// Add more fields to exclude depending on object type
 		if ($this->element == 'cashcontrol')
 		{
-		    $arrayoffieldstoexclude = array_merge($arrayoffieldstoexclude, array(
+    $arrayoffieldstoexclude = array_merge($arrayoffieldstoexclude, array(
 		        'name','lastname','firstname','region','region_id','region_code','state','state_id','state_code','country','country_id','country_code',
 		        'total_ht','total_tva','total_ttc','total_localtax1','total_localtax2',
 		        'barcode_type','barcode_type_code','barcode_type_label','barcode_type_coder','mode_reglement_id','cond_reglement_id','mode_reglement','cond_reglement','shipping_method_id',
@@ -459,7 +459,7 @@ class BlockedLog
 						$lineid++;
 						foreach($tmpline as $keyline => $valueline)
 						{
-							if (! in_array($keyline, array(
+    if (! in_array($keyline, array(
 							'ref','multicurrency_code','multicurrency_total_ht','multicurrency_total_tva','multicurrency_total_ttc','qty','product_type','vat_src_code','tva_tx','info_bits','localtax1_tx','localtax2_tx','total_ht','total_tva','total_ttc','total_localtax1','total_localtax2'
 							))) continue;									// Discard if not into a dedicated list
 
@@ -575,7 +575,7 @@ class BlockedLog
 					foreach($tmpobject->thirdparty as $key=>$value)
 					{
 						if (in_array($key, $arrayoffieldstoexclude)) continue;	// Discard some properties
-						if (! in_array($key, array(
+    if (! in_array($key, array(
 						'name','name_alias','ref_ext','address','zip','town','state_code','country_code','idprof1','idprof2','idprof3','idprof4','idprof5','idprof6','phone','fax','email','barcode',
 						'tva_intra', 'localtax1_assuj', 'localtax1_value', 'localtax2_assuj', 'localtax2_value', 'managers', 'capital', 'typent_code', 'forme_juridique_code', 'code_client', 'code_fournisseur'
 						))) continue;									// Discard if not into a dedicated list
@@ -592,7 +592,7 @@ class BlockedLog
 					foreach($tmpobject as $key=>$value)
 					{
 						if (in_array($key, $arrayoffieldstoexclude)) continue;	// Discard some properties
-						if (! in_array($key, array(
+    if (! in_array($key, array(
 						'ref','ref_client','ref_supplier','date','datef','type','total_ht','total_tva','total_ttc','localtax1','localtax2','revenuestamp','datepointoftax','note_public'
 						))) continue;									// Discard if not into a dedicated list
 						if (!is_object($value))

htdocs/categories/class/categorie.class.php

@@ -701,10 +701,10 @@ class Categorie extends CommonObject
 		// For backward compatibility
 		if ($type == 'societe') {
 			$type = 'customer';
-			dol_syslog( get_class( $this ) . "::del_type(): type 'societe' is deprecated, please use 'customer' instead", LOG_WARNING);
+			dol_syslog(get_class($this) . "::del_type(): type 'societe' is deprecated, please use 'customer' instead", LOG_WARNING);
 		} elseif ($type == 'fournisseur') {
 			$type = 'supplier';
-			dol_syslog( get_class( $this ) . "::del_type(): type 'fournisseur' is deprecated, please use 'supplier' instead", LOG_WARNING);
+			dol_syslog(get_class($this) . "::del_type(): type 'fournisseur' is deprecated, please use 'supplier' instead", LOG_WARNING);
 		}
 
         $this->db->begin();
@@ -758,7 +758,7 @@ class Categorie extends CommonObject
 		$sql = "SELECT c.fk_" . $this->MAP_CAT_FK[$type];
 		$sql .= " FROM " . MAIN_DB_PREFIX . "categorie_" . $this->MAP_CAT_TABLE[$type] . " as c";
 		$sql .= ", " . MAIN_DB_PREFIX . $this->MAP_OBJ_TABLE[$type] . " as o";
-		$sql .= " WHERE o.entity IN (" . getEntity( $obj->element).")";
+		$sql .= " WHERE o.entity IN (" . getEntity($obj->element).")";
 		$sql.= " AND c.fk_categorie = ".$this->id;
 		$sql .= " AND c.fk_" . $this->MAP_CAT_FK[$type] . " = o.rowid";
 
@@ -775,7 +775,7 @@ class Categorie extends CommonObject
 			    else
 			    {
 				    $obj = new $this->MAP_OBJ_CLASS[$type]( $this->db );
-				    $obj->fetch( $rec['fk_' . $this->MAP_CAT_FK[$type]]);
+				    $obj->fetch($rec['fk_' . $this->MAP_CAT_FK[$type]]);
 				    $objs[] = $obj;
 			    }
 			}
@@ -1008,7 +1008,7 @@ class Categorie extends CommonObject
 		if (! empty($conf->global->MAIN_MULTILANGS)) $sql.= ", t.label as label_trans, t.description as description_trans";
 		$sql.= " FROM ".MAIN_DB_PREFIX."categorie as c";
 		if (! empty($conf->global->MAIN_MULTILANGS)) $sql.= " LEFT  JOIN ".MAIN_DB_PREFIX."categorie_lang as t ON t.fk_category=c.rowid AND t.lang='".$current_lang."'";
-		$sql .= " WHERE c.entity IN (" . getEntity( 'category') . ")";
+		$sql .= " WHERE c.entity IN (" . getEntity('category') . ")";
 		$sql .= " AND c.type = " . $type;
 
 		dol_syslog(get_class($this)."::get_full_arbo get category list", LOG_DEBUG);
@@ -1418,7 +1418,7 @@ class Categorie extends CommonObject
     		$sql = "SELECT ct.fk_categorie, c.label, c.rowid";
     		$sql .= " FROM " . MAIN_DB_PREFIX . "categorie_" . $this->MAP_CAT_TABLE[$type] . " as ct, " . MAIN_DB_PREFIX . "categorie as c";
     		$sql .= " WHERE ct.fk_categorie = c.rowid AND ct.fk_" . $this->MAP_CAT_FK[$type] . " = " . (int) $id . " AND c.type = " . $this->MAP_ID[$type];
-    		$sql .= " AND c.entity IN (" . getEntity( 'category') . ")";
+    		$sql .= " AND c.entity IN (" . getEntity('category') . ")";
 
     		$res = $this->db->query($sql);
     		if ($res)
@@ -1470,16 +1470,16 @@ class Categorie extends CommonObject
 		// For backward compatibility
 		if (is_numeric($type)) {
 			// We want to reverse lookup
-			$map_type = array_flip( $this->MAP_ID );
+			$map_type = array_flip($this->MAP_ID);
 			$type = $map_type[$type];
-			dol_syslog( get_class( $this ) . "::rechercher(): numeric types are deprecated, please use string instead",
+dol_syslog( get_class($this) . "::rechercher(): numeric types are deprecated, please use string instead",
 				LOG_WARNING );
 		}
 
 		// Generation requete recherche
 		$sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . "categorie";
 		$sql .= " WHERE type = " . $this->MAP_ID[$type];
-		$sql .= " AND entity IN (" . getEntity( 'category') . ")";
+		$sql .= " AND entity IN (" . getEntity('category') . ")";
 		if ($nom)
 		{
 			if (! $exact)

htdocs/categories/photos.php

@@ -77,7 +77,7 @@ if (isset($_FILES['userfile']) && $_FILES['userfile']['size'] > 0 && $_POST["sen
             {
                 if(empty($file['tmp_name'][$i]) || intval($conf->global->MAIN_UPLOAD_DOC) * 1000 <= filesize($file['tmp_name'][$i]) )
                 {
-                    setEventMessage($file['name'][$i] .' : '. $langs->trans(empty($file['tmp_name'][$i])? 'ErrorFailedToSaveFile' : 'MaxSizeForUploadedFiles' ) );
+                    setEventMessage($file['name'][$i] .' : '. $langs->trans(empty($file['tmp_name'][$i])? 'ErrorFailedToSaveFile' : 'MaxSizeForUploadedFiles'));
                     unset($file['name'][$i], $file['type'][$i], $file['tmp_name'][$i], $file['error'][$i], $file['size'][$i]);
                 }
             }

htdocs/comm/action/class/actioncommreminder.class.php

@@ -58,7 +58,7 @@ class ActionCommReminder extends CommonObject
 	 *  'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only. Using a negative value means field is not shown by default on list but can be selected for viewing)
 	 *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
 	 *  'index' if we want an index in database.
-	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommended to name the field fk_...).
 	 *  'position' is the sort order of field.
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).

htdocs/comm/action/class/ical.class.php

@@ -109,7 +109,7 @@ class ICal
 
         $this->file_text = preg_split("[\n]", $this->file_text);
 
-        // is this text vcalendar standart text ? on line 1 is BEGIN:VCALENDAR
+        // is this text vcalendar standard text ? on line 1 is BEGIN:VCALENDAR
         if (!stristr($this->file_text[0], 'BEGIN:VCALENDAR')) return 'error not VCALENDAR';
 
         $insidealarm=0;

htdocs/comm/card.php

@@ -487,7 +487,7 @@ if ($object->id > 0)
 		$langs->load("categories");
 		print '<tr><td>' . $langs->trans("CustomersCategoriesShort") . '</td>';
 		print '<td>';
-		print $form->showCategories( $object->id, 'customer', 1 );
+		print $form->showCategories($object->id, 'customer', 1);
 		print "</td></tr>";
 	}
 

htdocs/comm/mailing/class/html.formadvtargetemailing.class.php

@@ -64,17 +64,17 @@ class FormAdvTargetEmailing extends Form
 		$sql .= " FROM " . MAIN_DB_PREFIX . "c_prospectlevel";
 		$sql .= " WHERE active > 0";
 		$sql .= " ORDER BY sortorder";
-		dol_syslog ( get_class( $this ) . '::multiselectProspectionStatus sql=' . $sql, LOG_DEBUG );
+		dol_syslog (get_class($this) . '::multiselectProspectionStatus sql=' . $sql, LOG_DEBUG);
-		$resql = $this->db->query( $sql );
+		$resql = $this->db->query($sql);
 		if ($resql) {
-			$num = $this->db->num_rows( $resql );
+			$num = $this->db->num_rows($resql);
 			$i = 0;
 			while ( $i < $num ) {
-				$obj = $this->db->fetch_object( $resql );
+				$obj = $this->db->fetch_object($resql);
 
-				$level = $langs->trans( $obj->code );
+				$level = $langs->trans($obj->code);
 				if ($level == $obj->code)
-					$level = $langs->trans( $obj->label );
+					$level = $langs->trans($obj->label);
 				$options_array[$obj->code] = $level;
 
 				$i ++;
@@ -120,10 +120,10 @@ class FormAdvTargetEmailing extends Form
 				$foundselected = false;
 
 				while ($i < $num) {
-					$obj = $this->db->fetch_object ( $resql );
+					$obj = $this->db->fetch_object ($resql);
 					$countryArray [$i] ['rowid'] = $obj->rowid;
 					$countryArray [$i] ['code_iso'] = $obj->code_iso;
-					$countryArray [$i] ['label'] = ($obj->code_iso && $langs->transnoentitiesnoconv("Country" . $obj->code_iso ) != "Country" . $obj->code_iso ? $langs->transnoentitiesnoconv ( "Country" . $obj->code_iso ) : ($obj->label != '-' ? $obj->label : ''));
+					$countryArray [$i] ['label'] = ($obj->code_iso && $langs->transnoentitiesnoconv("Country" . $obj->code_iso) != "Country" . $obj->code_iso ? $langs->transnoentitiesnoconv ("Country" . $obj->code_iso) : ($obj->label != '-' ? $obj->label : ''));
 					$label[$i] = $countryArray[$i]['label'];
 					$i ++;
 				}
@@ -166,25 +166,25 @@ class FormAdvTargetEmailing extends Form
 		$sql_usr .= " WHERE u2.entity IN (0," . $conf->entity . ")";
 		$sql_usr .= " AND u2.rowid = sc.fk_user ";
 
-		if (! empty ( $conf->global->USER_HIDE_INACTIVE_IN_COMBOBOX ))
+		if (! empty ($conf->global->USER_HIDE_INACTIVE_IN_COMBOBOX))
 			$sql_usr .= " AND u2.statut<>0 ";
 		$sql_usr .= " ORDER BY name ASC";
 		// print $sql_usr;exit;
 
-		$resql_usr = $this->db->query ( $sql_usr );
+		$resql_usr = $this->db->query ($sql_usr);
 		if ($resql_usr) {
-			while ( $obj_usr = $this->db->fetch_object ( $resql_usr ) ) {
+			while ( $obj_usr = $this->db->fetch_object ($resql_usr) ) {
 
 				$label = $obj_usr->firstname . " " . $obj_usr->name . " (" . $obj_usr->login . ')';
 
 				$options_array [$obj_usr->rowid] = $label;
 			}
-			$this->db->free ( $resql_usr );
+			$this->db->free ($resql_usr);
 		} else {
-			dol_print_error ( $this->db );
+			dol_print_error ($this->db);
 		}
 
-		return $this->advMultiselectarray ( $htmlname, $options_array, $selected_array );
+		return $this->advMultiselectarray ($htmlname, $options_array, $selected_array);
 	}
 
 	/**
@@ -227,8 +227,8 @@ class FormAdvTargetEmailing extends Form
 
 		if (is_array($sqlqueryparam))
 		{
-			$param_list = array_keys ( $sqlqueryparam );
+			$param_list = array_keys ($sqlqueryparam);
-			$InfoFieldList = explode ( ":", $param_list [0] );
+			$InfoFieldList = explode (":", $param_list [0]);
 
 			// 0 1 : tableName
 			// 1 2 : label field name Nom du champ contenant le libelle
@@ -237,8 +237,8 @@ class FormAdvTargetEmailing extends Form
 
 			$keyList = 'rowid';
 
-			if (count ( $InfoFieldList ) >= 3) {
+			if (count ($InfoFieldList) >= 3) {
-				if (strpos ( $InfoFieldList [3], 'extra.' ) !== false) {
+				if (strpos ($InfoFieldList [3], 'extra.') !== false) {
 					$keyList = 'main.' . $InfoFieldList [2] . ' as rowid';
 				} else {
 					$keyList = $InfoFieldList [2] . ' as rowid';
@@ -247,10 +247,10 @@ class FormAdvTargetEmailing extends Form
 
 			$sql = 'SELECT ' . $keyList . ', ' . $InfoFieldList [1];
 			$sql .= ' FROM ' . MAIN_DB_PREFIX . $InfoFieldList [0];
-			if (! empty ( $InfoFieldList [3] )) {
+			if (! empty ($InfoFieldList [3])) {
 
 				// We have to join on extrafield table
-				if (strpos ( $InfoFieldList [3], 'extra' ) !== false) {
+				if (strpos ($InfoFieldList [3], 'extra') !== false) {
 					$sql .= ' as main, ' . MAIN_DB_PREFIX . $InfoFieldList [0] . '_extrafields as extra';
 					$sql .= ' WHERE  extra.fk_object=main.' . $InfoFieldList [2] . ' AND ' . $InfoFieldList [3];
 				} else {
@@ -270,13 +270,13 @@ class FormAdvTargetEmailing extends Form
 				$i = 0;
 				if ($num) {
 					while ( $i < $num ) {
-						$obj = $this->db->fetch_object ( $resql );
+						$obj = $this->db->fetch_object ($resql);
-						$labeltoshow = dol_trunc ( $obj->$InfoFieldList [1], 90 );
+						$labeltoshow = dol_trunc ($obj->$InfoFieldList [1], 90);
 						$options_array[$obj->rowid]=$labeltoshow;
 						$i ++;
 					}
 				}
-				$this->db->free ( $resql );
+				$this->db->free ($resql);
 			}
 		}
 
@@ -328,7 +328,7 @@ class FormAdvTargetEmailing extends Form
 			dol_print_error($this->db);
 		}
 
-		return $this->advMultiselectarray ( $htmlname, $options_array, $selected_array );
+		return $this->advMultiselectarray ($htmlname, $options_array, $selected_array);
 	}
 
 	/**
@@ -415,7 +415,7 @@ class FormAdvTargetEmailing extends Form
 			dol_print_error($this->db);
 		}
 
-		return $this->advMultiselectarray( $htmlname, $options_array, $selected_array );
+		return $this->advMultiselectarray($htmlname, $options_array, $selected_array);
 	}
 
 	/**
@@ -438,19 +438,19 @@ class FormAdvTargetEmailing extends Form
 		$sql .= " WHERE type_element='$type_element'";
 		$sql .= " ORDER BY c.name";
 
-		dol_syslog ( get_class ( $this ) . "::".__METHOD__, LOG_DEBUG );
+		dol_syslog (get_class ($this) . "::".__METHOD__, LOG_DEBUG);
-		$resql = $this->db->query ( $sql );
+		$resql = $this->db->query ($sql);
 		if ($resql) {
 
 
 			$out .= '<select id="' . $htmlname . '" class="flat" name="' . $htmlname . '">';
 			if ($showempty)
 				$out .= '<option value=""></option>';
-			$num = $this->db->num_rows ( $resql );
+			$num = $this->db->num_rows ($resql);
 			$i = 0;
 			if ($num) {
 				while ( $i < $num ) {
-					$obj = $this->db->fetch_object ( $resql );
+					$obj = $this->db->fetch_object ($resql);
 					$label = $obj->name;
 					if (empty($label)) {
 						$label=$obj->fk_element;
@@ -466,9 +466,9 @@ class FormAdvTargetEmailing extends Form
 			}
 			$out .= '</select>';
 		} else {
-			dol_print_error ( $this->db );
+			dol_print_error ($this->db);
 		}
-		$this->db->free ( $resql );
+		$this->db->free ($resql);
 		return $out;
 	}
 }

htdocs/comm/mailing/class/mailing.class.php

@@ -528,7 +528,7 @@ class Mailing extends CommonObject
 
 
 	/**
-	 *  Return a link to the object card (with optionaly the picto)
+	 *  Return a link to the object card (with optionally the picto)
 	 *
 	 *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *	@param	string	$option						On what the link point to ('nolink', ...)

htdocs/comm/propal/card.php

@@ -165,7 +165,7 @@ if (empty($reshook))
 			if ($object->id > 0) {
 				if (!empty($conf->global->PROPAL_CLONE_DATE_DELIVERY)) {
 					//Get difference between old and new delivery date and change lines according to difference
-					$date_delivery = dol_mktime(12, 0, 0,
+    $date_delivery = dol_mktime(12, 0, 0,
 						GETPOST('date_deliverymonth', 'int'),
 						GETPOST('date_deliveryday', 'int'),
 						GETPOST('date_deliveryyear', 'int')
@@ -173,7 +173,7 @@ if (empty($reshook))
 					if (!empty($object->date_livraison) && !empty($date_delivery))
 					{
 						//Attempt to get the date without possible hour rounding errors
-						$old_date_delivery = dol_mktime(12, 0, 0,
+    $old_date_delivery = dol_mktime(12, 0, 0,
 							dol_print_date($object->date_livraison, '%m'),
 							dol_print_date($object->date_livraison, '%d'),
 							dol_print_date($object->date_livraison, '%Y')
@@ -724,7 +724,7 @@ if (empty($reshook))
 	        {
 	            $lineId = intval($lineId);
 	            $originLine = new $lineClassName($db);
-	            if(intval($fromElementid) > 0 && $originLine->fetch( $lineId ) > 0)
+	            if(intval($fromElementid) > 0 && $originLine->fetch($lineId) > 0)
 	            {
 	                $originLine->fetch_optionals($lineId);
 	                $desc = $originLine->desc;
@@ -1895,7 +1895,7 @@ if ($action == 'create')
 		{
 			require_once DOL_DOCUMENT_ROOT . '/core/class/notify.class.php';
 			$notify = new Notify($db);
-			$formquestion = array_merge($formquestion, array(
+$formquestion = array_merge($formquestion, array(
 				array('type' => 'onecolumn', 'value' => $notify->confirmMessage('PROPAL_CLOSE_SIGNED', $object->socid, $object)),
 			));
 		}

htdocs/comm/propal/class/api_proposals.class.php

@@ -665,7 +665,7 @@ class Proposals extends DolibarrApi
             throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
         }
 
-        $result = $this->propal->classifyBilled(DolibarrApiAccess::$user );
+        $result = $this->propal->classifyBilled(DolibarrApiAccess::$user);
         if ($result < 0) {
             throw new RestException(500, 'Error : '.$this->propal->error);
         }

htdocs/comm/propal/class/propal.class.php

@@ -667,7 +667,7 @@ class Propal extends CommonObject
 	{
 		global $mysoc;
 
-		dol_syslog(get_class($this)."::updateLine rowid=$rowid, pu=$pu, qty=$qty, remise_percent=$remise_percent,
+dol_syslog(get_class($this)."::updateLine rowid=$rowid, pu=$pu, qty=$qty, remise_percent=$remise_percent,
         txtva=$txtva, desc=$desc, price_base_type=$price_base_type, info_bits=$info_bits, special_code=$special_code, fk_parent_line=$fk_parent_line, pa_ht=$pa_ht, type=$type, date_start=$date_start, date_end=$date_end");
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
@@ -1078,7 +1078,7 @@ class Propal extends CommonObject
 						$vatrate = $line->tva_tx;
 						if ($line->vat_src_code && ! preg_match('/\(.*\)/', $vatrate)) $vatrate.=' ('.$line->vat_src_code.')';
 
-						$result = $this->addline(
+    $result = $this->addline(
 							$line->desc,
 							$line->subprice,
 							$line->qty,

htdocs/commande/card.php

@@ -1347,7 +1347,7 @@ if (empty($reshook))
 	        {
 	            $lineId = intval($lineId);
 	            $originLine = new $lineClassName($db);
-	            if(intval($fromElementid) > 0 && $originLine->fetch( $lineId ) > 0)
+	            if(intval($fromElementid) > 0 && $originLine->fetch($lineId) > 0)
 	            {
 	                $originLine->fetch_optionals($lineId);
 	                $desc = $originLine->desc;

htdocs/commande/class/commande.class.php

@@ -885,7 +885,7 @@ class Commande extends CommonOrder
 					$vatrate = $line->tva_tx;
 					if ($line->vat_src_code && ! preg_match('/\(.*\)/', $vatrate)) $vatrate.=' ('.$line->vat_src_code.')';
 
-					$result = $this->addline(
+    $result = $this->addline(
 						$line->desc,
 						$line->subprice,
 						$line->qty,

htdocs/commande/orderstoinvoice.php

@@ -290,7 +290,7 @@ if (($action == 'create' || $action == 'add') && !$error)
 											$array_options = $lines[$i]->array_options;
 										}
 
-										$result = $object->addline(
+        $result = $object->addline(
 												$desc,
 												$lines[$i]->subprice,
 												$lines[$i]->qty,

htdocs/compta/bank/bankentries_list.php

@@ -120,14 +120,15 @@ if ($id > 0 || ! empty($ref))
 {
     $result=$object->fetch($id, $ref);
     $search_account = $object->id;     // Force the search field on id of account
+
+    if (! ($object->id > 0) )
+    {
+    	$langs->load("errors");
+    	print($langs->trans('ErrorRecordNotFound'));
+    	exit;
+    }
 }
 
-if (! ($object->id > 0) )
-{
-	$langs->load("errors");
-	print($langs->trans('ErrorRecordNotFound'));
-	exit;
-}
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('banktransactionlist', $contextpage));

htdocs/compta/bank/class/account.class.php

@@ -1614,7 +1614,7 @@ class Account extends CommonObject
 				//Replace the old AccountNumber key with the new BankAccountNumber key
 				$fieldlists = explode(
 					' ',
-					preg_replace('/ ?[^Bank]AccountNumber ?/', 'BankAccountNumber',
+    preg_replace('/ ?[^Bank]AccountNumber ?/', 'BankAccountNumber',
 						$conf->global->BANK_SHOW_ORDER_OPTION)
 				);
 			}

htdocs/compta/bank/class/paymentvarious.class.php

@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2017       Alexandre Spangaro      <aspangaro@open-dsi.fr>
+/* Copyright (C) 2017-2019  Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -71,6 +71,8 @@ class PaymentVarious extends CommonObject
 
 	public $accountancy_code;
 
+    public $subledger_account;
+
 	/**
      * @var int ID
      */
@@ -139,6 +141,7 @@ class PaymentVarious extends CommonObject
 		$sql.= " label='".$this->db->escape($this->label)."',";
 		$sql.= " note='".$this->db->escape($this->note)."',";
 		$sql.= " accountancy_code='".$this->db->escape($this->accountancy_code)."',";
+        $sql.= " subledger_account='".$this->db->escape($this->subledger_account)."',";
 		$sql.= " fk_projet='".$this->db->escape($this->fk_project)."',";
 		$sql.= " fk_bank=".($this->fk_bank > 0 ? $this->fk_bank:"null").",";
 		$sql.= " fk_user_author=".$this->fk_user_author.",";
@@ -196,6 +199,7 @@ class PaymentVarious extends CommonObject
 		$sql.= " v.label,";
 		$sql.= " v.note,";
 		$sql.= " v.accountancy_code,";
+		$sql.= " v.subledger_account,";
 		$sql.= " v.fk_projet as fk_project,";
 		$sql.= " v.fk_bank,";
 		$sql.= " v.fk_user_author,";
@@ -215,25 +219,26 @@ class PaymentVarious extends CommonObject
 			{
 				$obj = $this->db->fetch_object($resql);
 
-				$this->id				= $obj->rowid;
+				$this->id                   = $obj->rowid;
-				$this->ref				= $obj->rowid;
+				$this->ref                  = $obj->rowid;
-				$this->tms				= $this->db->jdate($obj->tms);
+				$this->tms                  = $this->db->jdate($obj->tms);
-				$this->datep			= $this->db->jdate($obj->datep);
+				$this->datep                = $this->db->jdate($obj->datep);
-				$this->datev			= $this->db->jdate($obj->datev);
+				$this->datev                = $this->db->jdate($obj->datev);
-				$this->sens				= $obj->sens;
+				$this->sens                 = $obj->sens;
-				$this->amount			= $obj->amount;
+				$this->amount               = $obj->amount;
-				$this->type_payment		= $obj->fk_typepayment;
+				$this->type_payment         = $obj->fk_typepayment;
-				$this->num_payment		= $obj->num_payment;
+				$this->num_payment          = $obj->num_payment;
-				$this->label			= $obj->label;
+				$this->label                = $obj->label;
-				$this->note				= $obj->note;
+				$this->note                 = $obj->note;
-				$this->accountancy_code	= $obj->accountancy_code;
+				$this->subledger_account    = $obj->subledger_account;
-				$this->fk_project		= $obj->fk_project;
+				$this->accountancy_code     = $obj->accountancy_code;
-				$this->fk_bank			= $obj->fk_bank;
+				$this->fk_project           = $obj->fk_project;
-				$this->fk_user_author	= $obj->fk_user_author;
+				$this->fk_bank              = $obj->fk_bank;
-				$this->fk_user_modif	= $obj->fk_user_modif;
+				$this->fk_user_author       = $obj->fk_user_author;
-				$this->fk_account		= $obj->fk_account;
+				$this->fk_user_modif        = $obj->fk_user_modif;
-				$this->fk_type			= $obj->fk_type;
+				$this->fk_account           = $obj->fk_account;
-				$this->rappro			= $obj->rappro;
+				$this->fk_type              = $obj->fk_type;
+				$this->rappro               = $obj->rappro;
 			}
 			$this->db->free($resql);
 
@@ -298,6 +303,7 @@ class PaymentVarious extends CommonObject
 		$this->amount='';
 		$this->label='';
 		$this->accountancy_code='';
+        $this->subledger_account='';
 		$this->note='';
 		$this->fk_bank='';
 		$this->fk_user_author='';
@@ -360,6 +366,7 @@ class PaymentVarious extends CommonObject
 		if ($this->note) $sql.= ", note";
 		$sql.= ", label";
 		$sql.= ", accountancy_code";
+		$sql.= ", subledger_account";
 		$sql.= ", fk_projet";
 		$sql.= ", fk_user_author";
 		$sql.= ", datec";
@@ -376,6 +383,7 @@ class PaymentVarious extends CommonObject
 		if ($this->note) $sql.= ", '".$this->db->escape($this->note)."'";
 		$sql.= ", '".$this->db->escape($this->label)."'";
 		$sql.= ", '".$this->db->escape($this->accountancy_code)."'";
+		$sql.= ", '".$this->db->escape($this->subledger_account)."'";
 		$sql.= ", ".($this->fk_project > 0? $this->fk_project : 0);
 		$sql.= ", ".$user->id;
 		$sql.= ", '".$this->db->idate($now)."'";
@@ -406,7 +414,7 @@ class PaymentVarious extends CommonObject
 					$sign=1;
 					if ($this->sens == '0') $sign=-1;
 
-					$bank_line_id = $acc->addline(
+    $bank_line_id = $acc->addline(
 						$this->datep,
 						$this->type_payment,
 						$this->label,

htdocs/compta/bank/various_payment/card.php

@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2017       Alexandre Spangaro      <aspangaro@open-dsi.fr>
+/* Copyright (C) 2017-2019  Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -48,9 +48,10 @@ $backtopage	= GETPOST('backtopage', 'alpha');
 $accountid=GETPOST("accountid") > 0 ? GETPOST("accountid", "int") : 0;
 $label=GETPOST("label", "alpha");
 $sens=GETPOST("sens", "int");
-$amount=GETPOST("amount");
+$amount=GETPOST("amount", "alpha");
-$paymenttype=GETPOST("paymenttype");
+$paymenttype=GETPOST("paymenttype", "int");
 $accountancy_code=GETPOST("accountancy_code", "int");
+$subledger_account=GETPOST("subledger_account", "int");
 $projectid = (GETPOST('projectid', 'int') ? GETPOST('projectid', 'int') : GETPOST('fk_project', 'int'));
 
 // Security check
@@ -112,7 +113,10 @@ if (empty($reshook))
 		$object->type_payment=GETPOST("paymenttype", 'int') > 0 ? GETPOST("paymenttype", "int") : 0;
 		$object->num_payment=GETPOST("num_payment", 'alpha');
 		$object->fk_user_author=$user->id;
+
 		$object->accountancy_code=GETPOST("accountancy_code") > 0 ? GETPOST("accountancy_code", "int") : "";
+        $object->subledger_account=GETPOST("subledger_account") > 0 ? GETPOST("subledger_account", "int") : "";
+
 		$object->sens=GETPOST('sens');
 		$object->fk_project= GETPOST('fk_project', 'int');
 
@@ -325,6 +329,28 @@ if ($action == 'create')
 		print '</td></tr>';
 	}
 
+    // Subledger account
+    if (! empty($conf->accounting->enabled))
+    {
+        print '<tr><td>'.$langs->trans("SubledgerAccount").'</td>';
+        print '<td>';
+        if (! empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
+        {
+            print $formaccounting->select_auxaccount($subledger_account, 'subledger_account', 1, '');
+        }
+        else
+        {
+            print '<input type="text" name="subledger_account" value="'.$subledger_account.'">';
+        }
+        print '</td></tr>';
+    }
+    else // For external software
+    {
+        print '<tr><td>'.$langs->trans("SubledgerAccount").'</td>';
+        print '<td class="maxwidthonsmartphone"><input class="minwidth100" name="subledger_account" value="'.$subledger_account.'">';
+        print '</td></tr>';
+    }
+
 	// Project
 	if (! empty($conf->projet->enabled))
 	{
@@ -447,6 +473,13 @@ if ($id)
 	}
 	print '</td></tr>';
 
+    // Subledger account
+    print '<tr><td class="nowrap">';
+    print $langs->trans("SubledgerAccount");
+    print '</td><td>';
+    print $object->subledger_account;
+    print '</td></tr>';
+    
 	if (! empty($conf->banque->enabled))
 	{
 		if ($object->fk_account > 0)

htdocs/compta/bank/various_payment/document.php

@@ -82,7 +82,7 @@ if ($object->id)
 {
 	$head=various_payment_prepare_head($object);
 
-	dol_fiche_head($head, 'documents',  $langs->trans("VariousPayment"), -1, 'payment');
+	dol_fiche_head($head, 'documents', $langs->trans("VariousPayment"), -1, 'payment');
 
 	$morehtmlref='<div class="refidno">';
 	// Project

htdocs/compta/charges/index.php

@@ -463,7 +463,7 @@ if (! empty($conf->salaries->enabled) && ! empty($user->rights->salaries->read))
 
         print "<br>";
 
-        print load_fiche_titre( $langs->trans("SalariesPayments").($year?' ('.$langs->trans("Year").' '.$year.')':''), '', '');
+        print load_fiche_titre($langs->trans("SalariesPayments").($year?' ('.$langs->trans("Year").' '.$year.')':''), '', '');
 
         $sql = "SELECT s.rowid, s.amount, s.label, s.datep as datep, s.datev as datev, s.datesp, s.dateep, s.salary, s.fk_bank, u.salary as current_salary,";
 		$sql.= " pct.code as payment_code,";

htdocs/compta/deplacement/document.php

@@ -88,7 +88,7 @@ if ($object->id)
 
 	$head=trip_prepare_head($object);
 
-	dol_fiche_head($head, 'documents',  $langs->trans("TripCard"), 0, 'trip');
+	dol_fiche_head($head, 'documents', $langs->trans("TripCard"), 0, 'trip');
 
 
 	// Build file list

htdocs/compta/facture/card.php

@@ -1449,7 +1449,7 @@ if (empty($reshook))
 										$localtax1_tx = get_localtax($tva_tx, 1, $object->thirdparty);
 										$localtax2_tx = get_localtax($tva_tx, 2, $object->thirdparty);
 
-										$result = $object->addline(
+        $result = $object->addline(
 											$desc, $lines[$i]->subprice, $lines[$i]->qty, $tva_tx, $localtax1_tx, $localtax2_tx, $lines[$i]->fk_product,
 											$lines[$i]->remise_percent, $date_start, $date_end, 0, $lines[$i]->info_bits, $lines[$i]->fk_remise_except,
 											'HT', 0, $product_type, $lines[$i]->rang, $lines[$i]->special_code, $object->origin, $lines[$i]->rowid,
@@ -2118,7 +2118,7 @@ if (empty($reshook))
 				}
 			}
 
-			$result = $object->updateline(GETPOST('lineid'), $description, $pu_ht, $qty, GETPOST('remise_percent'),
+$result = $object->updateline(GETPOST('lineid'), $description, $pu_ht, $qty, GETPOST('remise_percent'),
 				$date_start, $date_end, $vat_rate, $localtax1_rate, $localtax2_rate, 'HT', $info_bits, $type,
 				GETPOST('fk_parent_line'), 0, $fournprice, $buyingprice, $label, $special_code, $array_options, GETPOST('progress'),
 				$_POST['units'], $pu_ht_devise);
@@ -2352,7 +2352,7 @@ if (empty($reshook))
 	        {
 	            $lineId = intval($lineId);
                 $originLine = new $lineClassName($db);
-                if(intval($fromElementid) > 0 && $originLine->fetch( $lineId ) > 0)
+                if(intval($fromElementid) > 0 && $originLine->fetch($lineId) > 0)
                 {
                     $originLine->fetch_optionals($lineId);
                     $desc = $originLine->desc;

htdocs/compta/facture/class/api_invoices.class.php

@@ -337,7 +337,7 @@ class Invoices extends DolibarrApi
     		throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
     	}
     	$request_data = (object) $request_data;
-    	$updateRes = $this->invoice->updateline(
+    $updateRes = $this->invoice->updateline(
     		$lineid,
     		$request_data->desc,
     		$request_data->subprice,

htdocs/compta/facture/class/facture-rec.class.php

@@ -225,7 +225,7 @@ class FactureRec extends CommonInvoice
 					$tva_tx = $facsrc->lines[$i]->tva_tx;
 					if (! empty($facsrc->lines[$i]->vat_src_code) && ! preg_match('/\(/', $tva_tx)) $tva_tx .= ' ('.$facsrc->lines[$i]->vat_src_code.')';
 
-					$result_insert = $this->addline(
+    $result_insert = $this->addline(
                         $facsrc->lines[$i]->desc,
                         $facsrc->lines[$i]->subprice,
                         $facsrc->lines[$i]->qty,
@@ -1858,7 +1858,7 @@ class FactureLigneRec extends CommonInvoiceLine
     	}
     	$sql.= ", rang=".$this->rang;
     	$sql.= ", special_code=".$this->special_code;
-    	$sql.= ", fk_unit=".($this->fk_unit ?"'".$this->db->escape($this->fk_unit )."'":"null");
+    	$sql.= ", fk_unit=".($this->fk_unit ?"'".$this->db->escape($this->fk_unit)."'":"null");
     	$sql.= ", fk_contract_line=".($this->fk_contract_line?$this->fk_contract_line:"null");
     	$sql.= " WHERE rowid = ".$this->id;
 

htdocs/compta/facture/class/facture.class.php

@@ -675,7 +675,7 @@ class Facture extends CommonInvoice
 						$vatrate = $line->tva_tx;
 						if ($line->vat_src_code && ! preg_match('/\(.*\)/', $vatrate)) $vatrate.=' ('.$line->vat_src_code.')';
 
-						$result = $this->addline(
+    $result = $this->addline(
 							$line->desc,
 							$line->subprice,
 							$line->qty,
@@ -749,7 +749,7 @@ class Facture extends CommonInvoice
 					$localtax1_tx = $_facrec->lines[$i]->localtax1_tx;
 					$localtax2_tx = $_facrec->lines[$i]->localtax2_tx;
 
-					$result_insert = $this->addline(
+    $result_insert = $this->addline(
 						$_facrec->lines[$i]->desc,
 						$_facrec->lines[$i]->subprice,
 						$_facrec->lines[$i]->qty,

htdocs/compta/facture/fiche-rec.php

@@ -855,7 +855,7 @@ if (empty($reshook))
 		// Update line
 		if (! $error)
 		{
-			$result = $object->updateline(
+$result = $object->updateline(
 				GETPOST('lineid'),
 				$description,
 				$pu_ht,
@@ -1171,7 +1171,7 @@ if ($action == 'create')
 
 		if ($flag_price_may_change)
 		{
-			print '<tr><td colspan="3" align="left">';
+			print '<tr><td colspan="3" class="left">';
 			print '<select name="usenewprice" class="flat">';
 			print '<option value="0">'.$langs->trans("AlwaysUseFixedPrice").'</option>';
 			print '<option value="1" disabled>'.$langs->trans("AlwaysUseNewPrice").'</option>';
@@ -1306,7 +1306,7 @@ else
 		print $langs->trans('PaymentConditionsShort');
 		print '</td>';
 		if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editconditions' && ! empty($object->brouillon) && $user->rights->facture->creer)
-			print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editconditions&amp;facid=' . $object->id . '">' . img_edit($langs->trans('SetConditions'), 1) . '</a></td>';
+			print '<td class="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editconditions&amp;facid=' . $object->id . '">' . img_edit($langs->trans('SetConditions'), 1) . '</a></td>';
 		print '</tr></table>';
 		print '</td><td>';
 		if ($object->type != Facture::TYPE_CREDIT_NOTE)
@@ -1330,7 +1330,7 @@ else
 		print $langs->trans('PaymentMode');
 		print '</td>';
 		if ($action != 'editmode' && ! empty($object->brouillon) && $user->rights->facture->creer)
-			print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editmode&amp;facid=' . $object->id . '">' . img_edit($langs->trans('SetMode'), 1) . '</a></td>';
+			print '<td class="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editmode&amp;facid=' . $object->id . '">' . img_edit($langs->trans('SetMode'), 1) . '</a></td>';
 		print '</tr></table>';
 		print '</td><td>';
 		if ($action == 'editmode')
@@ -1393,7 +1393,7 @@ else
 		print $langs->trans('RIB');
 		print '<td>';
 		if (($action != 'editbankaccount') && $user->rights->facture->creer && ! empty($object->brouillon))
-			print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
+			print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
 		print '</tr></table>';
 		print '</td><td>';
 		if ($action == 'editbankaccount')
@@ -1415,7 +1415,7 @@ else
         print $langs->trans('Model');
         print '<td>';
         if (($action != 'editmodelpdf') && $user->rights->facture->creer && ! empty($object->brouillon))
-            print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editmodelpdf&amp;id='.$object->id.'">'.img_edit($langs->trans('SetModel'), 1).'</a></td>';
+            print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editmodelpdf&amp;id='.$object->id.'">'.img_edit($langs->trans('SetModel'), 1).'</a></td>';
         print '</tr></table>';
         print '</td><td>';
         if ($action == 'editmodelpdf')
@@ -1464,7 +1464,7 @@ else
 		print $langs->trans('Frequency');
 		print '</td>';
 		if ($action != 'editfrequency' && ! empty($object->brouillon) && $user->rights->facture->creer)
-			print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editfrequency&amp;facid=' . $object->id . '">' . img_edit($langs->trans('Edit'), 1) . '</a></td>';
+			print '<td class="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editfrequency&amp;facid=' . $object->id . '">' . img_edit($langs->trans('Edit'), 1) . '</a></td>';
 		print '</tr></table>';
 		print '</td><td>';
 		if ($action == 'editfrequency')

htdocs/compta/facture/invoicetemplate_list.php

@@ -348,47 +348,47 @@ if ($resql)
 	// Ref
 	if (! empty($arrayfields['f.titre']['checked']))
 	{
-		print '<td class="liste_titre" align="left">';
+		print '<td class="liste_titre left">';
 		print '<input class="flat" size="6" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
 		print '</td>';
 	}
 	// Thirpdarty
 	if (! empty($arrayfields['s.nom']['checked']))
 	{
-		print '<td class="liste_titre" align="left"><input class="flat" type="text" size="8" name="search_societe" value="'.dol_escape_htmltag($search_societe).'"></td>';
+		print '<td class="liste_titre left"><input class="flat" type="text" size="8" name="search_societe" value="'.dol_escape_htmltag($search_societe).'"></td>';
 	}
 	if (! empty($arrayfields['f.total']['checked']))
 	{
 		// Amount net
-		print '<td class="liste_titre" align="right">';
+		print '<td class="liste_titre right">';
 		print '<input class="flat" type="text" size="5" name="search_montant_ht" value="'.dol_escape_htmltag($search_montant_ht).'">';
 		print '</td>';
 	}
 	if (! empty($arrayfields['f.tva']['checked']))
 	{
 		// Amount Vat
-		print '<td class="liste_titre" align="right">';
+		print '<td class="liste_titre right">';
 		print '<input class="flat" type="text" size="5" name="search_montant_vat" value="'.dol_escape_htmltag($search_montant_vat).'">';
 		print '</td>';
 	}
 	if (! empty($arrayfields['f.total_ttc']['checked']))
 	{
 		// Amount
-		print '<td class="liste_titre" align="right">';
+		print '<td class="liste_titre right">';
 		print '<input class="flat" type="text" size="5" name="search_montant_ttc" value="'.dol_escape_htmltag($search_montant_ttc).'">';
 		print '</td>';
 	}
 	if (! empty($arrayfields['f.fk_cond_reglement']['checked']))
 	{
 		// Payment term
-		print '<td class="liste_titre" align="right">';
+		print '<td class="liste_titre right">';
 		print $form->select_conditions_paiements($search_payment_term, 'search_payment_term', -1, 1, 1, 'maxwidth100');
 		print "</td>";
 	}
 	if (! empty($arrayfields['f.fk_mode_reglement']['checked']))
 	{
 		// Payment mode
-		print '<td class="liste_titre" align="right">';
+		print '<td class="liste_titre right">';
 		print $form->select_types_paiements($search_payment_mode, 'search_payment_mode', '', 0, 1, 1, 0, 1, 'maxwidth100');
 		print '</td>';
 	}
@@ -479,12 +479,12 @@ if ($resql)
 	print '<tr class="liste_titre">';
 	if (! empty($arrayfields['f.titre']['checked']))         print_liste_field_titre($arrayfields['f.titre']['label'], $_SERVER['PHP_SELF'], "f.titre", "", $param, "", $sortfield, $sortorder);
 	if (! empty($arrayfields['s.nom']['checked']))           print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER['PHP_SELF'], "s.nom", "", $param, "", $sortfield, $sortorder);
-	if (! empty($arrayfields['f.total']['checked']))         print_liste_field_titre($arrayfields['f.total']['label'], $_SERVER['PHP_SELF'], "f.total", "", $param, 'align="right"', $sortfield, $sortorder);
+	if (! empty($arrayfields['f.total']['checked']))         print_liste_field_titre($arrayfields['f.total']['label'], $_SERVER['PHP_SELF'], "f.total", "", $param, 'class="right"', $sortfield, $sortorder);
-	if (! empty($arrayfields['f.tva']['checked']))           print_liste_field_titre($arrayfields['f.tva']['label'], $_SERVER['PHP_SELF'], "f.tva", "", $param, 'align="right"', $sortfield, $sortorder);
+	if (! empty($arrayfields['f.tva']['checked']))           print_liste_field_titre($arrayfields['f.tva']['label'], $_SERVER['PHP_SELF'], "f.tva", "", $param, 'class="right"', $sortfield, $sortorder);
-	if (! empty($arrayfields['f.total_ttc']['checked']))     print_liste_field_titre($arrayfields['f.total_ttc']['label'], $_SERVER['PHP_SELF'], "f.total_ttc", "", $param, 'align="right"', $sortfield, $sortorder);
+	if (! empty($arrayfields['f.total_ttc']['checked']))     print_liste_field_titre($arrayfields['f.total_ttc']['label'], $_SERVER['PHP_SELF'], "f.total_ttc", "", $param, 'class="right"', $sortfield, $sortorder);
 	if (! empty($arrayfields['f.fk_cond_reglement']['checked']))     print_liste_field_titre($arrayfields['f.fk_cond_reglement']['label'], $_SERVER['PHP_SELF'], "f.fk_cond_reglement", "", $param, '', $sortfield, $sortorder);
 	if (! empty($arrayfields['f.fk_mode_reglement']['checked']))     print_liste_field_titre($arrayfields['f.fk_mode_reglement']['label'], $_SERVER['PHP_SELF'], "f.fk_mode_reglement", "", $param, '', $sortfield, $sortorder);
-	if (! empty($arrayfields['recurring']['checked']))       print_liste_field_titre($arrayfields['recurring']['label'], $_SERVER['PHP_SELF'], "recurring", "", $param, 'align="center"', $sortfield, $sortorder);
+	if (! empty($arrayfields['recurring']['checked']))       print_liste_field_titre($arrayfields['recurring']['label'], $_SERVER['PHP_SELF'], "recurring", "", $param, 'class="center"', $sortfield, $sortorder);
 	if (! empty($arrayfields['f.frequency']['checked']))     print_liste_field_titre($arrayfields['f.frequency']['label'], $_SERVER['PHP_SELF'], "f.frequency", "", $param, 'align="center"', $sortfield, $sortorder);
 	if (! empty($arrayfields['f.unit_frequency']['checked'])) print_liste_field_titre($arrayfields['f.unit_frequency']['label'], $_SERVER['PHP_SELF'], "f.unit_frequency", "", $param, 'align="center"', $sortfield, $sortorder);
 	if (! empty($arrayfields['f.nb_gen_done']['checked']))   print_liste_field_titre($arrayfields['f.nb_gen_done']['label'], $_SERVER['PHP_SELF'], "f.nb_gen_done", "", $param, 'align="center"', $sortfield, $sortorder);
@@ -533,21 +533,21 @@ if ($resql)
 			}
 			if (! empty($arrayfields['f.total']['checked']))
 			{
-			   print '<td align="right">'.price($objp->total).'</td>'."\n";
+			   print '<td class="right">'.price($objp->total).'</td>'."\n";
 			   if (! $i) $totalarray['nbfield']++;
 			   if (! $i) $totalarray['pos'][$totalarray['nbfield']]='f.total';
 			   $totalarray['val']['f.total'] += $objp->total;
 			}
 			if (! empty($arrayfields['f.tva']['checked']))
 			{
-			   print '<td align="right">'.price($objp->total_vat).'</td>'."\n";
+			   print '<td class="right">'.price($objp->total_vat).'</td>'."\n";
 			   if (! $i) $totalarray['nbfield']++;
 			   if (! $i) $totalarray['pos'][$totalarray['nbfield']]='f.tva';
 			   $totalarray['val']['f.tva'] += $objp->total_vat;
 			}
 			if (! empty($arrayfields['f.total_ttc']['checked']))
 			{
-			   print '<td align="right">'.price($objp->total_ttc).'</td>'."\n";
+			   print '<td class="right">'.price($objp->total_ttc).'</td>'."\n";
 			   if (! $i) $totalarray['nbfield']++;
 			   if (! $i) $totalarray['pos'][$totalarray['nbfield']]='f.total_ttc';
 			   $totalarray['val']['f.total_ttc'] += $objp->total_ttc;
@@ -555,7 +555,7 @@ if ($resql)
 			// Payment term
 			if (! empty($arrayfields['f.fk_cond_reglement']['checked']))
 			{
-			   print '<td align="right">';
+			   print '<td class="right">';
 			   print $form->form_conditions_reglement('', $objp->fk_cond_reglement, 'none');
 			   print '</td>'."\n";
 			   if (! $i) $totalarray['nbfield']++;
@@ -563,7 +563,7 @@ if ($resql)
 			// Payment mode
 			if (! empty($arrayfields['f.fk_mode_reglement']['checked']))
 			{
-			   print '<td align="right">';
+			   print '<td class="right">';
 			   print $form->form_modes_reglement('', $objp->fk_mode_reglement, 'none');
 			   print '</td>'."\n";
 			   if (! $i) $totalarray['nbfield']++;
@@ -683,7 +683,7 @@ if ($resql)
 		while ($i < $totalarray['nbfield'])
 		{
 			$i++;
-			if (! empty($totalarray['pos'][$i]))  print '<td align="right">'.price($totalarray['val'][$totalarray['pos'][$i]]).'</td>';
+			if (! empty($totalarray['pos'][$i]))  print '<td class="right">'.price($totalarray['val'][$totalarray['pos'][$i]]).'</td>';
 			else
 			{
 				if ($i == 1)

htdocs/compta/facture/list.php

@@ -303,7 +303,7 @@ if ($massaction == 'withdrawrequest')
 					$error++;
 					setEventMessages($objecttmp->ref.' '.$langs->trans("RequestAlreadyDone"), $objecttmp->errors, 'warnings');
 				}
-				elseif (!empty($objecttmp->mode_reglement_code ) && $objecttmp->mode_reglement_code != 'PRE'){
+				elseif (!empty($objecttmp->mode_reglement_code) && $objecttmp->mode_reglement_code != 'PRE'){
 					$error++;
 					setEventMessages($objecttmp->ref.' '.$langs->trans("BadPaymentMethod"), $objecttmp->errors, 'errors');
 				}
@@ -779,46 +779,46 @@ if ($resql)
 	if (! empty($arrayfields['f.total_ht']['checked']))
 	{
 		// Amount
-		print '<td class="liste_titre" align="right">';
+		print '<td class="liste_titre right">';
 		print '<input class="flat" type="text" size="5" name="search_montant_ht" value="'.dol_escape_htmltag($search_montant_ht).'">';
 		print '</td>';
 	}
 	if (! empty($arrayfields['f.total_vat']['checked']))
 	{
 		// Amount
-		print '<td class="liste_titre" align="right">';
+		print '<td class="liste_titre right">';
 		print '<input class="flat" type="text" size="5" name="search_montant_vat" value="'.dol_escape_htmltag($search_montant_vat).'">';
 		print '</td>';
 	}
 	if (! empty($arrayfields['f.total_localtax1']['checked']))
 	{
 		// Localtax1
-		print '<td class="liste_titre" align="right">';
+		print '<td class="liste_titre right">';
 		print '<input class="flat" type="text" size="5" name="search_montant_localtax1" value="'.$search_montant_localtax1.'">';
 		print '</td>';
 	}
 	if (! empty($arrayfields['f.total_localtax2']['checked']))
 	{
 		// Localtax2
-		print '<td class="liste_titre" align="right">';
+		print '<td class="liste_titre right">';
 		print '<input class="flat" type="text" size="5" name="search_montant_localtax2" value="'.$search_montant_localtax2.'">';
 		print '</td>';
 	}
 	if (! empty($arrayfields['f.total_ttc']['checked']))
 	{
 		// Amount
-		print '<td class="liste_titre" align="right">';
+		print '<td class="liste_titre right">';
 		print '<input class="flat" type="text" size="5" name="search_montant_ttc" value="'.dol_escape_htmltag($search_montant_ttc).'">';
 		print '</td>';
 	}
 	if (! empty($arrayfields['dynamount_payed']['checked']))
 	{
-		print '<td class="liste_titre" align="right">';
+		print '<td class="liste_titre right">';
 		print '</td>';
 	}
 	if (! empty($arrayfields['rtp']['checked']))
 	{
-		print '<td class="liste_titre" align="right">';
+		print '<td class="liste_titre right">';
 		print '</td>';
 	}
 	// Extra fields
@@ -843,7 +843,7 @@ if ($resql)
 	// Status
 	if (! empty($arrayfields['f.fk_statut']['checked']))
 	{
-		print '<td class="liste_titre maxwidthonsmartphone" align="right">';
+		print '<td class="liste_titre maxwidthonsmartphone right">';
 		$liststatus=array('0'=>$langs->trans("BillShortStatusDraft"), '1'=>$langs->trans("BillShortStatusNotPaid"), '2'=>$langs->trans("BillShortStatusPaid"), '1,2'=>$langs->trans("BillShortStatusNotPaid").'+'.$langs->trans("BillShortStatusPaid"), '3'=>$langs->trans("BillShortStatusCanceled"));
 		print $form->selectarray('search_status', $liststatus, $search_status, 1);
 		print '</td>';
@@ -869,13 +869,13 @@ if ($resql)
 	if (! empty($arrayfields['country.code_iso']['checked']))     print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "country.code_iso", "", $param, 'align="center"', $sortfield, $sortorder);
 	if (! empty($arrayfields['typent.code']['checked']))          print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, 'align="center"', $sortfield, $sortorder);
 	if (! empty($arrayfields['f.fk_mode_reglement']['checked']))  print_liste_field_titre($arrayfields['f.fk_mode_reglement']['label'], $_SERVER["PHP_SELF"], "f.fk_mode_reglement", "", $param, "", $sortfield, $sortorder);
-	if (! empty($arrayfields['f.total_ht']['checked']))           print_liste_field_titre($arrayfields['f.total_ht']['label'], $_SERVER['PHP_SELF'], 'f.total', '', $param, 'align="right"', $sortfield, $sortorder);
+	if (! empty($arrayfields['f.total_ht']['checked']))           print_liste_field_titre($arrayfields['f.total_ht']['label'], $_SERVER['PHP_SELF'], 'f.total', '', $param, 'class="right"', $sortfield, $sortorder);
-	if (! empty($arrayfields['f.total_vat']['checked']))          print_liste_field_titre($arrayfields['f.total_vat']['label'], $_SERVER['PHP_SELF'], 'f.tva', '', $param, 'align="right"', $sortfield, $sortorder);
+	if (! empty($arrayfields['f.total_vat']['checked']))          print_liste_field_titre($arrayfields['f.total_vat']['label'], $_SERVER['PHP_SELF'], 'f.tva', '', $param, 'class="right"', $sortfield, $sortorder);
-	if (! empty($arrayfields['f.total_localtax1']['checked']))    print_liste_field_titre($arrayfields['f.total_localtax1']['label'], $_SERVER['PHP_SELF'], 'f.localtax1', '', $param, 'align="right"', $sortfield, $sortorder);
+	if (! empty($arrayfields['f.total_localtax1']['checked']))    print_liste_field_titre($arrayfields['f.total_localtax1']['label'], $_SERVER['PHP_SELF'], 'f.localtax1', '', $param, 'class="right"', $sortfield, $sortorder);
-	if (! empty($arrayfields['f.total_localtax2']['checked']))    print_liste_field_titre($arrayfields['f.total_localtax2']['label'], $_SERVER['PHP_SELF'], 'f.localtax2', '', $param, 'align="right"', $sortfield, $sortorder);
+	if (! empty($arrayfields['f.total_localtax2']['checked']))    print_liste_field_titre($arrayfields['f.total_localtax2']['label'], $_SERVER['PHP_SELF'], 'f.localtax2', '', $param, 'class="right"', $sortfield, $sortorder);
-	if (! empty($arrayfields['f.total_ttc']['checked']))          print_liste_field_titre($arrayfields['f.total_ttc']['label'], $_SERVER['PHP_SELF'], 'f.total_ttc', '', $param, 'align="right"', $sortfield, $sortorder);
+	if (! empty($arrayfields['f.total_ttc']['checked']))          print_liste_field_titre($arrayfields['f.total_ttc']['label'], $_SERVER['PHP_SELF'], 'f.total_ttc', '', $param, 'class="right"', $sortfield, $sortorder);
-	if (! empty($arrayfields['dynamount_payed']['checked']))      print_liste_field_titre($arrayfields['dynamount_payed']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'align="right"', $sortfield, $sortorder);
+	if (! empty($arrayfields['dynamount_payed']['checked']))      print_liste_field_titre($arrayfields['dynamount_payed']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
-	if (! empty($arrayfields['rtp']['checked']))                  print_liste_field_titre($arrayfields['rtp']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'align="right"', $sortfield, $sortorder);
+	if (! empty($arrayfields['rtp']['checked']))                  print_liste_field_titre($arrayfields['rtp']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 	// Hook fields
@@ -884,7 +884,7 @@ if ($resql)
 	print $hookmanager->resPrint;
 	if (! empty($arrayfields['f.datec']['checked']))     print_liste_field_titre($arrayfields['f.datec']['label'], $_SERVER["PHP_SELF"], "f.datec", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
 	if (! empty($arrayfields['f.tms']['checked']))       print_liste_field_titre($arrayfields['f.tms']['label'], $_SERVER["PHP_SELF"], "f.tms", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
-	if (! empty($arrayfields['f.fk_statut']['checked'])) print_liste_field_titre($arrayfields['f.fk_statut']['label'], $_SERVER["PHP_SELF"], "f.fk_statut,f.paye,f.type,dynamount_payed", "", $param, 'align="right"', $sortfield, $sortorder);
+	if (! empty($arrayfields['f.fk_statut']['checked'])) print_liste_field_titre($arrayfields['f.fk_statut']['label'], $_SERVER["PHP_SELF"], "f.fk_statut,f.paye,f.type,dynamount_payed", "", $param, 'class="right"', $sortfield, $sortorder);
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
 	print "</tr>\n";
 
@@ -1084,7 +1084,7 @@ if ($resql)
 			// Amount HT
 			if (! empty($arrayfields['f.total_ht']['checked']))
 			{
-				  print '<td align="right">'.price($obj->total_ht)."</td>\n";
+				  print '<td class="right">'.price($obj->total_ht)."</td>\n";
 				  if (! $i) $totalarray['nbfield']++;
 				  if (! $i) $totalarray['totalhtfield']=$totalarray['nbfield'];
 				  $totalarray['totalht'] += $obj->total_ht;
@@ -1092,7 +1092,7 @@ if ($resql)
 			// Amount VAT
 			if (! empty($arrayfields['f.total_vat']['checked']))
 			{
-				print '<td align="right">'.price($obj->total_vat)."</td>\n";
+				print '<td class="right">'.price($obj->total_vat)."</td>\n";
 				if (! $i) $totalarray['nbfield']++;
 				if (! $i) $totalarray['totalvatfield']=$totalarray['nbfield'];
 				$totalarray['totalvat'] += $obj->total_vat;
@@ -1100,7 +1100,7 @@ if ($resql)
 			// Amount LocalTax1
 			if (! empty($arrayfields['f.total_localtax1']['checked']))
 			{
-				print '<td align="right">'.price($obj->total_localtax1)."</td>\n";
+				print '<td class="right">'.price($obj->total_localtax1)."</td>\n";
 				if (! $i) $totalarray['nbfield']++;
 				if (! $i) $totalarray['totallocaltax1field']=$totalarray['nbfield'];
 				$totalarray['totallocaltax1'] += $obj->total_localtax1;
@@ -1108,7 +1108,7 @@ if ($resql)
 			// Amount LocalTax2
 			if (! empty($arrayfields['f.total_localtax2']['checked']))
 			{
-				print '<td align="right">'.price($obj->total_localtax2)."</td>\n";
+				print '<td class="right">'.price($obj->total_localtax2)."</td>\n";
 				if (! $i) $totalarray['nbfield']++;
 				if (! $i) $totalarray['totallocaltax2field']=$totalarray['nbfield'];
 				$totalarray['totallocaltax2'] += $obj->total_localtax2;
@@ -1116,7 +1116,7 @@ if ($resql)
 			// Amount TTC
 			if (! empty($arrayfields['f.total_ttc']['checked']))
 			{
-				print '<td align="right">'.price($obj->total_ttc)."</td>\n";
+				print '<td class="right">'.price($obj->total_ttc)."</td>\n";
 				if (! $i) $totalarray['nbfield']++;
 				if (! $i) $totalarray['totalttcfield']=$totalarray['nbfield'];
 				$totalarray['totalttc'] += $obj->total_ttc;
@@ -1124,7 +1124,7 @@ if ($resql)
 
 			if (! empty($arrayfields['dynamount_payed']['checked']))
 			{
-				print '<td align="right">'.(! empty($totalpay)?price($totalpay, 0, $langs):'&nbsp;').'</td>'; // TODO Use a denormalized field
+				print '<td class="right">'.(! empty($totalpay)?price($totalpay, 0, $langs):'&nbsp;').'</td>'; // TODO Use a denormalized field
 				if (! $i) $totalarray['nbfield']++;
 				if (! $i) $totalarray['totalamfield']=$totalarray['nbfield'];
 				$totalarray['totalam'] += $totalpay;
@@ -1132,7 +1132,7 @@ if ($resql)
 
 			if (! empty($arrayfields['rtp']['checked']))
 			{
-				print '<td align="right">'.(! empty($remaintopay)?price($remaintopay, 0, $langs):'&nbsp;').'</td>'; // TODO Use a denormalized field
+				print '<td class="right">'.(! empty($remaintopay)?price($remaintopay, 0, $langs):'&nbsp;').'</td>'; // TODO Use a denormalized field
 				if (! $i) $totalarray['nbfield']++;
 				if (! $i) $totalarray['totalrtpfield']=$totalarray['nbfield'];
 				$totalarray['totalrtp'] += $remaintopay;
@@ -1163,7 +1163,7 @@ if ($resql)
 			// Status
 			if (! empty($arrayfields['f.fk_statut']['checked']))
 			{
-				print '<td align="right" class="nowrap">';
+				print '<td class="nowrap right">';
 				print $facturestatic->LibStatut($obj->paye, $obj->fk_statut, 5, $paiement, $obj->type);
 				print "</td>";
 				if (! $i) $totalarray['nbfield']++;
@@ -1205,13 +1205,13 @@ if ($resql)
 					if ($num < $limit && empty($offset)) print '<td class="left">'.$langs->trans("Total").'</td>';
 					else print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
 			   }
-			   elseif ($totalarray['totalhtfield'] == $i)  print '<td align="right">'.price($totalarray['totalht']).'</td>';
+			   elseif ($totalarray['totalhtfield'] == $i)  print '<td class="right">'.price($totalarray['totalht']).'</td>';
-			   elseif ($totalarray['totalvatfield'] == $i) print '<td align="right">'.price($totalarray['totalvat']).'</td>';
+			   elseif ($totalarray['totalvatfield'] == $i) print '<td class="right">'.price($totalarray['totalvat']).'</td>';
-			   elseif ($totalarray['totallocaltax1field'] == $i) print '<td align="right">'.price($totalarray['totallocaltax1']).'</td>';
+			   elseif ($totalarray['totallocaltax1field'] == $i) print '<td class="right">'.price($totalarray['totallocaltax1']).'</td>';
-			   elseif ($totalarray['totallocaltax2field'] == $i) print '<td align="right">'.price($totalarray['totallocaltax2']).'</td>';
+			   elseif ($totalarray['totallocaltax2field'] == $i) print '<td class="right">'.price($totalarray['totallocaltax2']).'</td>';
-			   elseif ($totalarray['totalttcfield'] == $i) print '<td align="right">'.price($totalarray['totalttc']).'</td>';
+			   elseif ($totalarray['totalttcfield'] == $i) print '<td class="right">'.price($totalarray['totalttc']).'</td>';
-			   elseif ($totalarray['totalamfield'] == $i)  print '<td align="right">'.price($totalarray['totalam']).'</td>';
+			   elseif ($totalarray['totalamfield'] == $i)  print '<td class="right">'.price($totalarray['totalam']).'</td>';
-			   elseif ($totalarray['totalrtpfield'] == $i)  print '<td align="right">'.price($totalarray['totalrtp']).'</td>';
+			   elseif ($totalarray['totalrtpfield'] == $i)  print '<td class="right">'.price($totalarray['totalrtp']).'</td>';
 			   else print '<td></td>';
 			}
 			print '</tr>';

htdocs/compta/facture/prelevement.php

@@ -274,7 +274,7 @@ if ($object->id > 0)
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans('DateInvoice');
 	print '</td>';
-	if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editinvoicedate' && ! empty($object->brouillon) && $user->rights->facture->creer) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editinvoicedate&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';
+	if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editinvoicedate' && ! empty($object->brouillon) && $user->rights->facture->creer) print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editinvoicedate&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';
 	print '</tr></table>';
 	print '</td><td colspan="3">';
 
@@ -301,7 +301,7 @@ if ($object->id > 0)
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans('PaymentConditionsShort');
 	print '</td>';
-	if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editconditions' && ! empty($object->brouillon) && $user->rights->facture->creer) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;id='.$object->id.'">'.img_edit($langs->trans('SetConditions'), 1).'</a></td>';
+	if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editconditions' && ! empty($object->brouillon) && $user->rights->facture->creer) print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;id='.$object->id.'">'.img_edit($langs->trans('SetConditions'), 1).'</a></td>';
 	print '</tr></table>';
 	print '</td><td colspan="3">';
 	if ($object->type != Facture::TYPE_CREDIT_NOTE)
@@ -326,7 +326,7 @@ if ($object->id > 0)
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans('DateMaxPayment');
 	print '</td>';
-	if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editpaymentterm' && ! empty($object->brouillon) && $user->rights->facture->creer) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editpaymentterm&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';
+	if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editpaymentterm' && ! empty($object->brouillon) && $user->rights->facture->creer) print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editpaymentterm&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';
 	print '</tr></table>';
 	print '</td><td colspan="3">';
 	if ($object->type != Facture::TYPE_CREDIT_NOTE)
@@ -354,7 +354,7 @@ if ($object->id > 0)
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans('PaymentMode');
 	print '</td>';
-	if ($action != 'editmode' && ! empty($object->brouillon) && $user->rights->facture->creer) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;id='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
+	if ($action != 'editmode' && ! empty($object->brouillon) && $user->rights->facture->creer) print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;id='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
 	print '</tr></table>';
 	print '</td><td colspan="3">';
 	if ($action == 'editmode')
@@ -373,7 +373,7 @@ if ($object->id > 0)
 	print $langs->trans('BankAccount');
 	print '<td>';
 	if (($action != 'editbankaccount') && $user->rights->commande->creer && ! empty($object->brouillon))
-	    print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
+	    print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
 	print '</tr></table>';
 	print '</td><td colspan="3">';
 	if ($action == 'editbankaccount')
@@ -447,7 +447,7 @@ if ($object->id > 0)
 	    print '</td>';
 	    if ($action != 'editrevenuestamp' && ! empty($object->brouillon) && $user->rights->facture->creer)
 	    {
-	        print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editrevenuestamp&amp;facid=' . $object->id . '">' . img_edit($langs->trans('SetRevenuStamp'), 1) . '</a></td>';
+	        print '<td class="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editrevenuestamp&amp;facid=' . $object->id . '">' . img_edit($langs->trans('SetRevenuStamp'), 1) . '</a></td>';
 	    }
         print '</tr></table>';
         print '</td><td>';
@@ -615,7 +615,7 @@ if ($object->id > 0)
 
 			print '<td align="center">'.$langs->trans("OrderWaiting").'</td>';
 
-			print '<td align="right">';
+			print '<td class="right">';
 			print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=delete&amp;did='.$obj->rowid.'">';
 			print img_delete();
 			print '</a></td>';

htdocs/compta/journal/purchasesjournal.php

@@ -182,7 +182,7 @@ print "<tr class=\"liste_titre\">";
 print "<td>".$langs->trans("Date")."</td>";
 print "<td>".$langs->trans("Piece").' ('.$langs->trans("InvoiceRef").")</td>";
 print "<td>".$langs->trans("Account")."</td>";
-print "<td>".$langs->trans("Type")."</td><td align='right'>".$langs->trans("Debit")."</td><td align='right'>".$langs->trans("Credit")."</td>";
+print "<td>".$langs->trans("Type")."</td><td class='right'>".$langs->trans("Debit")."</td><td class='right'>".$langs->trans("Credit")."</td>";
 print "</tr>\n";
 
 
@@ -236,13 +236,13 @@ foreach ($tabfac as $key => $val)
 
 				if (isset($line['inv']))
 				{
-					print '<td align="right">'.($mt<0?price(-$mt):'')."</td>";
+					print '<td class="right">'.($mt<0?price(-$mt):'')."</td>";
-	    			print '<td align="right">'.($mt>=0?price($mt):'')."</td>";
+	    			print '<td class="right">'.($mt>=0?price($mt):'')."</td>";
 				}
 				else
 				{
-					print '<td align="right">'.($mt>=0?price($mt):'')."</td>";
+					print '<td class="right">'.($mt>=0?price($mt):'')."</td>";
-					print '<td align="right">'.($mt<0?price(-$mt):'')."</td>";
+					print '<td class="right">'.($mt<0?price(-$mt):'')."</td>";
 				}
 
 				print "</tr>";

htdocs/compta/journal/sellsjournal.php

@@ -211,7 +211,7 @@ print '<tr class="liste_titre">';
 //print "<td>".$langs->trans("JournalNum")."</td>";
 print '<td>'.$langs->trans('Date').'</td><td>'.$langs->trans('Piece').' ('.$langs->trans('InvoiceRef').')</td>';
 print '<td>'.$langs->trans('Account').'</td>';
-print '<td>'.$langs->trans('Type').'</td><td align="right">'.$langs->trans('Debit').'</td><td align="right">'.$langs->trans('Credit').'</td>';
+print '<td>'.$langs->trans('Type').'</td><td class="right">'.$langs->trans('Debit').'</td><td class="right">'.$langs->trans('Credit').'</td>';
 print "</tr>\n";
 
 
@@ -266,13 +266,13 @@ foreach ($tabfac as $key => $val)
 
 				if (isset($line['inv']))
 				{
-					print '<td align="right">'.($mt>=0?price($mt):'')."</td>";
+					print '<td class="right">'.($mt>=0?price($mt):'')."</td>";
-					print '<td align="right">'.($mt<0?price(-$mt):'')."</td>";
+					print '<td class="right">'.($mt<0?price(-$mt):'')."</td>";
 				}
 				else
 				{
-					print '<td align="right">'.($mt<0?price(-$mt):'')."</td>";
+					print '<td class="right">'.($mt<0?price(-$mt):'')."</td>";
-	    			print '<td align="right">'.($mt>=0?price($mt):'')."</td>";
+	    			print '<td class="right">'.($mt>=0?price($mt):'')."</td>";
 				}
 
 				print "</tr>";

htdocs/compta/localtax/clients.php

@@ -157,13 +157,13 @@ $vatsup=$langs->transcountry($local==1?"LT1":"LT2", $mysoc->country_code);
 // IRPF that the customer has retained me
 if($calc ==0 || $calc == 2)
 {
-	print "<table class=\"noborder\" width=\"100%\">";
+	print '<table class="noborder" width="100%">';
-	print "<tr class=\"liste_titre\">";
+	print '<tr class="liste_titre">';
-	print '<td class="left">'.$langs->trans("Num")."</td>";
+	print '<td class="left">'.$langs->trans("Num").'</td>';
-	print '<td class="left">'.$langs->trans("Customer")."</td>";
+	print '<td class="left">'.$langs->trans("Customer").'</td>';
-	print "<td>".$langs->transcountry("ProfId1", $mysoc->country_code)."</td>";
+	print '<td>'.$langs->transcountry("ProfId1", $mysoc->country_code).'</td>';
-	print "<td align=\"right\">".$langs->trans("TotalHT")."</td>";
+	print '<td class="right">'.$langs->trans("TotalHT").'</td>';
-	print "<td align=\"right\">".$vatcust."</td>";
+	print '<td class="right">'.$vatcust.'</td>';
 	print "</tr>\n";
 
 	$coll_list = tax_by_thirdparty('localtax'.$local, $db, 0, $date_start, $date_end, $modetax, 'sell');
@@ -208,9 +208,9 @@ if($calc ==0 || $calc == 2)
 				print '<td class="nowrap">'.$company_static->getNomUrl(1).'</td>';
 				$find = array(' ','.');
 				$replace = array('','');
-				print '<td class="nowrap">'.$intra."</td>";
+				print '<td class="nowrap">'.$intra.'</td>';
-				print "<td class=\"nowrap\" align=\"right\">".price($coll->amount)."</td>";
+				print '<td class="nowrap right">'.price($coll->amount).'</td>';
-				print "<td class=\"nowrap\" align=\"right\">".price($local==1?$coll->localtax1:$coll->localtax2)."</td>";
+				print '<td class="nowrap right">'.price($local==1?$coll->localtax1:$coll->localtax2).'</td>';
 	            $totalamount = $totalamount + $coll->amount;
 				$total = $total + ($local==1?$coll->localtax1:$coll->localtax2);
 				print "</tr>\n";
@@ -219,9 +219,9 @@ if($calc ==0 || $calc == 2)
 		}
 	    $x_coll_sum = $total;
 
-		print '<tr class="liste_total"><td align="right" colspan="3">'.$langs->trans("Total").':</td>';
+		print '<tr class="liste_total"><td class="right" colspan="3">'.$langs->trans("Total").':</td>';
-	    print '<td class="nowrap" align="right">'.price($totalamount).'</td>';
+	    print '<td class="nowrap right">'.price($totalamount).'</td>';
-		print '<td class="nowrap" align="right">'.price($total).'</td>';
+		print '<td class="nowrap right">'.price($total).'</td>';
 		print '</tr>';
 	}
 	else
@@ -238,13 +238,13 @@ if($calc ==0 || $calc == 2)
 
 // IRPF I retained my supplier
 if($calc ==0 || $calc == 1){
-	print "<table class=\"noborder\" width=\"100%\">";
+	print '<table class="noborder" width="100%">';
-	print "<tr class=\"liste_titre\">";
+	print '<tr class="liste_titre">';
 	print '<td class="left">'.$langs->trans("Num")."</td>";
 	print '<td class="left">'.$langs->trans("Supplier")."</td>";
-	print "<td>".$langs->transcountry("ProfId1", $mysoc->country_code)."</td>";
+	print '<td>'.$langs->transcountry("ProfId1", $mysoc->country_code).'</td>';
-	print "<td align=\"right\">".$langs->trans("TotalHT")."</td>";
+	print '<td class="right">'.$langs->trans("TotalHT").'</td>';
-	print "<td align=\"right\">".$vatsup."</td>";
+	print '<td class="right">'.$vatsup.'</td>';
 	print "</tr>\n";
 
 	$company_static=new Societe($db);
@@ -283,8 +283,8 @@ if($calc ==0 || $calc == 1){
 				$find = array(' ','.');
 				$replace = array('','');
 				print '<td class="nowrap">'.$intra."</td>";
-				print "<td class=\"nowrap\" align=\"right\">".price($coll->amount)."</td>";
+				print '<td class="nowrap right">'.price($coll->amount).'</td>';
-				print "<td class=\"nowrap\" align=\"right\">".price($local==1?$coll->localtax1:$coll->localtax2)."</td>";
+				print '<td class="nowrap right">'.price($local==1?$coll->localtax1:$coll->localtax2).'</td>';
 	            $totalamount = $totalamount + $coll->amount;
 				$total = $total + ($local==1?$coll->localtax1:$coll->localtax2);
 				print "</tr>\n";
@@ -293,9 +293,9 @@ if($calc ==0 || $calc == 1){
 		}
 	    $x_paye_sum = $total;
 
-		print '<tr class="liste_total"><td align="right" colspan="3">'.$langs->trans("Total").':</td>';
+		print '<tr class="liste_total"><td class="right" colspan="3">'.$langs->trans("Total").':</td>';
-	    print '<td class="nowrap" align="right">'.price($totalamount).'</td>';
+	    print '<td class="nowrap right">'.price($totalamount).'</td>';
-		print '<td class="nowrap" align="right">'.price($total).'</td>';
+		print '<td class="nowrap right">'.price($total).'</td>';
 		print '</tr>';
 
 		print '</table>';
@@ -319,7 +319,7 @@ if($calc ==0){
 	$diff = $x_coll_sum - $x_paye_sum ;
 	print '<tr class="liste_total">';
 	print '<td class="liste_total" colspan="4">'.$langs->trans("TotalToPay").($q?', '.$langs->trans("Quadri").' '.$q:'').'</td>';
-	print '<td class="liste_total nowrap" align="right"><b>'.price(price2num($diff, 'MT'))."</b></td>\n";
+	print '<td class="liste_total nowrap right"><b>'.price(price2num($diff, 'MT'))."</b></td>\n";
 	print "</tr>\n";
 }
 print '</table>';

htdocs/compta/localtax/index.php

@@ -101,8 +101,8 @@ function pt($db, $sql, $date)
 
         print '<tr class="liste_titre">';
         print '<td class="nowrap">'.$date.'</td>';
-        print '<td align="right">'.$langs->trans("ClaimedForThisPeriod").'</td>';
+        print '<td class="right">'.$langs->trans("ClaimedForThisPeriod").'</td>';
-        print '<td align="right">'.$langs->trans("PaidDuringThisPeriod").'</td>';
+        print '<td class="right">'.$langs->trans("PaidDuringThisPeriod").'</td>';
         print "</tr>\n";
 
         $totalclaimed = 0;
@@ -122,8 +122,8 @@ function pt($db, $sql, $date)
             {
             	print '<tr class="oddeven">';
             	print '<td class="nowrap">'.$previousmonth."</td>\n";
-            	print '<td class="nowrap" align="right">'.price($amountclaimed)."</td>\n";
+            	print '<td class="nowrap right">'.price($amountclaimed)."</td>\n";
-            	print '<td class="nowrap" align="right">'.price($amountpaid)."</td>\n";
+            	print '<td class="nowrap right">'.price($amountpaid)."</td>\n";
             	print "</tr>\n";
 
             	$amountclaimed = 0;
@@ -145,8 +145,8 @@ function pt($db, $sql, $date)
             {
             	print '<tr class="oddeven">';
             	print '<td class="nowrap">'.$obj->dm."</td>\n";
-            	print '<td class="nowrap" align="right">'.price($amountclaimed)."</td>\n";
+            	print '<td class="nowrap right">'.price($amountclaimed)."</td>\n";
-            	print '<td class="nowrap" align="right">'.price($amountpaid)."</td>\n";
+            	print '<td class="nowrap right">'.price($amountpaid)."</td>\n";
             	print "</tr>\n";
             	$amountclaimed = 0;
             	$amountpaid = 0;
@@ -166,8 +166,8 @@ function pt($db, $sql, $date)
         {
         	print '<tr class="oddeven">';
         	print '<td class="nowrap">'.$previousmonth."</td>\n";
-        	print '<td class="nowrap" align="right">'.price($amountclaimed)."</td>\n";
+        	print '<td class="nowrap right">'.price($amountclaimed)."</td>\n";
-        	print '<td class="nowrap" align="right">'.price($amountpaid)."</td>\n";
+        	print '<td class="nowrap right">'.price($amountpaid)."</td>\n";
         	print "</tr>\n";
 
         	$amountclaimed = 0;
@@ -175,9 +175,9 @@ function pt($db, $sql, $date)
         }
 
         print '<tr class="liste_total">';
-        print '<td align="right">'.$langs->trans("Total").'</td>';
+        print '<td class="right">'.$langs->trans("Total").'</td>';
-        print '<td class="nowrap" align="right">'.price($totalclaimed).'</td>';
+        print '<td class="nowrap right">'.price($totalclaimed).'</td>';
-        print '<td class="nowrap" align="right">'.price($totalpaid).'</td>';
+        print '<td class="nowrap right">'.price($totalpaid).'</td>';
         print "</tr>";
 
         print "</table>";
@@ -249,16 +249,16 @@ print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td width="30%">'.$langs->trans("Year")." ".$y."</td>";
 if($CalcLT==0) {
-    print "<td align=\"right\">".$langs->transcountry($LTCustomer, $mysoc->country_code)."</td>";
+    print '<td class="right">'.$langs->transcountry($LTCustomer, $mysoc->country_code).'</td>';
-    print "<td align=\"right\">".$langs->transcountry($LTSupplier, $mysoc->country_code)."</td>";
+    print '<td class="right">'.$langs->transcountry($LTSupplier, $mysoc->country_code).'</td>';
 }
 if($CalcLT==1) {
-    print "<td align=\"right\">".$langs->transcountry($LTSupplier, $mysoc->country_code)."</td><td></td>";
+    print '<td class="right">'.$langs->transcountry($LTSupplier, $mysoc->country_code).'</td><td></td>';
 }
 if($CalcLT==2) {
-    print "<td align=\"right\">".$langs->transcountry($LTCustomer, $mysoc->country_code)."</td><td></td>";
+    print '<td class="right">'.$langs->transcountry($LTCustomer, $mysoc->country_code).'</td><td></td>';
 }
-print "<td align=\"right\">".$langs->trans("TotalToPay")."</td>";
+print '<td class="right">'.$langs->trans("TotalToPay").'</td>';
 print "<td>&nbsp;</td>\n";
 print "</tr>\n";
 
@@ -475,7 +475,7 @@ while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000)	// $mc
     		$x_coll_sum           += $temp_vat;
     	}
     }
-    print "<td class=\"nowrap\" align=\"right\">".price(price2num($x_coll_sum, 'MT'))."</td>";
+    print '<td class="nowrap right">'.price(price2num($x_coll_sum, 'MT')).'</td>';
 
     $x_paye_sum = 0;
     foreach (array_keys($x_paye) as $rate)
@@ -519,7 +519,7 @@ while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000)	// $mc
     		$x_paye_sum           += $temp_vat;
     	}
     }
-    print "<td class=\"nowrap\" align=\"right\">".price(price2num($x_paye_sum, 'MT'))."</td>";
+    print '<td class="nowrap right">'.price(price2num($x_paye_sum, 'MT')).'</td>';
 
     $subtotalcoll = $subtotalcoll + $x_coll_sum;
     $subtotalpaye = $subtotalpaye + $x_paye_sum;
@@ -528,7 +528,7 @@ while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000)	// $mc
     $total = $total + $diff;
     $subtotal = price2num($subtotal + $diff, 'MT');
 
-    print "<td class=\"nowrap\" align=\"right\">".price(price2num($diff, 'MT'))."</td>\n";
+    print '<td class="nowrap right">'.price(price2num($diff, 'MT')).'</td>\n';
     print "<td>&nbsp;</td>\n";
     print "</tr>\n";
 
@@ -536,16 +536,16 @@ while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000)	// $mc
     if ($i > 2)
     {
     	print '<tr class="liste_total">';
-    	print '<td align="right"><a href="quadri_detail.php?leftmenu=tax_vat&q='.round($m/3).'&year='.$y.'">'.$langs->trans("SubTotal").'</a>:</td>';
+    	print '<td class="right"><a href="quadri_detail.php?leftmenu=tax_vat&q='.round($m/3).'&year='.$y.'">'.$langs->trans("SubTotal").'</a>:</td>';
-    	print '<td class="nowrap" align="right">'.price(price2num($subtotalcoll, 'MT')).'</td>';
+    	print '<td class="nowrap right">'.price(price2num($subtotalcoll, 'MT')).'</td>';
-    	print '<td class="nowrap" align="right">'.price(price2num($subtotalpaye, 'MT')).'</td>';
+    	print '<td class="nowrap right">'.price(price2num($subtotalpaye, 'MT')).'</td>';
-    	print '<td class="nowrap" align="right">'.price(price2num($subtotal, 'MT')).'</td>';
+    	print '<td class="nowrap right">'.price(price2num($subtotal, 'MT')).'</td>';
     	print '<td>&nbsp;</td></tr>';
     	$i = 0;
     	$subtotalcoll=0; $subtotalpaye=0; $subtotal=0;
     }
 }
-print '<tr class="liste_total"><td align="right" colspan="3">'.$langs->trans("TotalToPay").':</td><td class="nowrap" align="right">'.price(price2num($total, 'MT')).'</td>';
+print '<tr class="liste_total"><td class="right" colspan="3">'.$langs->trans("TotalToPay").':</td><td class="nowrap right">'.price(price2num($total, 'MT')).'</td>';
 print "<td>&nbsp;</td>\n";
 print '</tr>';
 

htdocs/compta/localtax/list.php

@@ -93,7 +93,7 @@ if ($result)
         $i++;
     }
     print '<tr class="liste_total"><td colspan="4">'.$langs->trans("Total").'</td>';
-    print '<td align="right">'.price($total).'</td></tr>';
+    print '<td class="right">'.price($total).'</td></tr>';
 
     print "</table>";
     $db->free($result);

htdocs/compta/localtax/quadri_detail.php

@@ -320,10 +320,10 @@ else
 		print '<tr class="liste_titre">';
 		print '<td class="left">'.$elementcust.'</td>';
 		print '<td class="left">'.$productcust.'</td>';
-		if ($modetax != 2) print '<td align="right">'.$amountcust.'</td>';
+		if ($modetax != 2) print '<td class="right">'.$amountcust.'</td>';
-		if ($modetax != 1) print '<td align="right">'.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')</td>';
+		if ($modetax != 1) print '<td class="right">'.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')</td>';
-		print '<td align="right">'.$langs->trans("BI").'</td>';
+		print '<td class="right">'.$langs->trans("BI").'</td>';
-		print '<td align="right">'.$vatcust.'</td>';
+		print '<td class="right">'.$vatcust.'</td>';
 		print '</tr>';
 
 
@@ -357,7 +357,7 @@ else
 						print '<tr class="oddeven">';
 
 						// Ref
-						print '<td class="nowrap" align="left">'.$fields['link'].'</td>';
+						print '<td class="nowrap left">'.$fields['link'].'</td>';
 
 						// Description
 						print '<td class="left">';
@@ -389,7 +389,7 @@ else
 						// Total HT
 						if ($modetax != 2)
 						{
-							print '<td class="nowrap" align="right">';
+							print '<td class="nowrap right">';
 							print price($fields['totalht']);
 							if (price2num($fields['ftotal_ttc']))
 							{
@@ -403,7 +403,7 @@ else
 						if ($modetax != 1)
 						{
 							if (isset($fields['payment_amount']) && $fields['ftotal_ttc']) $ratiopaymentinvoice=($fields['payment_amount']/$fields['ftotal_ttc']);
-							print '<td class="nowrap" align="right">';
+							print '<td class="nowrap right">';
 							if ($fields['payment_amount'] && $fields['ftotal_ttc'])
 							{
 								$payment_static->id=$fields['payment_id'];
@@ -421,14 +421,14 @@ else
 						}
 
 						// Total collected
-						print '<td class="nowrap" align="right">';
+						print '<td class="nowrap right">';
 						$temp_ht=$fields['totalht'];
 						if ($type == 1) $temp_ht=$fields['totalht']*$ratiopaymentinvoice;
 						print price(price2num($temp_ht, 'MT'));
 						print '</td>';
 
 						// Localtax
-						print '<td class="nowrap" align="right">';
+						print '<td class="nowrap right">';
 						$temp_vat= $local==1?$fields['localtax1']:$fields['localtax2'];
 						print price(price2num($temp_vat, 'MT'));
 						//print price($fields['vat']);
@@ -445,14 +445,14 @@ else
 		    // Total customers for this vat rate
 		    print '<tr class="liste_total">';
 		    print '<td></td>';
-		    print '<td align="right">'.$langs->trans("Total").':</td>';
+		    print '<td class="right">'.$langs->trans("Total").':</td>';
 		    if ($modetax != 1)
 		    {
-		        print '<td class="nowrap" align="right">&nbsp;</td>';
+		        print '<td class="nowrap right">&nbsp;</td>';
-		        print '<td align="right">&nbsp;</td>';
+		        print '<td class="right">&nbsp;</td>';
 		    }
-		    print '<td align="right">'.price(price2num($subtot_coll_total_ht, 'MT')).'</td>';
+		    print '<td class="right">'.price(price2num($subtot_coll_total_ht, 'MT')).'</td>';
-		    print '<td class="nowrap" align="right">'.price(price2num($subtot_coll_vat, 'MT')).'</td>';
+		    print '<td class="nowrap right">'.price(price2num($subtot_coll_vat, 'MT')).'</td>';
 		    print '</tr>';
 		}
 
@@ -460,14 +460,14 @@ else
 	    {
 	        print '<tr class="liste_total">';
 	        print '<td>&nbsp;</td>';
-	        print '<td align="right">'.$langs->trans("Total").':</td>';
+	        print '<td class="right">'.$langs->trans("Total").':</td>';
 	        if ($modetax == 0)
 	        {
-	            print '<td class="nowrap" align="right">&nbsp;</td>';
+	            print '<td class="nowrap right">&nbsp;</td>';
-	            print '<td align="right">&nbsp;</td>';
+	            print '<td class="right">&nbsp;</td>';
 	        }
-	        print '<td align="right">'.price(price2num(0, 'MT')).'</td>';
+	        print '<td class="right">'.price(price2num(0, 'MT')).'</td>';
-	        print '<td class="nowrap" align="right">'.price(price2num(0, 'MT')).'</td>';
+	        print '<td class="nowrap right">'.price(price2num(0, 'MT')).'</td>';
 	        print '</tr>';
 	    }
 
@@ -485,11 +485,11 @@ else
 		print '<td class="left">'.$productsup.'</td>';
 		if ($modetax != 1)
 		{
-			print '<td align="right">'.$amountsup.'</td>';
+			print '<td class="right">'.$amountsup.'</td>';
-			print '<td align="right">'.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')</td>';
+			print '<td class="right">'.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')</td>';
 		}
-		print '<td align="right">'.$langs->trans("BI").'</td>';
+		print '<td class="right">'.$langs->trans("BI").'</td>';
-		print '<td align="right">'.$vatsup.'</td>';
+		print '<td class="right">'.$vatsup.'</td>';
 		print '</tr>'."\n";
 
 		foreach(array_keys($x_paye) as $rate)
@@ -519,7 +519,7 @@ else
 						print '<tr class="oddeven">';
 
 						// Ref
-						print '<td class="nowrap" align="left">'.$fields['link'].'</td>';
+						print '<td class="nowrap left">'.$fields['link'].'</td>';
 
 						// Description
 						print '<td class="left">';
@@ -545,7 +545,7 @@ else
 						// Total HT
 						if ($modetax != 2)
 						{
-							print '<td class="nowrap" align="right">';
+							print '<td class="nowrap right">';
 							print price($fields['totalht']);
 							if (price2num($fields['ftotal_ttc']))
 							{
@@ -560,7 +560,7 @@ else
 						$ratiopaymentinvoice=1;
 						if ($modetax != 1)
 						{
-							print '<td class="nowrap" align="right">';
+							print '<td class="nowrap right">';
 							if (isset($fields['payment_amount']) && $fields['ftotal_ttc']) $ratiopaymentinvoice=($fields['payment_amount']/$fields['ftotal_ttc']);
 							if ($fields['payment_amount'] && $fields['ftotal_ttc'])
 							{
@@ -582,13 +582,13 @@ else
 						}
 
 						// VAT paid
-						print '<td class="nowrap" align="right">';
+						print '<td class="nowrap right">';
 						$temp_ht=$fields['totalht']*$ratiopaymentinvoice;
 						print price(price2num($temp_ht, 'MT'), 1);
 						print '</td>';
 
 						// Localtax
-						print '<td class="nowrap" align="right">';
+						print '<td class="nowrap right">';
 						$temp_vat=($local==1?$fields['localtax1']:$fields['localtax2'])*$ratiopaymentinvoice;
 						print price(price2num($temp_vat, 'MT'), 1);
 						//print price($fields['vat']);
@@ -605,27 +605,27 @@ else
 		    // Total suppliers for this vat rate
 		    print '<tr class="liste_total">';
 		    print '<td>&nbsp;</td>';
-		    print '<td align="right">'.$langs->trans("Total").':</td>';
+		    print '<td class="right">'.$langs->trans("Total").':</td>';
 		    if ($modetax != 1)
 		    {
-		        print '<td class="nowrap" align="right">&nbsp;</td>';
+		        print '<td class="nowrap right">&nbsp;</td>';
-		        print '<td align="right">&nbsp;</td>';
+		        print '<td class="right">&nbsp;</td>';
 		    }
-		    print '<td align="right">'.price(price2num($subtot_paye_total_ht, 'MT')).'</td>';
+		    print '<td class="right">'.price(price2num($subtot_paye_total_ht, 'MT')).'</td>';
-		    print '<td class="nowrap" align="right">'.price(price2num($subtot_paye_vat, 'MT')).'</td>';
+		    print '<td class="nowrap right">'.price(price2num($subtot_paye_vat, 'MT')).'</td>';
 		    print '</tr>';
 		}
 
 		if (count($x_paye) == 0) {  // Show a total line if nothing shown
 			print '<tr class="liste_total">';
 			print '<td>&nbsp;</td>';
-			print '<td align="right">'.$langs->trans("Total").':</td>';
+			print '<td class="right">'.$langs->trans("Total").':</td>';
 			if ($modetax != 1) {
-				print '<td class="nowrap" align="right">&nbsp;</td>';
+				print '<td class="nowrap right">&nbsp;</td>';
-				print '<td align="right">&nbsp;</td>';
+				print '<td class="right">&nbsp;</td>';
 			}
-			print '<td align="right">'.price(price2num(0, 'MT')).'</td>';
+			print '<td class="right">'.price(price2num(0, 'MT')).'</td>';
-			print '<td class="nowrap" align="right">'.price(price2num(0, 'MT')).'</td>';
+			print '<td class="nowrap right">'.price(price2num(0, 'MT')).'</td>';
 			print '</tr>';
 		}
 
@@ -638,7 +638,7 @@ else
     $diff = $x_coll_sum - $x_paye_sum;
 	print '<tr class="liste_total">';
 	print '<td class="liste_total" colspan="'.$span.'">'.$langs->trans("TotalToPay").($q?', '.$langs->trans("Quadri").' '.$q:'').'</td>';
-	print '<td class="liste_total nowrap" align="right"><b>'.price(price2num($diff, 'MT'))."</b></td>\n";
+	print '<td class="liste_total nowrap right"><b>'.price(price2num($diff, 'MT'))."</b></td>\n";
 	print "</tr>\n";
 
 	$i++;

htdocs/compta/paiement.php

@@ -8,7 +8,7 @@
  * Copyright (C) 2014       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2014       Teddy Andreotti         <125155@supinfo.com>
  * Copyright (C) 2015       Juanjo Menent           <jmenent@2byte.es>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2019  Frédéric France         <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -763,7 +763,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
                 {
                     // Print total
                     print '<tr class="liste_total">';
-                    print '<td colspan="2" align="left">'.$langs->trans('TotalTTC').'</td>';
+                    print '<td colspan="3" align="left">'.$langs->trans('TotalTTC').'</td>';
                     if (!empty($conf->multicurrency->enabled)) {
                     	print '<td></td>';
                     	print '<td></td>';

htdocs/compta/paiement/card.php

@@ -343,10 +343,10 @@ if ($resql)
 	print '<td>'.$langs->trans('Bill').'</td>';
 	print '<td>'.$langs->trans('Company').'</td>';
 	if($conf->global->MULTICOMPANY_INVOICE_SHARING_ENABLED )print '<td>'.$langs->trans('Entity').'</td>';
-	print '<td align="right">'.$langs->trans('ExpectedToPay').'</td>';
+	print '<td class="right">'.$langs->trans('ExpectedToPay').'</td>';
-    print '<td align="right">'.$langs->trans('PayedByThisPayment').'</td>';
+    print '<td class="right">'.$langs->trans('PayedByThisPayment').'</td>';
-    print '<td align="right">'.$langs->trans('RemainderToPay').'</td>';
+    print '<td class="right">'.$langs->trans('RemainderToPay').'</td>';
-    print '<td align="right">'.$langs->trans('Status').'</td>';
+    print '<td class="right">'.$langs->trans('Status').'</td>';
 	print "</tr>\n";
 
 	if ($num > 0)
@@ -386,16 +386,16 @@ if ($resql)
 				print '</td>';
 			}
 			// Expected to pay
-			print '<td align="right">'.price($objp->total_ttc).'</td>';
+			print '<td class="right">'.price($objp->total_ttc).'</td>';
 
             // Amount payed
-            print '<td align="right">'.price($objp->amount).'</td>';
+            print '<td class="right">'.price($objp->amount).'</td>';
 
             // Remain to pay
-            print '<td align="right">'.price($remaintopay).'</td>';
+            print '<td class="right">'.price($remaintopay).'</td>';
 
 			// Status
-			print '<td align="right">'.$invoice->getLibStatut(5, $alreadypayed).'</td>';
+			print '<td class="right">'.$invoice->getLibStatut(5, $alreadypayed).'</td>';
 
 			print "</tr>\n";
 			if ($objp->paye == 1)	// If at least one invoice is paid, disable delete

htdocs/compta/paiement/cheque/card.php

@@ -476,7 +476,7 @@ if ($action == 'new')
 		print '<td style="min-width: 120px">'.$langs->trans("ChequeNumber")."</td>\n";
 		print '<td style="min-width: 200px">'.$langs->trans("CheckTransmitter")."</td>\n";
 		print '<td style="min-width: 200px">'.$langs->trans("Bank")."</td>\n";
-		print '<td align="right" width="100px">'.$langs->trans("Amount")."</td>\n";
+		print '<td class="right" width="100px">'.$langs->trans("Amount")."</td>\n";
 		print '<td align="center" width="100px">'.$langs->trans("Payment")."</td>\n";
 		print '<td align="center" width="100px">'.$langs->trans("LineRecord")."</td>\n";
 		print '<td align="center" width="100px">'.$langs->trans("Select")."<br>";
@@ -500,7 +500,7 @@ if ($action == 'new')
 				print '<td>'.$value["numero"]."</td>\n";
 				print '<td>'.$value["emetteur"]."</td>\n";
 				print '<td>'.$value["banque"]."</td>\n";
-				print '<td align="right">'.price($value["amount"], 0, $langs, 1, -1, -1, $conf->currency).'</td>';
+				print '<td class="right">'.price($value["amount"], 0, $langs, 1, -1, -1, $conf->currency).'</td>';
 
 				// Link to payment
 				print '<td align="center">';
@@ -576,7 +576,7 @@ else
     print '<table class="nobordernopadding" width="100%"><tr><td>';
     print $langs->trans('Date');
     print '</td>';
-    if ($action != 'editdate') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdate&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';
+    if ($action != 'editdate') print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdate&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';
     print '</tr></table>';
     print '</td><td colspan="2">';
     if ($action == 'editdate')
@@ -603,7 +603,7 @@ else
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
     print $langs->trans('RefExt');
     print '</td>';
-    if ($action != 'editrefext') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editrefext&amp;id='.$object->id.'">'.img_edit($langs->trans('SetRefExt'),1).'</a></td>';
+    if ($action != 'editrefext') print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editrefext&amp;id='.$object->id.'">'.img_edit($langs->trans('SetRefExt'),1).'</a></td>';
     print '</tr></table>';
     print '</td><td colspan="2">';
     if ($action == 'editrefext')
@@ -674,7 +674,7 @@ else
 		print_liste_field_titre("Numero", $_SERVER["PHP_SELF"], "b.num_chq", "", $param, 'align="center"', $sortfield, $sortorder);
 		print_liste_field_titre("CheckTransmitter", $_SERVER["PHP_SELF"], "b.emetteur", "", $param, "", $sortfield, $sortorder);
 		print_liste_field_titre("Bank", $_SERVER["PHP_SELF"], "b.banque", "", $param, "", $sortfield, $sortorder);
-		print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "b.amount", "", $param, 'align="right"', $sortfield, $sortorder);
+		print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "b.amount", "", $param, 'class="right"', $sortfield, $sortorder);
 		print_liste_field_titre("Payment", $_SERVER["PHP_SELF"], "p.rowid", "", $param, 'align="center"', $sortfield, $sortorder);
 		print_liste_field_titre("LineRecord", $_SERVER["PHP_SELF"], "b.rowid", "", $param, 'align="center"', $sortfield, $sortorder);
 		print_liste_field_titre('');
@@ -698,7 +698,7 @@ else
     			print '<td align="center">'.($objp->num_chq?$objp->num_chq:'&nbsp;').'</td>';
     			print '<td>'.dol_trunc($objp->emetteur, 24).'</td>';
     			print '<td>'.dol_trunc($objp->banque, 24).'</td>';
-    			print '<td align="right">'.price($objp->amount).'</td>';
+    			print '<td class="right">'.price($objp->amount).'</td>';
     			// Link to payment
     			print '<td align="center">';
     			$paymentstatic->id=$objp->pid;
@@ -725,7 +725,7 @@ else
     			}
     			print '</td>';
     			// Action button
-    			print '<td align="right">';
+    			print '<td class="right">';
     			if ($object->statut == 0)
     			{
     				print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=remove&amp;lineid='.$objp->rowid.'">'.img_delete().'</a>';

htdocs/compta/paiement/cheque/index.php

@@ -72,7 +72,7 @@ if ($resql) {
     }
     print '<tr class="oddeven">';
     print '<td>'.$langs->trans("BankChecksToReceipt").'</td>';
-    print '<td align="right">';
+    print '<td class="right">';
     print '<a href="'.DOL_URL_ROOT.'/compta/paiement/cheque/card.php?leftmenu=customers_bills_checks&action=new">'.$num.'</a>';
     print '</td></tr>';
     print "</table>\n";
@@ -106,9 +106,9 @@ if ($resql)
 	print '<th>'.$langs->trans("LastCheckReceiptShort", $max).'</th>';
 	print '<th>'.$langs->trans("Date")."</th>";
 	print '<th>'.$langs->trans("Account").'</th>';
-	print '<th align="right">'.$langs->trans("NbOfCheques").'</th>';
+	print '<th class="right">'.$langs->trans("NbOfCheques").'</th>';
-	print '<th align="right">'.$langs->trans("Amount").'</th>';
+	print '<th class="right">'.$langs->trans("Amount").'</th>';
-	print '<th align="right">'.$langs->trans("Status").'</th>';
+	print '<th class="right">'.$langs->trans("Status").'</th>';
 	print "</tr>\n";
 
 	while ( $objp = $db->fetch_object($resql) )
@@ -131,9 +131,9 @@ if ($resql)
 		print '<td>'.$checkdepositstatic->getNomUrl(1).'</td>';
 		print '<td>'.dol_print_date($db->jdate($objp->db), 'day').'</td>';
 		print '<td>'.$accountstatic->getNomUrl(1).'</td>';
-		print '<td align="right">'.$objp->nbcheque.'</td>';
+		print '<td class="right">'.$objp->nbcheque.'</td>';
-		print '<td align="right">'.price($objp->amount).'</td>';
+		print '<td class="right">'.price($objp->amount).'</td>';
-		print '<td align="right">'.$checkdepositstatic->LibStatut($objp->statut, 3).'</td>';
+		print '<td class="right">'.$checkdepositstatic->LibStatut($objp->statut, 3).'</td>';
 
 		print '</tr>';
 	}

htdocs/compta/paiement/cheque/list.php

@@ -173,11 +173,11 @@ if ($resql)
     $form->select_comptes($search_account, 'search_account', 0, '', 1);
     print '</td>';
 	print '<td class="liste_titre">&nbsp;</td>';
-	print '<td class="liste_titre" align="right">';
+	print '<td class="liste_titre right">';
 	print '<input class="flat maxwidth50" type="text" name="search_amount" value="'.$search_amount.'">';
 	print '</td>';
 	print '<td class="liste_titre"></td>';
-    print '<td class="liste_titre" align="right">';
+    print '<td class="liste_titre right">';
     $searchpicto=$form->showFilterAndCheckAddButtons(0);
     print $searchpicto;
     print '</td>';
@@ -187,9 +187,9 @@ if ($resql)
 	print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "bc.ref", "", $param, "", $sortfield, $sortorder);
 	print_liste_field_titre("DateCreation", $_SERVER["PHP_SELF"], "dp", "", $param, 'align="center"', $sortfield, $sortorder);
 	print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
-	print_liste_field_titre("NbOfCheques", $_SERVER["PHP_SELF"], "bc.nbcheque", "", $param, 'align="right"', $sortfield, $sortorder);
+	print_liste_field_titre("NbOfCheques", $_SERVER["PHP_SELF"], "bc.nbcheque", "", $param, 'class="right"', $sortfield, $sortorder);
-	print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "bc.amount", "", $param, 'align="right"', $sortfield, $sortorder);
+	print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "bc.amount", "", $param, 'class="right"', $sortfield, $sortorder);
-	print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "bc.statut", "", $param, 'align="right"', $sortfield, $sortorder);
+	print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "bc.statut", "", $param, 'class="right"', $sortfield, $sortorder);
 	print_liste_field_titre('');
 	print "</tr>\n";
 
@@ -219,13 +219,13 @@ if ($resql)
     		print '</td>';
 
     		// Number of cheques
-    		print '<td align="right">'.$objp->nbcheque.'</td>';
+    		print '<td class="right">'.$objp->nbcheque.'</td>';
 
     		// Amount
-    		print '<td align="right">'.price($objp->amount).'</td>';
+    		print '<td class="right">'.price($objp->amount).'</td>';
 
     		// Statut
-    		print '<td align="right">';
+    		print '<td class="right">';
     		print $checkdepositstatic->LibStatut($objp->statut, 5);
     		print '</td>';
 

htdocs/compta/paiement/class/paiement.class.php

@@ -725,7 +725,7 @@ class Paiement extends CommonObject
 				// Add link 'WithdrawalPayment' in bank_url
 				if (! $error && $label == '(WithdrawalPayment)')
 				{
-					$result=$acc->add_url_line(
+    $result=$acc->add_url_line(
 						$bank_line_id,
 						$this->id_prelevement,
 						DOL_URL_ROOT.'/compta/prelevement/card.php?id=',

htdocs/compta/paiement/list.php

@@ -225,7 +225,7 @@ if ($resql)
 
     // Lines for filters fields
     print '<tr class="liste_titre_filter">';
-    print '<td class="liste_titre" align="left">';
+    print '<td class="liste_titre left">';
     print '<input class="flat" type="text" size="4" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
     print '</td>';
     print '<td class="liste_titre" align="center">';
@@ -248,16 +248,16 @@ if ($resql)
 	    $form->select_comptes($search_account, 'search_account', 0, '', 1);
 	    print '</td>';
     }
-    print '<td class="liste_titre" align="right">';
+    print '<td class="liste_titre right">';
     print '<input class="flat" type="text" size="4" name="search_amount" value="'.dol_escape_htmltag($search_amount).'">';
 	print '</td>';
-    print '<td class="liste_titre" align="right">';
+    print '<td class="liste_titre right">';
     $searchpicto=$form->showFilterAndCheckAddButtons(0);
     print $searchpicto;
     print '</td>';
     if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
     {
-        print '<td class="liste_titre" align="right">';
+        print '<td class="liste_titre right">';
         print '</td>';
     }
     print "</tr>\n";
@@ -272,8 +272,8 @@ if ($resql)
     {
         print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
     }
-    print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "p.amount", "", $param, 'align="right"', $sortfield, $sortorder);
+    print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "p.amount", "", $param, 'class="right"', $sortfield, $sortorder);
-    //print_liste_field_titre("Invoices"),"","","",$param,'align="left"',$sortfield,$sortorder);
+    //print_liste_field_titre("Invoices"),"","","",$param,'class="left"',$sortfield,$sortorder);
 
 	$parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
     $reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters);    // Note that $action and $object may have been modified by hook
@@ -342,11 +342,11 @@ if ($resql)
 	        print '</td>';
 	    }
 	    // Amount
-        print '<td align="right">'.price($objp->amount).'</td>';
+        print '<td class="right">'.price($objp->amount).'</td>';
 
         if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
         {
-            print '<td align="right">';
+            print '<td class="right">';
             if ($objp->statut == 0) print '<a href="card.php?id='.$objp->rowid.'&amp;action=valide">';
             print $paymentstatic->LibStatut($objp->statut, 5);
             if ($objp->statut == 0) print '</a>';

htdocs/compta/paiement/rapport.php

@@ -142,8 +142,8 @@ if ($year)
         print '<table width="100%" class="noborder">';
         print '<tr class="liste_titre">';
         print '<td>'.$langs->trans("Reporting").'</td>';
-        print '<td align="right">'.$langs->trans("Size").'</td>';
+        print '<td class="right">'.$langs->trans("Size").'</td>';
-        print '<td align="right">'.$langs->trans("Date").'</td>';
+        print '<td class="right">'.$langs->trans("Date").'</td>';
         print '</tr>';
 
         if (is_resource($handle))
@@ -156,8 +156,8 @@ if ($year)
                     $tfile = $dir . '/'.$year.'/'.$file;
                     $relativepath = $year.'/'.$file;
                     print '<tr class="oddeven">'.'<td><a data-ajax="false" href="'.DOL_URL_ROOT . '/document.php?modulepart=facture_paiement&amp;file='.urlencode($relativepath).'">'.img_pdf().' '.$file.'</a></td>';
-                    print '<td align="right">'.dol_print_size(dol_filesize($tfile)).'</td>';
+                    print '<td class="right">'.dol_print_size(dol_filesize($tfile)).'</td>';
-                    print '<td align="right">'.dol_print_date(dol_filemtime($tfile), "dayhour").'</td></tr>';
+                    print '<td class="right">'.dol_print_date(dol_filemtime($tfile), "dayhour").'</td></tr>';
                 }
             }
             closedir($handle);

htdocs/compta/paiement/tovalidate.php

@@ -108,7 +108,7 @@ if ($resql)
     print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "p.rowid", "", "", 'width="60"', $sortfield, $sortorder);
     print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "dp", "", "", 'width="80" align="center"', $sortfield, $sortorder);
     print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "c.libelle", "", "", "", $sortfield, $sortorder);
-    print_liste_field_titre("AmountTTC", $_SERVER["PHP_SELF"], "c.libelle", "", "", 'align="right"', $sortfield, $sortorder);
+    print_liste_field_titre("AmountTTC", $_SERVER["PHP_SELF"], "c.libelle", "", "", 'class="right"', $sortfield, $sortorder);
     print_liste_field_titre('');
     print "</tr>\n";
 
@@ -120,7 +120,7 @@ if ($resql)
         print '<td><a href="'.DOL_URL_ROOT.'/compta/paiement/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("ShowPayment"), "payment").' '.$objp->rowid.'</a></td>';
         print '<td width="80" align="center">'.dol_print_date($db->jdate($objp->dp), 'day')."</td>\n";
         print "<td>$objp->paiement_type $objp->num_paiement</td>\n";
-        print '<td align="right">'.price($objp->amount).'</td>';
+        print '<td class="right">'.price($objp->amount).'</td>';
         print '<td align="center">';
 
         if ($objp->statut == 0)

htdocs/compta/payment_sc/card.php

@@ -240,9 +240,9 @@ if ($resql)
 	print '<td>'.$langs->trans('SocialContribution').'</td>';
     print '<td>'.$langs->trans('Type').'</td>';
 	print '<td>'.$langs->trans('Label').'</td>';
-	print '<td align="right">'.$langs->trans('ExpectedToPay').'</td>';
+	print '<td class="right">'.$langs->trans('ExpectedToPay').'</td>';
 	print '<td align="center">'.$langs->trans('Status').'</td>';
-	print '<td align="right">'.$langs->trans('PayedByThisPayment').'</td>';
+	print '<td class="right">'.$langs->trans('PayedByThisPayment').'</td>';
 	print "</tr>\n";
 
 	if ($num > 0)
@@ -265,11 +265,11 @@ if ($resql)
 			// Label
 			print '<td>'.$objp->libelle.'</td>';
 			// Expected to pay
-			print '<td align="right">'.price($objp->sc_amount).'</td>';
+			print '<td class="right">'.price($objp->sc_amount).'</td>';
 			// Status
 			print '<td align="center">'.$socialcontrib->getLibStatut(4, $objp->amount).'</td>';
 			// Amount payed
-			print '<td align="right">'.price($objp->amount).'</td>';
+			print '<td class="right">'.price($objp->amount).'</td>';
 			print "</tr>\n";
 			if ($objp->paye == 1)	// If at least one invoice is paid, disable delete
 			{

htdocs/compta/prelevement/bons.php

@@ -136,7 +136,7 @@ if ($result)
     print '<td class="liste_titre">&nbsp;</td>';
     print '<td class="liste_titre right"><input type="text" class="flat maxwidth100" name="search_amount" value="'. dol_escape_htmltag($search_amount).'"></td>';
     print '<td class="liste_titre">&nbsp;</td>';
-    print '<td class="liste_titre" align="right">';
+    print '<td class="liste_titre right">';
     $searchpicto=$form->showFilterButtons();
     print $searchpicto;
     print '</td>';
@@ -145,8 +145,8 @@ if ($result)
     print '<tr class="liste_titre">';
     print_liste_field_titre("WithdrawalsReceipts", $_SERVER["PHP_SELF"], "p.ref", '', '', 'class="liste_titre"', $sortfield, $sortorder);
     print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "p.datec", "", "", 'class="liste_titre" align="center"', $sortfield, $sortorder);
-    print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "p.amount", "", "", 'align="right"', $sortfield, $sortorder);
+    print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "p.amount", "", "", 'class="right"', $sortfield, $sortorder);
-    print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "", "", "", 'align="right"', $sortfield, $sortorder);
+    print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "", "", "", 'class="right"', $sortfield, $sortorder);
     print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ')."\n";
     print "</tr>\n";
 
@@ -160,13 +160,13 @@ if ($result)
 
         print '<td align="center">'.dol_print_date($db->jdate($obj->datec), 'day')."</td>\n";
 
-        print '<td align="right">'.price($obj->amount)."</td>\n";
+        print '<td class="right">'.price($obj->amount)."</td>\n";
 
-        print '<td align="right">';
+        print '<td class="right">';
         print $bon->LibStatut($obj->statut, 3);
         print '</td>';
 
-        print '<td align="right"></td>'."\n";
+        print '<td class="right"></td>'."\n";
 
         print "</tr>\n";
         $i++;

htdocs/compta/prelevement/card.php

@@ -344,7 +344,7 @@ if ($id > 0 || $ref)
 		print '<tr class="liste_titre">';
 		print_liste_field_titre("Lines", $_SERVER["PHP_SELF"], "pl.rowid", '', $urladd);
 		print_liste_field_titre("ThirdParty", $_SERVER["PHP_SELF"], "s.nom", '', $urladd);
-		print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "pl.amount", "", $urladd, 'align="right"');
+		print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "pl.amount", "", $urladd, 'class="right"');
 		print_liste_field_titre('');
 		print "</tr>\n";
 
@@ -372,7 +372,7 @@ if ($id > 0 || $ref)
 			print $thirdparty->getNomUrl(1);
 			print "</td>\n";
 
-			print '<td align="right">'.price($obj->amount)."</td>\n";
+			print '<td class="right">'.price($obj->amount)."</td>\n";
 
 			print '<td>';
 
@@ -397,7 +397,7 @@ if ($id > 0 || $ref)
 			print '<tr class="liste_total">';
 			print '<td>'.$langs->trans("Total").'</td>';
 			print '<td>&nbsp;</td>';
-			print '<td align="right">';
+			print '<td class="right">';
 			if ($total != $object->amount) print img_warning("AmountOfFileDiffersFromSumOfInvoices");
 			print price($total);
 			print "</td>\n";

htdocs/compta/prelevement/create.php

@@ -234,8 +234,8 @@ if ($resql)
 	print '<td>'.$langs->trans("ThirdParty").'</td>';
 	print '<td>'.$langs->trans("RIB").'</td>';
 	print '<td>'.$langs->trans("RUM").'</td>';
-	print '<td align="right">'.$langs->trans("AmountTTC").'</td>';
+	print '<td class="right">'.$langs->trans("AmountTTC").'</td>';
-	print '<td align="right">'.$langs->trans("DateRequest").'</td>';
+	print '<td class="right">'.$langs->trans("DateRequest").'</td>';
 	print '</tr>';
 
 	if ($num)
@@ -271,11 +271,11 @@ if ($resql)
 			if ($format) print ' ('.$format.')';
 			print '</td>';
 			// Amount
-			print '<td align="right">';
+			print '<td class="right">';
 			print price($obj->amount, 0, $langs, 0, 0, -1, $conf->currency);
 			print '</td>';
 			// Date
-			print '<td align="right">';
+			print '<td class="right">';
 			print dol_print_date($db->jdate($obj->date_demande), 'day');
 			print '</td>';
 			print '</tr>';
@@ -317,7 +317,7 @@ if ($result)
     print"\n<!-- debut table -->\n";
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre"><td>'.$langs->trans("Ref").'</td>';
-    print '<td align="center">'.$langs->trans("Date").'</td><td align="right">'.$langs->trans("Amount").'</td>';
+    print '<td align="center">'.$langs->trans("Date").'</td><td class="right">'.$langs->trans("Amount").'</td>';
     print '</tr>';
 
     while ($i < min($num,$limit))
@@ -335,7 +335,7 @@ if ($result)
 
         print '<td align="center">'.dol_print_date($db->jdate($obj->datec),'day')."</td>\n";
 
-        print '<td align="right">'.price($obj->amount,0,$langs,0,0,-1,$conf->currency)."</td>\n";
+        print '<td class="right">'.price($obj->amount,0,$langs,0,0,-1,$conf->currency)."</td>\n";
 
         print "</tr>\n";
         $i++;

htdocs/compta/prelevement/demandes.php

@@ -110,8 +110,8 @@ if ($resql)
 	print '<tr class="liste_titre">';
 	print_liste_field_titre("Bill", $_SERVER["PHP_SELF"]);
 	print_liste_field_titre("Company", $_SERVER["PHP_SELF"]);
-    print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "", "", $param, 'align="right"');
+    print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "", "", $param, 'class="right"');
-	print_liste_field_titre("DateRequest", $_SERVER["PHP_SELF"], "", "", $param, 'align="center"');
+	print_liste_field_titre("DateRequest", $_SERVER["PHP_SELF"], "", "", $param, 'class="center"');
 	print_liste_field_titre('');
 	print '</tr>';
 
@@ -121,7 +121,7 @@ if ($resql)
 	print '<td class="liste_titre"></td>';
 	print '<td class="liste_titre"></td>';
 	// Action column
-	print '<td class="liste_titre" align="middle">';
+	print '<td class="liste_titre" class="middle">';
 	$searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
 	print $searchpicto;
 	print '</td>';
@@ -148,11 +148,11 @@ if ($resql)
 		print $thirdpartystatic->getNomUrl(1, 'customer');
 		print '</td>';
 
-        print '<td align="right">'.price($obj->total_ttc).'</td>';
+        print '<td class="right">'.price($obj->total_ttc).'</td>';
 
-        print '<td align="center">'.dol_print_date($db->jdate($obj->date_demande), 'day').'</td>';
+        print '<td class="center">'.dol_print_date($db->jdate($obj->date_demande), 'day').'</td>';
 
-        print '<td align="right"></td>';
+        print '<td class="right"></td>';
 
 		print '</tr>';
 		$i++;

htdocs/compta/prelevement/factures.php

@@ -205,8 +205,8 @@ if ($result)
   	print '<tr class="liste_titre">';
   	print_liste_field_titre("Bill", $_SERVER["PHP_SELF"], "p.ref", '', $param, '', $sortfield, $sortorder);
   	print_liste_field_titre("ThirdParty", $_SERVER["PHP_SELF"], "s.nom", '', $param, '', $sortfield, $sortorder);
-  	print_liste_field_titre("AmountInvoice", $_SERVER["PHP_SELF"], "f.total_ttc", "", $param, 'align="right"', $sortfield, $sortorder);
+  	print_liste_field_titre("AmountInvoice", $_SERVER["PHP_SELF"], "f.total_ttc", "", $param, 'class="right"', $sortfield, $sortorder);
-  	print_liste_field_titre("AmountRequested", $_SERVER["PHP_SELF"], "pl.amount", "", $param, 'align="right"', $sortfield, $sortorder);
+  	print_liste_field_titre("AmountRequested", $_SERVER["PHP_SELF"], "pl.amount", "", $param, 'class="right"', $sortfield, $sortorder);
   	print_liste_field_titre("StatusDebitCredit", $_SERVER["PHP_SELF"], "", "", $param, 'align="center"', $sortfield, $sortorder);
 	print_liste_field_titre('');
 	print "</tr>\n";
@@ -235,10 +235,10 @@ if ($result)
       	print "</td>\n";
 
       	// Amount of invoice
-      	print '<td align="right">'.price($obj->total_ttc)."</td>\n";
+      	print '<td class="right">'.price($obj->total_ttc)."</td>\n";
 
       	// Amount requested
-      	print '<td align="right">'.price($obj->amount_requested)."</td>\n";
+      	print '<td class="right">'.price($obj->amount_requested)."</td>\n";
 
       	// Status of requests
       	print '<td align="center">';
@@ -273,11 +273,11 @@ if ($result)
       	print '<tr class="liste_total">';
      	print '<td>'.$langs->trans("Total").'</td>';
       	print '<td>&nbsp;</td>';
-      	print '<td align="right">';
+      	print '<td class="right">';
 		//if ($totalinvoices != $object->amount) print img_warning("AmountOfFileDiffersFromSumOfInvoices");		// It is normal to have total that differs. For an amount of invoice of 100, request to pay may be 50 only.
       	if ($totalamount_requested != $object->amount) print img_warning("AmountOfFileDiffersFromSumOfInvoices");
 		print "</td>\n";
-      	print '<td align="right">';
+      	print '<td class="right">';
 		print price($totalamount_requested);
       	print "</td>\n";
       	print '<td>&nbsp;</td>';

htdocs/compta/prelevement/fiche-rejet.php

@@ -189,8 +189,8 @@ if ($resql)
   	print '<div class="div-table-responsive-no-min">';		// You can use div-table-responsive-no-min if you dont need reserved height for your table
   	print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
   	print '<tr class="liste_titre">';
-  	print '<td>'.$langs->trans("Line").'</td><td>'.$langs->trans("ThirdParty").'</td><td align="right">'.$langs->trans("Amount").'</td>';
+  	print '<td>'.$langs->trans("Line").'</td><td>'.$langs->trans("ThirdParty").'</td><td class="right">'.$langs->trans("Amount").'</td>';
-  	print '<td>'.$langs->trans("Reason").'</td><td align="center">'.$langs->trans("ToBill").'</td><td align="center">'.$langs->trans("Invoice").'</td></tr>';
+  	print '<td>'.$langs->trans("Reason").'</td><td align="center">'.$langs->trans("ToBill").'</td><td class="center">'.$langs->trans("Invoice").'</td></tr>';
 
 	$total = 0;
 
@@ -209,7 +209,7 @@ if ($resql)
     		print '</a></td>';
     		print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.$obj->name."</a></td>\n";
 
-    		print '<td align="right">'.price($obj->amount)."</td>\n";
+    		print '<td class="right">'.price($obj->amount)."</td>\n";
     		print '<td>'.$rej->motifs[$obj->motif].'</td>';
 
     		print '<td align="center">'.yn($obj->afacturer).'</td>';
@@ -230,7 +230,7 @@ if ($resql)
     {
     	print '<tr class="liste_total"><td>&nbsp;</td>';
     	print '<td class="liste_total">'.$langs->trans("Total").'</td>';
-    	print '<td align="right">'.price($total)."</td>\n";
+    	print '<td class="right">'.price($total)."</td>\n";
     	print '<td colspan="3">&nbsp;</td>';
     	print "</tr>\n";
     }

htdocs/compta/prelevement/fiche-stat.php

@@ -160,7 +160,7 @@ if ($prev_id > 0 || $ref)
 		print"\n<!-- debut table -->\n";
 		print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
 		print '<tr class="liste_titre">';
-		print '<td>'.$langs->trans("Status").'</td><td align="right">'.$langs->trans("Amount").'</td><td align="right">%</td></tr>';
+		print '<td>'.$langs->trans("Status").'</td><td class="right">'.$langs->trans("Amount").'</td><td class="right">%</td></tr>';
 
 		while ($i < $num)
 		{
@@ -170,10 +170,10 @@ if ($prev_id > 0 || $ref)
 
 			print $ligne->LibStatut($row[1], 1);
 
-			print '</td><td align="right">';
+			print '</td><td class="right">';
 			print price($row[0]);
 
-			print '</td><td align="right">';
+			print '</td><td class="right">';
 			if ($object->amount) print round($row[0]/$object->amount*100, 2)." %";
 			print '</td>';
 

htdocs/compta/prelevement/index.php

@@ -75,14 +75,14 @@ print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").'</th></tr>';
 
 print '<tr class="oddeven"><td>'.$langs->trans("NbOfInvoiceToWithdraw").'</td>';
-print '<td align="right">';
+print '<td class="right">';
 print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/demandes.php?status=0">';
 print $bprev->NbFactureAPrelever();
 print '</a>';
 print '</td></tr>';
 
 print '<tr class="oddeven"><td>'.$langs->trans("AmountToWithdraw").'</td>';
-print '<td align="right">';
+print '<td class="right">';
 print price($bprev->SommeAPrelever(), '', '', 1, -1, -1, 'auto');
 print '</td></tr></table><br>';
 
@@ -137,15 +137,15 @@ if ($resql)
             print $thirdpartystatic->getNomUrl(1, 'customer');
             print '</td>';
 
-            print '<td align="right">';
+            print '<td class="right">';
             print price($obj->amount);
             print '</td>';
 
-            print '<td align="right">';
+            print '<td class="right">';
             print dol_print_date($db->jdate($obj->date_demande), 'day');
             print '</td>';
 
-            print '<td align="right">';
+            print '<td class="right">';
             print $invoicestatic->getLibStatut(3, $alreadypayed);
             print '</td>';
             print '</tr>';
@@ -186,8 +186,8 @@ if ($result)
     print '<table class="noborder" width="100%">';
     print '<tr class="liste_titre"><th>'.$langs->trans("LastWithdrawalReceipt", $limit).'</th>';
     print '<th>'.$langs->trans("Date").'</th>';
-    print '<th align="right">'.$langs->trans("Amount").'</th>';
+    print '<th class="right">'.$langs->trans("Amount").'</th>';
-    print '<th align="right">'.$langs->trans("Status").'</th>';
+    print '<th class="right">'.$langs->trans("Status").'</th>';
     print '</tr>';
 
     while ($i < min($num, $limit))
@@ -204,8 +204,8 @@ if ($result)
         print $bprev->getNomUrl(1);
         print "</td>\n";
         print '<td>'.dol_print_date($db->jdate($obj->datec), "dayhour")."</td>\n";
-        print '<td align="right">'.price($obj->amount)."</td>\n";
+        print '<td class="right">'.price($obj->amount)."</td>\n";
-        print '<td align="right">'.$bprev->getLibStatut(3)."</td>\n";
+        print '<td class="right">'.$bprev->getLibStatut(3)."</td>\n";
 
         print "</tr>\n";
         $i++;

htdocs/compta/prelevement/ligne.php

@@ -292,7 +292,7 @@ if ($id)
 		print"\n<!-- debut table -->\n";
 		print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
 		print '<tr class="liste_titre">';
-		print '<td>'.$langs->trans("Invoice").'</td><td>'.$langs->trans("ThirdParty").'</td><td align="right">'.$langs->trans("Amount").'</td><td align="right">'.$langs->trans("Status").'</td>';
+		print '<td>'.$langs->trans("Invoice").'</td><td>'.$langs->trans("ThirdParty").'</td><td class="right">'.$langs->trans("Amount").'</td><td class="right">'.$langs->trans("Status").'</td>';
 		print '</tr>';
 
 		$total = 0;
@@ -312,9 +312,9 @@ if ($id)
 			print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">';
 			print img_object($langs->trans("ShowCompany"), "company"). ' '.$obj->name."</a></td>\n";
 
-			print '<td align="right">'.price($obj->total_ttc)."</td>\n";
+			print '<td class="right">'.price($obj->total_ttc)."</td>\n";
 
-			print '<td align="right">';
+			print '<td class="right">';
 			$invoicestatic->fetch($obj->facid);
 			print $invoicestatic->getLibStatut(5);
 			print "</td>\n";

htdocs/compta/prelevement/list.php

@@ -146,7 +146,7 @@ if ($result)
     print '<td class="liste_titre" align="center"><input type="text" class="flat" name="search_code" value="'. dol_escape_htmltag($search_code).'" size="6"></td>';
     print '<td class="liste_titre">&nbsp;</td>';
     print '<td class="liste_titre">&nbsp;</td>';
-    print '<td class="liste_titre" align="right">';
+    print '<td class="liste_titre right">';
     $searchpicto=$form->showFilterButtons();
     print $searchpicto;
     print '</td>';
@@ -159,7 +159,7 @@ if ($result)
     print_liste_field_titre("Company", $_SERVER["PHP_SELF"], "s.nom");
     print_liste_field_titre("CustomerCode", $_SERVER["PHP_SELF"], "s.code_client", '', '', 'align="center"');
     print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "p.datec", "", "", 'align="center"');
-    print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "pl.amount", "", "", 'align="right"');
+    print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "pl.amount", "", "", 'class="right"');
     print_liste_field_titre('');
 	print "</tr>\n";
 
@@ -194,7 +194,7 @@ if ($result)
 
         print '<td align="center">'.dol_print_date($db->jdate($obj->datec), 'day')."</td>\n";
 
-        print '<td align="right">'.price($obj->amount)."</td>\n";
+        print '<td class="right">'.price($obj->amount)."</td>\n";
 
         print '<td>&nbsp;</td>';
 

htdocs/compta/prelevement/stats.php

@@ -91,8 +91,8 @@ if ($resql)
 	print"\n<!-- debut table -->\n";
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre">';
-	print '<td width="30%">'.$langs->trans("Status").'</td><td align="center">'.$langs->trans("Number").'</td><td align="right">%</td>';
+	print '<td width="30%">'.$langs->trans("Status").'</td><td align="center">'.$langs->trans("Number").'</td><td class="right">%</td>';
-	print '<td align="right">'.$langs->trans("Amount").'</td><td align="right">%</td></tr>';
+	print '<td class="right">'.$langs->trans("Amount").'</td><td class="right">%</td></tr>';
 
 	while ($i < $num)
 	{
@@ -105,24 +105,24 @@ if ($resql)
 		print '</td><td align="center">';
 		print $row[1];
 
-		print '</td><td align="right">';
+		print '</td><td class="right">';
 		print round($row[1]/$nbtotal*100, 2)." %";
 
-		print '</td><td align="right">';
+		print '</td><td class="right">';
 
 		print price($row[0]);
 
-		print '</td><td align="right">';
+		print '</td><td class="right">';
 		print round($row[0]/$total*100, 2)." %";
 		print '</td></tr>';
 		
 		$i++;
 	}
 
-	print '<tr class="liste_total"><td align="right">'.$langs->trans("Total").'</td>';
+	print '<tr class="liste_total"><td class="right">'.$langs->trans("Total").'</td>';
-	print '<td align="center">'.$nbtotal.'</td><td>&nbsp;</td><td align="right">';
+	print '<td align="center">'.$nbtotal.'</td><td>&nbsp;</td><td class="right">';
 	print price($total);
-	print '</td><td align="right">&nbsp;</td>';
+	print '</td><td class="right">&nbsp;</td>';
 	print "</tr></table>";
 	$db->free();
 }
@@ -185,7 +185,7 @@ if ($resql)
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre">';
 	print '<td width="30%">'.$langs->trans("Status").'</td><td align="center">'.$langs->trans("Number").'</td>';
-	print '<td align="right">%</td><td align="right">'.$langs->trans("Amount").'</td><td align="right">%</td></tr>';
+	print '<td class="right">%</td><td class="right">'.$langs->trans("Amount").'</td><td class="right">%</td></tr>';
 
 	require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/rejetprelevement.class.php';
 	$Rejet = new RejetPrelevement($db, $user);
@@ -199,13 +199,13 @@ if ($resql)
 
 		print '</td><td align="center">'.$row[1];
 
-		print '</td><td align="right">';
+		print '</td><td class="right">';
 		print round($row[1]/$nbtotal*100, 2)." %";
 
-		print '</td><td align="right">';
+		print '</td><td class="right">';
 		print price($row[0]);
 
-		print '</td><td align="right">';
+		print '</td><td class="right">';
 		print round($row[0]/$total*100, 2)." %";
 
 		print '</td></tr>';
@@ -213,10 +213,10 @@ if ($resql)
 		$i++;
 	}
 
-	print '<tr class="liste_total"><td align="right">'.$langs->trans("Total").'</td><td align="center">'.$nbtotal.'</td>';
+	print '<tr class="liste_total"><td class="right">'.$langs->trans("Total").'</td><td align="center">'.$nbtotal.'</td>';
-	print '<td>&nbsp;</td><td align="right">';
+	print '<td>&nbsp;</td><td class="right">';
 	print price($total);
-	print '</td><td align="right">&nbsp;</td>';
+	print '</td><td class="right">&nbsp;</td>';
 	print "</tr></table>";
 	$db->free($resql);
 }

htdocs/compta/resultat/clientfourn.php

@@ -222,15 +222,15 @@ print_liste_field_titre("PredefinedGroups", $_SERVER["PHP_SELF"], 'f.thirdparty_
 print_liste_field_titre('');
 if ($modecompta == 'BOOKKEEPING')
 {
-	print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], 'amount', '', $param, 'align="right"', $sortfield, $sortorder);
+	print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], 'amount', '', $param, 'class="right"', $sortfield, $sortorder);
 }
 else
 {
 	if ($modecompta == 'CREANCES-DETTES')
 	{
-		print_liste_field_titre("AmountHT", $_SERVER["PHP_SELF"], 'amount_ht', '', $param, 'align="right"', $sortfield, $sortorder);
+		print_liste_field_titre("AmountHT", $_SERVER["PHP_SELF"], 'amount_ht', '', $param, 'class="right"', $sortfield, $sortorder);
 	}
-	print_liste_field_titre("AmountTTC", $_SERVER["PHP_SELF"], 'amount_ttc', '', $param, 'align="right"', $sortfield, $sortorder);
+	print_liste_field_titre("AmountTTC", $_SERVER["PHP_SELF"], 'amount_ttc', '', $param, 'class="right"', $sortfield, $sortorder);
 }
 print "</tr>\n";
 
@@ -284,7 +284,7 @@ if ($modecompta == 'BOOKKEEPING')
 				print '<tr class="oddeven">';
 				print '<td>&nbsp;</td>';
 				print '<td>'.$objp->pcg_type.($objp->pcg_subtype != 'XXXXXX'?' - '.$objp->pcg_subtype:'').($objp->name?' ('.$objp->name.')':'')."</td>\n";
-				print '<td align="right">'.price($objp->amount)."</td>\n";
+				print '<td class="right">'.price($objp->amount)."</td>\n";
 				print "</tr>\n";
 
 				$total_ht += (isset($objp->amount)?$objp->amount:0);
@@ -317,7 +317,7 @@ if ($modecompta == 'BOOKKEEPING')
 							print '<tr>';
 							print '<td></td>';
 							print '<td class="tdoverflowmax200"> &nbsp; &nbsp; ' . length_accountg($cpt['account_number']) . ' - ' . $cpt['account_label'] . '</td>';
-							print '<td align="right">' . price($resultN) . '</td>';
+							print '<td class="right">' . price($resultN) . '</td>';
 							print "</tr>\n";
 						}
 					}
@@ -389,8 +389,8 @@ else
 	        print "<td>".$langs->trans("Bills").' <a href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$objp->socid.'">'.$objp->name."</td>\n";
 
 	        if ($modecompta == 'CREANCES-DETTES')
-	        	print "<td align=\"right\">".price($objp->amount_ht)."</td>\n";
+	        	print '<td class="right">'.price($objp->amount_ht)."</td>\n";
-	        print "<td align=\"right\">".price($objp->amount_ttc)."</td>\n";
+	        print '<td class="right">'.price($objp->amount_ttc)."</td>\n";
 
 	        $total_ht += (isset($objp->amount_ht)?$objp->amount_ht:0);
 	        $total_ttc += $objp->amount_ttc;
@@ -434,8 +434,8 @@ else
 	                print "<td>".$langs->trans("Bills")." ".$langs->trans("Other")." (".$langs->trans("PaymentsNotLinkedToInvoice").")\n";
 
 	                if ($modecompta == 'CREANCES-DETTES')
-	                	print "<td align=\"right\">".price($objp->amount_ht)."</td>\n";
+	                	print '<td class="right">'.price($objp->amount_ht)."</td>\n";
-	                print "<td align=\"right\">".price($objp->amount_ttc)."</td>\n";
+	                print '<td class="right">'.price($objp->amount_ttc)."</td>\n";
 
 	                $total_ht += (isset($objp->amount_ht)?$objp->amount_ht:0);
 	                $total_ttc += $objp->amount_ttc;
@@ -459,8 +459,8 @@ else
 
 	print '<tr class="liste_total">';
 	if ($modecompta == 'CREANCES-DETTES')
-		print '<td colspan="3" align="right">'.price($total_ht).'</td>';
+		print '<td colspan="3" class="right">'.price($total_ht).'</td>';
-	print '<td colspan="3" align="right">'.price($total_ttc).'</td>';
+	print '<td colspan="3" class="right">'.price($total_ttc).'</td>';
 	print '</tr>';
 
 
@@ -519,8 +519,8 @@ else
 	            print "<td>".$langs->trans("Bills")." <a href=\"".DOL_URL_ROOT."/fourn/facture/list.php?socid=".$objp->socid."\">".$objp->name."</a></td>\n";
 
 	            if ($modecompta == 'CREANCES-DETTES')
-	            	print "<td align=\"right\">".price(-$objp->amount_ht)."</td>\n";
+	            	print '<td class="right">'.price(-$objp->amount_ht)."</td>\n";
-	            print "<td align=\"right\">".price(-$objp->amount_ttc)."</td>\n";
+	            print '<td class="right">'.price(-$objp->amount_ttc)."</td>\n";
 
 	            $total_ht -= (isset($objp->amount_ht)?$objp->amount_ht:0);
 	            $total_ttc -= $objp->amount_ttc;
@@ -544,8 +544,8 @@ else
 	}
 	print '<tr class="liste_total">';
 	if ($modecompta == 'CREANCES-DETTES')
-		print '<td colspan="3" align="right">'.price(-$subtotal_ht).'</td>';
+		print '<td colspan="3" class="right">'.price(-$subtotal_ht).'</td>';
-	print '<td colspan="3" align="right">'.price(-$subtotal_ttc).'</td>';
+	print '<td colspan="3" class="right">'.price(-$subtotal_ttc).'</td>';
 	print '</tr>';
 
 
@@ -605,8 +605,8 @@ else
 
 	            print '<tr class="oddeven"><td>&nbsp;</td>';
 	            print '<td>'.$obj->label.'</td>';
-	            if ($modecompta == 'CREANCES-DETTES') print '<td align="right">'.price(-$obj->amount).'</td>';
+	            if ($modecompta == 'CREANCES-DETTES') print '<td class="right">'.price(-$obj->amount).'</td>';
-	            print '<td align="right">'.price(-$obj->amount).'</td>';
+	            print '<td class="right">'.price(-$obj->amount).'</td>';
 	            print '</tr>';
 	            $i++;
 	        }
@@ -621,8 +621,8 @@ else
 	}
 	print '<tr class="liste_total">';
 	if ($modecompta == 'CREANCES-DETTES')
-		print '<td colspan="3" align="right">'.price(-$subtotal_ht).'</td>';
+		print '<td colspan="3" class="right">'.price(-$subtotal_ht).'</td>';
-	print '<td colspan="3" align="right">'.price(-$subtotal_ttc).'</td>';
+	print '<td colspan="3" class="right">'.price(-$subtotal_ttc).'</td>';
 	print '</tr>';
 
 
@@ -682,8 +682,8 @@ else
 	            print '<tr class="oddeven"><td>&nbsp;</td>';
 	            print '<td>'.$obj->label.'</td>';
 	            if ($modecompta == 'CREANCES-DETTES')
-	            	print '<td align="right">'.price(-$obj->amount).'</td>';
+	            	print '<td class="right">'.price(-$obj->amount).'</td>';
-	            print '<td align="right">'.price(-$obj->amount).'</td>';
+	            print '<td class="right">'.price(-$obj->amount).'</td>';
 	            print '</tr>';
 	            $i++;
 	        }
@@ -698,8 +698,8 @@ else
 	}
 	print '<tr class="liste_total">';
 	if ($modecompta == 'CREANCES-DETTES')
-		print '<td colspan="3" align="right">'.price(-$subtotal_ht).'</td>';
+		print '<td colspan="3" class="right">'.price(-$subtotal_ht).'</td>';
-	print '<td colspan="3" align="right">'.price(-$subtotal_ttc).'</td>';
+	print '<td colspan="3" class="right">'.price(-$subtotal_ttc).'</td>';
 	print '</tr>';
 
 	if ($mysoc->tva_assuj == 'franchise')	// Non assujetti
@@ -709,10 +709,10 @@ else
 	    print '<td colspan="4">&nbsp;</td>';
 	    print '</tr>';
 
-	    print '<tr class="liste_total"><td align="left" colspan="2">'.$langs->trans("Profit").'</td>';
+	    print '<tr class="liste_total"><td class="left" colspan="2">'.$langs->trans("Profit").'</td>';
 	    if ($modecompta == 'CREANCES-DETTES')
-	    	print '<td class="border" align="right">'.price($total_ht).'</td>';
+	    	print '<td class="border right">'.price($total_ht).'</td>';
-	    print '<td align="right">'.price($total_ttc).'</td>';
+	    print '<td class="right">'.price($total_ttc).'</td>';
 	    print '</tr>';
 
 	    print '<tr>';
@@ -775,8 +775,8 @@ else
 
 		            print "<td>".$langs->trans("Salary")." <a href=\"".DOL_URL_ROOT."/compta/salaries/list.php?filtre=s.fk_user=".$obj->fk_user."\">".$obj->firstname." ".$obj->lastname."</a></td>\n";
 
-		            if ($modecompta == 'CREANCES-DETTES') print '<td align="right">'.price(-$obj->amount).'</td>';
+		            if ($modecompta == 'CREANCES-DETTES') print '<td class="right">'.price(-$obj->amount).'</td>';
-		            print '<td align="right">'.price(-$obj->amount).'</td>';
+		            print '<td class="right">'.price(-$obj->amount).'</td>';
 		            print '</tr>';
 		            $i++;
 		        }
@@ -794,8 +794,8 @@ else
 		}
 		print '<tr class="liste_total">';
 		if ($modecompta == 'CREANCES-DETTES')
-			print '<td colspan="3" align="right">'.price(-$subtotal_ht).'</td>';
+			print '<td colspan="3" class="right">'.price(-$subtotal_ht).'</td>';
-		print '<td colspan="3" align="right">'.price(-$subtotal_ttc).'</td>';
+		print '<td colspan="3" class="right">'.price(-$subtotal_ttc).'</td>';
 		print '</tr>';
 	}
 
@@ -862,8 +862,8 @@ else
 
 					print "<td>".$langs->trans("ExpenseReport")." <a href=\"".DOL_URL_ROOT."/expensereport/list.php?search_user=".$obj->userid."\">".$obj->firstname." ".$obj->lastname."</a></td>\n";
 
-					if ($modecompta == 'CREANCES-DETTES') print '<td align="right">'.price(-$obj->amount_ht).'</td>';
+					if ($modecompta == 'CREANCES-DETTES') print '<td class="right">'.price(-$obj->amount_ht).'</td>';
-					print '<td align="right">'.price(-$obj->amount_ttc).'</td>';
+					print '<td class="right">'.price(-$obj->amount_ttc).'</td>';
 					print '</tr>';
 				}
 			}
@@ -879,8 +879,8 @@ else
 			dol_print_error($db);
 		}
 		print '<tr class="liste_total">';
-		if ($modecompta == 'CREANCES-DETTES') print '<td colspan="3" align="right">'.price(-$subtotal_ht).'</td>';
+		if ($modecompta == 'CREANCES-DETTES') print '<td colspan="3" class="right">'.price(-$subtotal_ht).'</td>';
-		print '<td colspan="3" align="right">'.price(-$subtotal_ttc).'</td>';
+		print '<td colspan="3" class="right">'.price(-$subtotal_ttc).'</td>';
 		print '</tr>';
 	}
 
@@ -943,8 +943,8 @@ else
 
 					print "<td>".$langs->trans("Donation")." <a href=\"".DOL_URL_ROOT."/don/list.php?search_company=".$obj->name."&search_name=".$obj->firstname." ".$obj->lastname."\">".$obj->name. " ".$obj->firstname." ".$obj->lastname."</a></td>\n";
 
-					if ($modecompta == 'CREANCES-DETTES') print '<td align="right">'.price($obj->amount).'</td>';
+					if ($modecompta == 'CREANCES-DETTES') print '<td class="right">'.price($obj->amount).'</td>';
-					print '<td align="right">'.price($obj->amount).'</td>';
+					print '<td class="right">'.price($obj->amount).'</td>';
 					print '</tr>';
 					$i++;
 				}
@@ -962,8 +962,8 @@ else
 		}
 		print '<tr class="liste_total">';
 		if ($modecompta == 'CREANCES-DETTES')
-			print '<td colspan="3" align="right">'.price($subtotal_ht).'</td>';
+			print '<td colspan="3" class="right">'.price($subtotal_ht).'</td>';
-		print '<td colspan="3" align="right">'.price($subtotal_ttc).'</td>';
+		print '<td colspan="3" class="right">'.price($subtotal_ttc).'</td>';
 		print '</tr>';
 	}
 
@@ -1024,8 +1024,8 @@ else
 		    }
 		    print '<tr class="oddeven"><td>&nbsp;</td>';
 		    print "<td>".$langs->trans("VATToPay")."</td>\n";
-		    print "<td align=\"right\">&nbsp;</td>\n";
+		    print '<td class="right">&nbsp;</td>'."\n";
-		    print "<td align=\"right\">".price($amount)."</td>\n";
+		    print '<td class="right">'.price($amount)."</td>\n";
 		    print "</tr>\n";
 
 		    // TVA a recuperer
@@ -1072,9 +1072,9 @@ else
 		        dol_print_error($db);
 		    }
 		    print '<tr class="oddeven"><td>&nbsp;</td>';
-		    print "<td>".$langs->trans("VATToCollect")."</td>\n";
+		    print '<td>'.$langs->trans("VATToCollect")."</td>\n";
-		    print "<td align=\"right\">&nbsp;</td>\n";
+		    print '<td class="right">&nbsp;</td>'."\n";
-		    print "<td align=\"right\">".price($amount)."</td>\n";
+		    print '<td class="right">'.price($amount)."</td>\n";
 		    print "</tr>\n";
 		}
 		else
@@ -1119,8 +1119,8 @@ else
 		    print '<tr class="oddeven"><td>&nbsp;</td>';
 		    print "<td>".$langs->trans("VATPaid")."</td>\n";
 		    if ($modecompta == 'CREANCES-DETTES')
-		    	print "<td align=\"right\">".price($amount)."</td>\n";
+		    	print '<td <class="right">'.price($amount)."</td>\n";
-		    print "<td align=\"right\">".price($amount)."</td>\n";
+		    print '<td class="right">'.price($amount)."</td>\n";
 		    print "</tr>\n";
 
 		    // VAT really received
@@ -1165,8 +1165,8 @@ else
 		    print '<tr class="oddeven"><td>&nbsp;</td>';
 		    print "<td>".$langs->trans("VATCollected")."</td>\n";
 		    if ($modecompta == 'CREANCES-DETTES')
-		    	print "<td align=\"right\">".price($amount)."</td>\n";
+		    	print '<td class="right">'.price($amount)."</td>\n";
-		    print "<td align=\"right\">".price($amount)."</td>\n";
+		    print '<td class="right">'.price($amount)."</td>\n";
 		    print "</tr>\n";
 		}
 	}
@@ -1175,8 +1175,8 @@ else
 	{
 	    print '<tr class="liste_total">';
 	    if ($modecompta == 'CREANCES-DETTES')
-	    	print '<td colspan="3" align="right">&nbsp;</td>';
+	    	print '<td colspan="3" class="right">&nbsp;</td>';
-	    print '<td colspan="3" align="right">'.price(price2num($subtotal_ttc, 'MT')).'</td>';
+	    print '<td colspan="3" class="right">'.price(price2num($subtotal_ttc, 'MT')).'</td>';
 	    print '</tr>';
 	}
 }
@@ -1199,10 +1199,10 @@ if ($mysoc->tva_assuj != 'franchise')	// Assujetti
     print '<td colspan="4">&nbsp;</td>';
     print '</tr>';
 
-    print '<tr class="liste_total"><td align="left" colspan="2">'.$langs->trans("Profit").'</td>';
+    print '<tr class="liste_total"><td class="left" colspan="2">'.$langs->trans("Profit").'</td>';
     if ($modecompta == 'CREANCES-DETTES')
-    	print '<td class="liste_total" align="right">'.price(price2num($total_ht, 'MT')).'</td>';
+    	print '<td class="liste_total right">'.price(price2num($total_ht, 'MT')).'</td>';
-    print '<td class="liste_total" align="right">'.price(price2num($total_ttc, 'MT')).'</td>';
+    print '<td class="liste_total right">'.price(price2num($total_ttc, 'MT')).'</td>';
     print '</tr>';
 }
 

htdocs/compta/salaries/class/paymentsalary.class.php

@@ -424,7 +424,7 @@ class PaymentSalary extends CommonObject
 
 					// Insert payment into llx_bank
 					// Add link 'payment_salary' in bank_url between payment and bank transaction
-					$bank_line_id = $acc->addline(
+    $bank_line_id = $acc->addline(
 						$this->datep,
 						$this->type_payment,
 						$this->label,
@@ -467,7 +467,7 @@ class PaymentSalary extends CommonObject
 					$fuser->fetch($this->fk_user);
 
 					// Add link 'user' in bank_url between operation and bank transaction
-					$result=$acc->add_url_line(
+    $result=$acc->add_url_line(
 						$bank_line_id,
 						$this->fk_user,
 						DOL_URL_ROOT.'/user/card.php?id=',

htdocs/compta/salaries/document.php

@@ -89,7 +89,7 @@ if ($object->id)
 
 	$head=salaries_prepare_head($object);
 
-	dol_fiche_head($head, 'documents',  $langs->trans("SalaryPayment"), -1, 'payment');
+	dol_fiche_head($head, 'documents', $langs->trans("SalaryPayment"), -1, 'payment');
 
 	// Build file list
 	$filearray=dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC), 1);

htdocs/compta/sociales/document.php

@@ -104,7 +104,7 @@ if ($object->id)
 
     $head=tax_prepare_head($object);
 
-    dol_fiche_head($head, 'documents',  $langs->trans("SocialContribution"), -1, 'bill');
+    dol_fiche_head($head, 'documents', $langs->trans("SocialContribution"), -1, 'bill');
 
 	$morehtmlref='<div class="refidno">';
 	// Label of social contribution

htdocs/compta/stats/cabyprodserv.php

@@ -321,7 +321,7 @@ if ($modecompta == 'CREANCES-DETTES')
 
 	// Array header
 	print "<tr class=\"liste_titre\">";
-	print_liste_field_titre(
+print_liste_field_titre(
 		$langs->trans("Product"),
 		$_SERVER["PHP_SELF"],
 		"ref",
@@ -331,7 +331,7 @@ if ($modecompta == 'CREANCES-DETTES')
 		$sortfield,
 		$sortorder
 	);
-	print_liste_field_titre(
+print_liste_field_titre(
 		$langs->trans('Quantity'),
 		$_SERVER["PHP_SELF"],
 		"qty",
@@ -341,7 +341,7 @@ if ($modecompta == 'CREANCES-DETTES')
 		$sortfield,
 		$sortorder
 	);
-	print_liste_field_titre(
+print_liste_field_titre(
 		$langs->trans("Percentage"),
 		$_SERVER["PHP_SELF"],
 		"qty",
@@ -351,7 +351,7 @@ if ($modecompta == 'CREANCES-DETTES')
 		$sortfield,
 		$sortorder
 	);
-	print_liste_field_titre(
+print_liste_field_titre(
 		$langs->trans('AmountHT'),
 		$_SERVER["PHP_SELF"],
 		"amount",
@@ -361,7 +361,7 @@ if ($modecompta == 'CREANCES-DETTES')
 		$sortfield,
 		$sortorder
 	);
-	print_liste_field_titre(
+print_liste_field_titre(
 		$langs->trans("AmountTTC"),
 		$_SERVER["PHP_SELF"],
 		"amount_ttc",
@@ -371,7 +371,7 @@ if ($modecompta == 'CREANCES-DETTES')
 		$sortfield,
 		$sortorder
 	);
-	print_liste_field_titre(
+print_liste_field_titre(
 		$langs->trans("Percentage"),
 		$_SERVER["PHP_SELF"],
 		"amount_ttc",

htdocs/compta/tva/document.php

@@ -105,7 +105,7 @@ if ($object->id)
 
     $head=vat_prepare_head($object);
 
-    dol_fiche_head($head, 'documents',  $langs->trans("VATPayment"), -1, 'bill');
+    dol_fiche_head($head, 'documents', $langs->trans("VATPayment"), -1, 'bill');
 
 	$morehtmlref='<div class="refidno">';
 	// Label of social contribution

htdocs/contact/consumption.php

@@ -322,18 +322,15 @@ if (!empty($sql_select))
 	    $sql.=")";
 	}
 	$sql.= $db->order($sortfield, $sortorder);
-//print ($sql);exit;
 	$resql=$db->query($sql);
 	$totalnboflines = $db->num_rows($resql);
 
 	$sql.= $db->plimit($limit + 1, $offset);
-	//print $sql;
 }
 
 $disabled=0;
 $showempty=2;
-if (empty($elementTypeArray) && ! $object->client && ! $object->fournisseur)
+if (empty($elementTypeArray) && ! $object->thirdparty->client && ! $object->thirdparty->fournisseur) {
-{
     $showempty=$langs->trans("ThirdpartyNotCustomerNotSupplierSoNoRef");
     $disabled=1;
 }
@@ -491,9 +488,8 @@ if ($sql_select)
 			$description=(! empty($conf->global->PRODUIT_DESC_IN_FORM)?'':dol_htmlentitiesbr($objp->description));
 		}
 
-		if (($objp->info_bits & 2) == 2) { ?>
+		if (($objp->info_bits & 2) == 2) { 
-			<a href="<?php echo DOL_URL_ROOT.'/comm/remx.php?id='.$object->id; ?>">
+			print '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$object->id.'">';
-			<?php
 			$txt='';
 			print img_object($langs->trans("ShowReduc"), 'reduc').' ';
 			if ($objp->description == '(DEPOSIT)') $txt=$langs->trans("Deposit");
@@ -501,9 +497,7 @@ if ($sql_select)
 			elseif ($objp->description == '(EXCESS PAID)') $txt=$langs->trans("ExcessPaid");
 			//else $txt=$langs->trans("Discount");
 			print $txt;
-			?>
+            print '</a>';
-			</a>
-			<?php
 			if ($objp->description)
 			{
 				if ($objp->description == '(CREDIT_NOTE)' && $objp->fk_remise_except > 0)

htdocs/core/actions_massactions.inc.php

@@ -378,10 +378,10 @@ if (! $error && $massaction == 'confirm_presend')
 
                     $parameters=array('mode'=>'formemail');
 
-                    if ( ! empty( $listofobjectthirdparties ) ) {
+                    if ( ! empty($listofobjectthirdparties) ) {
                         $parameters['listofobjectthirdparties'] = $listofobjectthirdparties;
                     }
-                    if ( ! empty( $listofobjectref ) ) {
+                    if ( ! empty($listofobjectref) ) {
                         $parameters['listofobjectref'] = $listofobjectref;
                     }
 

htdocs/core/boxes/box_actions.php

@@ -41,7 +41,7 @@ class box_actions extends ModeleBoxes
      * @var DoliDB Database handler.
      */
     public $db;
-    
+
 	var $param;
 
 	var $info_box_head = array();
@@ -141,7 +141,7 @@ class box_actions extends ModeleBoxes
                     );
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="left" class="nowrap"',
+                        'td' => 'class="nowrap left"',
                         'text' => dol_print_date($datelimite, "dayhour"),
                     );
 
@@ -151,7 +151,7 @@ class box_actions extends ModeleBoxes
                     );
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="right" width="18"',
+                        'td' => 'class="right" width="18"',
                         'text' => $actionstatic->LibStatut($objp->percentage, 3),
                     );
 
@@ -160,7 +160,7 @@ class box_actions extends ModeleBoxes
 
                 if ($num==0)
                     $this->info_box_contents[$line][0] = array(
-                        'td' => 'align="center"',
+                        'td' => 'class="center"',
                         'text'=>$langs->trans("NoActionsToDo"),
                     );
 
@@ -174,7 +174,7 @@ class box_actions extends ModeleBoxes
             }
         } else {
             $this->info_box_contents[0][0] = array(
-                'td' => 'align="left" class="nohover opacitymedium"',
+                'td' => 'class="nohover opacitymedium left"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")
             );
 		}
@@ -183,7 +183,7 @@ class box_actions extends ModeleBoxes
 	/**
 	 *	Method to show box
 	 *
-	 *	@param	array	$head       Array with properties of box title
+	 *	@param  array	$head       Array with properties of box title
 	 *	@param  array	$contents   Array with properties of box lines
 	 *  @param	int		$nooutput	No print, only return string
 	 *	@return	string
@@ -220,13 +220,13 @@ class box_actions extends ModeleBoxes
 						$dateligne=$contents[$line][4]['text'];
 						$percentage=$contents[$line][5]['text'];
 						$out.= '<tr class="oddeven">';
-						$out.= '<td align=center>';
+						$out.= '<td class="center">';
 						$out.= img_object("", $logo);
 						$out.= '</td>';
-						$out.= '<td align=center><a href="'.$urlevent.'">'.$label.'</a></td>';
+						$out.= '<td class="center"><a href="'.$urlevent.'">'.$label.'</a></td>';
-						$out.= '<td align=center><a href="'.$urlsoc.'">'.img_object("", $logosoc)." ".$nomsoc.'</a></td>';
+						$out.= '<td class="center"><a href="'.$urlsoc.'">'.img_object("", $logosoc)." ".$nomsoc.'</a></td>';
-						$out.= '<td align=center>'.$dateligne.'</td>';
+						$out.= '<td class="center">'.$dateligne.'</td>';
-						$out.= '<td align=center>'.$percentage.'</td>';
+						$out.= '<td class="center">'.$percentage.'</td>';
 						$out.= '</tr>';
 					}
 				}

htdocs/core/boxes/box_activity.php

@@ -39,7 +39,7 @@ class box_activity extends ModeleBoxes
      * @var DoliDB Database handler.
      */
     public $db;
-    
+
     var $param;
     var $enabled = 1;
 
@@ -153,32 +153,32 @@ class box_activity extends ModeleBoxes
         		while ($j < count($data))
         		{
         			$this->info_box_contents[$line][0] = array(
-        			'td' => 'align="left" width="16"',
+                        'td' => 'class="left" width="16"',
-        			'url' => DOL_URL_ROOT."/comm/propal/list.php?mainmenu=commercial&amp;leftmenu=propals&amp;viewstatut=".$data[$j]->fk_statut,
+                        'url' => DOL_URL_ROOT."/comm/propal/list.php?mainmenu=commercial&amp;leftmenu=propals&amp;viewstatut=".$data[$j]->fk_statut,
-        			'tooltip' => $langs->trans("Proposals")."&nbsp;".$propalstatic->LibStatut($data[$j]->fk_statut, 0),
+                        'tooltip' => $langs->trans("Proposals")."&nbsp;".$propalstatic->LibStatut($data[$j]->fk_statut, 0),
-        			'logo' => 'object_propal'
+                        'logo' => 'object_propal'
         			);
 
         			$this->info_box_contents[$line][1] = array(
-        			'td' => '',
+                        'td' => '',
-        			'text' => $langs->trans("Proposals")."&nbsp;".$propalstatic->LibStatut($data[$j]->fk_statut, 0),
+                        'text' => $langs->trans("Proposals")."&nbsp;".$propalstatic->LibStatut($data[$j]->fk_statut, 0),
         			);
 
         			$this->info_box_contents[$line][2] = array(
-        			'td' => 'class="right"',
+                        'td' => 'class="right"',
-        			'text' => $data[$j]->nb,
+                        'text' => $data[$j]->nb,
-        			'tooltip' => $langs->trans("Proposals")."&nbsp;".$propalstatic->LibStatut($data[$j]->fk_statut, 0),
+                        'tooltip' => $langs->trans("Proposals")."&nbsp;".$propalstatic->LibStatut($data[$j]->fk_statut, 0),
-        			'url' => DOL_URL_ROOT."/comm/propal/list.php?mainmenu=commercial&amp;leftmenu=propals&amp;viewstatut=".$data[$j]->fk_statut,
+                        'url' => DOL_URL_ROOT."/comm/propal/list.php?mainmenu=commercial&amp;leftmenu=propals&amp;viewstatut=".$data[$j]->fk_statut,
         			);
         			$totalnb += $data[$j]->nb;
 
         			$this->info_box_contents[$line][3] = array(
-        			'td' => 'class="right"',
+                        'td' => 'class="right"',
-        			'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency),
+                        'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency),
         			);
         			$this->info_box_contents[$line][4] = array(
-        			'td' => 'align="right" width="18"',
+                        'td' => 'class="right" width="18"',
-        			'text' => $propalstatic->LibStatut($data[$j]->fk_statut, 3),
+                        'text' => $propalstatic->LibStatut($data[$j]->fk_statut, 3),
         			);
 
         			$line++;
@@ -236,7 +236,7 @@ class box_activity extends ModeleBoxes
                 $j=0;
                 while ($j < count($data)) {
                     $this->info_box_contents[$line][0] = array(
-                        'td' => 'align="left" width="16"',
+                        'td' => 'class="left" width="16"',
                         'url' => DOL_URL_ROOT."/commande/list.php?mainmenu=commercial&amp;leftmenu=orders&amp;viewstatut=".$data[$j]->fk_statut,
                         'tooltip' => $langs->trans("Orders")."&nbsp;".$commandestatic->LibStatut($data[$j]->fk_statut, 0, 0),
                         'logo' => 'object_order',
@@ -260,7 +260,7 @@ class box_activity extends ModeleBoxes
                         'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency),
                     );
                     $this->info_box_contents[$line][4] = array(
-                        'td' => 'align="right" width="18"',
+                        'td' => 'class="right" width="18"',
                         'text' => $commandestatic->LibStatut($data[$j]->fk_statut, 0, 3),
                     );
 
@@ -321,43 +321,43 @@ class box_activity extends ModeleBoxes
         		while ($j < count($data)) {
         			$billurl="search_status=2&amp;paye=1&amp;year=".$data[$j]->annee;
         			$this->info_box_contents[$line][0] = array(
-        			'td' => 'align="left" width="16"',
+                        'td' => 'class="left" width="16"',
-        			'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(1, $data[$j]->fk_statut, 0),
+                        'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(1, $data[$j]->fk_statut, 0),
-        			'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
+                        'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
-        			'logo' => 'bill',
+                        'logo' => 'bill',
         			);
 
         			$this->info_box_contents[$line][1] = array(
-        			'td' => '',
+                        'td' => '',
-        			'text' => $langs->trans("Bills")."&nbsp;".$facturestatic->LibStatut(1, $data[$j]->fk_statut, 0)." ".$data[$j]->annee,
+                        'text' => $langs->trans("Bills")."&nbsp;".$facturestatic->LibStatut(1, $data[$j]->fk_statut, 0)." ".$data[$j]->annee,
         			);
 
         			$this->info_box_contents[$line][2] = array(
-        			'td' => 'class="right"',
+                        'td' => 'class="right"',
-        			'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(1, $data[$j]->fk_statut, 0),
+                        'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(1, $data[$j]->fk_statut, 0),
-        			'text' => $data[$j]->nb,
+                        'text' => $data[$j]->nb,
-        			'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
+                        'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
         			);
 
         			$this->info_box_contents[$line][3] = array(
-        			'td' => 'class="right"',
+                        'td' => 'class="right"',
-        			'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency)
+                        'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency)
         			);
 
         			// We add only for the current year
        				$totalnb += $data[$j]->nb;
 
         			$this->info_box_contents[$line][4] = array(
-        			'td' => 'align="right" width="18"',
+                        'td' => 'class="right" width="18"',
-        			'text' => $facturestatic->LibStatut(1, $data[$j]->fk_statut, 3),
+                        'text' => $facturestatic->LibStatut(1, $data[$j]->fk_statut, 3),
         			);
         			$line++;
         			$j++;
         		}
         		if (count($data)==0)
         			$this->info_box_contents[$line][0] = array(
-        			'td' => 'align="center"',
+                        'td' => 'class="center"',
-        			'text'=>$langs->trans("NoRecordedInvoices"),
+                        'text'=>$langs->trans("NoRecordedInvoices"),
         			);
         	}
 
@@ -403,49 +403,50 @@ class box_activity extends ModeleBoxes
         		while ($j < count($data)) {
         			$billurl="search_status=".$data[$j]->fk_statut."&amp;paye=0";
         			$this->info_box_contents[$line][0] = array(
-        			'td' => 'align="left" width="16"',
+                        'td' => 'class="left" width="16"',
-        			'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(0, $data[$j]->fk_statut, 0),
+                        'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(0, $data[$j]->fk_statut, 0),
-        			'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
+                        'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
-        			'logo' => 'bill',
+                        'logo' => 'bill',
         			);
 
         			$this->info_box_contents[$line][1] = array(
-        			'td' => '',
+                        'td' => '',
-        			'text' => $langs->trans("Bills")."&nbsp;".$facturestatic->LibStatut(0, $data[$j]->fk_statut, 0),
+                        'text' => $langs->trans("Bills")."&nbsp;".$facturestatic->LibStatut(0, $data[$j]->fk_statut, 0),
         			);
 
         			$this->info_box_contents[$line][2] = array(
-        			'td' => 'class="right"',
+                        'td' => 'class="right"',
-        			'text' => $data[$j]->nb,
+                        'text' => $data[$j]->nb,
-        			'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(0, $data[$j]->fk_statut, 0),
+                        'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(0, $data[$j]->fk_statut, 0),
-        			'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
+                        'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
         			);
         			$totalnb += $data[$j]->nb;
         			$this->info_box_contents[$line][3] = array(
-        			'td' => 'class="right"',
+                        'td' => 'class="right"',
-        			'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency),
+                        'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency),
         			);
         			$this->info_box_contents[$line][4] = array(
-        			'td' => 'align="right" width="18"',
+                        'td' => 'class="right" width="18"',
-        			'text' => $facturestatic->LibStatut(0, $data[$j]->fk_statut, 3, $alreadypaid),
+                        'text' => $facturestatic->LibStatut(0, $data[$j]->fk_statut, 3, $alreadypaid),
         			);
         			$line++;
         			$j++;
         		}
-        		if ($num==0)
+        		if ($num==0) {
         			$this->info_box_contents[$line][0] = array(
-        			'td' => 'align="center"',
+                        'td' => 'class="center"',
-        			'text'=>$langs->trans("NoRecordedInvoices"),
+                        'text'=>$langs->trans("NoRecordedInvoices"),
-        			);
+                    );
+                }
         	}
         }
 
 		// Add the sum in the bottom of the boxes
 		$this->info_box_contents[$line][0] = array('tr' => 'class="liste_total_wrap"');
-		$this->info_box_contents[$line][1] = array('td' => 'align="left" class="liste_total" ', 'text' => $langs->trans("Total")."&nbsp;".$textHead);
+		$this->info_box_contents[$line][1] = array('td' => 'class="liste_total left" ', 'text' => $langs->trans("Total")."&nbsp;".$textHead);
-		$this->info_box_contents[$line][2] = array('td' => 'align="right" class="liste_total" ', 'text' => $totalnb);
+		$this->info_box_contents[$line][2] = array('td' => 'class="liste_total right" ', 'text' => $totalnb);
-		$this->info_box_contents[$line][3] = array('td' => 'align="right" class="liste_total" ', 'text' => '');
+		$this->info_box_contents[$line][3] = array('td' => 'class="liste_total right" ', 'text' => '');
-		$this->info_box_contents[$line][4] = array('td' => 'align="right" class="liste_total" ', 'text' => "");
+		$this->info_box_contents[$line][4] = array('td' => 'class="liste_total right" ', 'text' => "");
     }
 
 

htdocs/core/boxes/box_bookmarks.php

@@ -37,7 +37,7 @@ class box_bookmarks extends ModeleBoxes
      * @var DoliDB Database handler.
      */
     public $db;
-    
+
 	var $param;
 
 	var $info_box_head = array();
@@ -106,7 +106,7 @@ class box_bookmarks extends ModeleBoxes
                     $objp = $db->fetch_object($result);
 
                     $this->info_box_contents[$line][0] = array(
-                        'td' => 'align="left" width="16"',
+                        'td' => 'class="left" width="16"',
                         'logo' => $this->boximg,
                         'url' => $objp->url,
                         'tooltip' => $objp->title,
@@ -127,7 +127,7 @@ class box_bookmarks extends ModeleBoxes
                     $mytxt=$langs->trans("NoRecordedBookmarks");
                     if ($user->rights->bookmark->creer) $mytxt.=' '.$langs->trans("ClickToAdd");
                     $this->info_box_contents[$line][0] = array(
-                        'td' => 'align="center" colspan="2"',
+                        'td' => 'class="center" colspan="2"',
                         'tooltip' => $mytxt,
                         'url'=> DOL_URL_ROOT.'/bookmarks/list.php', 'text'=>$mytxt,
                     );
@@ -143,7 +143,7 @@ class box_bookmarks extends ModeleBoxes
             }
         } else {
             $this->info_box_contents[0][0] = array(
-                'td' => 'align="left" class="nohover opacitymedium"',
+                'td' => 'class="nohover opacitymedium left"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")
             );
         }

htdocs/core/boxes/box_clients.php

@@ -41,7 +41,7 @@ class box_clients extends ModeleBoxes
      * @var DoliDB Database handler.
      */
     public $db;
-    
+
 	var $enabled = 1;
 
 	var $info_box_head = array();
@@ -140,26 +140,28 @@ class box_clients extends ModeleBoxes
                     );
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="right" width="18"',
+                        'td' => 'class="right" width="18"',
                         'text' => $thirdpartystatic->LibStatut($objp->status, 3)
                     );
 
 					$line++;
 				}
 
-				if ($num==0) $this->info_box_contents[$line][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedCustomers"));
+				if ($num==0) $this->info_box_contents[$line][0] = array('td' => 'class="center"','text'=>$langs->trans("NoRecordedCustomers"));
 
 				$db->free($result);
 			}
 			else {
-				$this->info_box_contents[0][0] = array(	'td' => '',
+				$this->info_box_contents[0][0] = array(
-    	        										'maxlength'=>500,
+                    'td' => '',
-	            										'text' => ($db->error().' sql='.$sql));
+                    'maxlength'=>500,
+                    'text' => ($db->error().' sql='.$sql)
+                );
 			}
 		}
 		else {
 			$this->info_box_contents[0][0] = array(
-			    'td' => 'align="left" class="nohover opacitymedium"',
+			    'td' => 'class="nohover opacitymedium left"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")
 			);
 		}

htdocs/core/boxes/box_commandes.php

@@ -41,7 +41,7 @@ class box_commandes extends ModeleBoxes
      * @var DoliDB Database handler.
      */
     public $db;
-    
+
 	var $param;
 
     var $info_box_head = array();
@@ -165,14 +165,14 @@ class box_commandes extends ModeleBoxes
                     );
 
                     $this->info_box_contents[$line][] = array(
-                        'td' => 'align="right" width="18"',
+                        'td' => 'class="right" width="18"',
                         'text' => $commandestatic->LibStatut($objp->fk_statut, $objp->facture, 3),
                     );
 
                     $line++;
                 }
 
-                if ($num==0) $this->info_box_contents[$line][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedOrders"));
+                if ($num==0) $this->info_box_contents[$line][0] = array('td' => 'class="center"','text'=>$langs->trans("NoRecordedOrders"));
 
                 $db->free($result);
             } else {
@@ -184,7 +184,7 @@ class box_commandes extends ModeleBoxes
             }
         } else {
             $this->info_box_contents[0][0] = array(
-                'td' => 'align="left" class="nohover opacitymedium"',
+                'td' => 'class="nohover opacitymedium left"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")
             );
         }