From 48a063eca4a8cd780dcd9c5af1191bb769a7d76e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 4 Oct 2018 20:18:24 +0200 Subject: [PATCH 1/3] PSR2.Classes.ClassDeclaration.CloseBraceAfterBody --- htdocs/core/class/notify.class.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php index d52166659ea..fb6c94b00f7 100644 --- a/htdocs/core/class/notify.class.php +++ b/htdocs/core/class/notify.class.php @@ -742,6 +742,4 @@ class Notify if (! $error) return $num; else return -1 * $error; } - } - From 2fc54ccf66c3129a3bb37c836a77be12a774dfca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 4 Oct 2018 20:23:58 +0200 Subject: [PATCH 2/3] PEAR.NamingConventions.ValidFunctionName.NotCamelCaps --- htdocs/core/class/utils.class.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/core/class/utils.class.php b/htdocs/core/class/utils.class.php index c6c6b8914a1..cbd9fb8fcff 100644 --- a/htdocs/core/class/utils.class.php +++ b/htdocs/core/class/utils.class.php @@ -410,13 +410,13 @@ class Utils if ($compression == 'gz' or $compression == 'bz') { - $this->backup_tables($outputfiletemp); + $this->backupTables($outputfiletemp); dol_compress_file($outputfiletemp, $outputfile, $compression); unlink($outputfiletemp); } else { - $this->backup_tables($outputfile); + $this->backupTables($outputfile); } $this->output = ""; @@ -836,7 +836,7 @@ class Utils * @param string $tables Table name or '*' for all * @return int <0 if KO, >0 if OK */ - function backup_tables($outputfile, $tables='*') + function backupTables($outputfile, $tables='*') { global $db, $langs; global $errormsg; @@ -996,4 +996,4 @@ class Utils return 1; } -} \ No newline at end of file +} From 49693854ce1ec0f7880b78608f6f3b51c06fcb23 Mon Sep 17 00:00:00 2001 From: Nicolas Aupetit Date: Sat, 6 Oct 2018 13:51:46 +1100 Subject: [PATCH 3/3] Typo fix: "eee" in localtax1 display --- htdocs/compta/facture/class/facture.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index ab0030cc92d..280c791fa5d 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -1213,7 +1213,7 @@ class Facture extends CommonInvoice if (! empty($this->total_tva)) $label.= '
' . $langs->trans('VAT') . ': ' . price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency); if (! empty($this->total_localtax1) && $this->total_localtax1 != 0) // We keep test != 0 because $this->total_localtax1 can be '0.00000000' - $label.= '
eee' . $langs->trans('LT1') . ': ' . price($this->total_localtax1, 0, $langs, 0, -1, -1, $conf->currency); + $label.= '
' . $langs->trans('LT1') . ': ' . price($this->total_localtax1, 0, $langs, 0, -1, -1, $conf->currency); if (! empty($this->total_localtax2) && $this->total_localtax2 != 0) $label.= '
' . $langs->trans('LT2') . ': ' . price($this->total_localtax2, 0, $langs, 0, -1, -1, $conf->currency); if (! empty($this->total_ttc))