From 65af8f902f9c82d5824318e126a4914731affb1b Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 28 Aug 2018 09:44:54 +0200 Subject: [PATCH 01/48] Update and standardize code --- .../class/accountancycategory.class.php | 7 ++++++- .../accountancy/class/accountingaccount.class.php | 6 +++--- .../accountancy/class/accountingjournal.class.php | 7 ++++++- htdocs/asset/class/asset.class.php | 7 ++++++- htdocs/categories/class/categorie.class.php | 7 ++++++- htdocs/compta/bank/class/bankcateg.class.php | 6 +++++- .../compta/salaries/class/paymentsalary.class.php | 7 ++++++- htdocs/core/class/ctyperesource.class.php | 14 ++++++++++++-- htdocs/core/class/html.formmail.class.php | 7 ++++++- htdocs/core/class/link.class.php | 5 +++++ htdocs/core/modules/import/modules_import.php | 7 ++++++- 11 files changed, 67 insertions(+), 13 deletions(-) diff --git a/htdocs/accountancy/class/accountancycategory.class.php b/htdocs/accountancy/class/accountancycategory.class.php index 7f0b2be0071..b919e7b70ee 100644 --- a/htdocs/accountancy/class/accountancycategory.class.php +++ b/htdocs/accountancy/class/accountancycategory.class.php @@ -58,7 +58,12 @@ class AccountancyCategory // extends CommonObject public $id; public $code; - public $label; + + /** + * @var string proper name for given parameter + */ + public $label; + public $range_account; public $sens; public $category_type; diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php index 6a72b881aab..99c23604703 100644 --- a/htdocs/accountancy/class/accountingaccount.class.php +++ b/htdocs/accountancy/class/accountingaccount.class.php @@ -81,9 +81,9 @@ class AccountingAccount extends CommonObject var $account_category; /** - * @var string proper name for given parameter - */ - public $label; + * @var string proper name for given parameter + */ + public $label; var $fk_user_author; var $fk_user_modif; diff --git a/htdocs/accountancy/class/accountingjournal.class.php b/htdocs/accountancy/class/accountingjournal.class.php index c908b4ccb7c..af084f16b5f 100644 --- a/htdocs/accountancy/class/accountingjournal.class.php +++ b/htdocs/accountancy/class/accountingjournal.class.php @@ -43,7 +43,12 @@ class AccountingJournal extends CommonObject var $rowid; public $code; - public $label; + + /** + * @var string proper name for given parameter + */ + public $label; + public $nature; // 1:various operations, 2:sale, 3:purchase, 4:bank, 5:expense-report, 8:inventory, 9: has-new public $active; diff --git a/htdocs/asset/class/asset.class.php b/htdocs/asset/class/asset.class.php index 002dca8bf56..9e722310983 100644 --- a/htdocs/asset/class/asset.class.php +++ b/htdocs/asset/class/asset.class.php @@ -98,7 +98,12 @@ class Asset extends CommonObject public $rowid; public $ref; public $entity; - public $label; + + /** + * @var string proper name for given parameter + */ + public $label; + public $amount; public $fk_soc; public $description; diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php index 3736ce58d5b..381263b9097 100644 --- a/htdocs/categories/class/categorie.class.php +++ b/htdocs/categories/class/categorie.class.php @@ -159,7 +159,12 @@ class Categorie extends CommonObject public $table_element='categorie'; public $fk_parent; - public $label; + + /** + * @var string proper name for given parameter + */ + public $label; + public $description; /** * @var string Color diff --git a/htdocs/compta/bank/class/bankcateg.class.php b/htdocs/compta/bank/class/bankcateg.class.php index 44e4f72c496..ad470148abc 100644 --- a/htdocs/compta/bank/class/bankcateg.class.php +++ b/htdocs/compta/bank/class/bankcateg.class.php @@ -33,7 +33,11 @@ class BankCateg // extends CommonObject public $picto='generic'; public $id; - public $label; + + /** + * @var string proper name for given parameter + */ + public $label; /** diff --git a/htdocs/compta/salaries/class/paymentsalary.class.php b/htdocs/compta/salaries/class/paymentsalary.class.php index babd5323fce..00eac1ac3b4 100644 --- a/htdocs/compta/salaries/class/paymentsalary.class.php +++ b/htdocs/compta/salaries/class/paymentsalary.class.php @@ -51,7 +51,12 @@ class PaymentSalary extends CommonObject public $fk_project; public $type_payment; public $num_payment; - public $label; + + /** + * @var string proper name for given parameter + */ + public $label; + public $datesp; public $dateep; public $fk_bank; diff --git a/htdocs/core/class/ctyperesource.class.php b/htdocs/core/class/ctyperesource.class.php index 9e0e5b90377..f7c84ceae98 100644 --- a/htdocs/core/class/ctyperesource.class.php +++ b/htdocs/core/class/ctyperesource.class.php @@ -48,7 +48,12 @@ class Ctyperesource public $lines = array(); public $code; - public $label; + + /** + * @var string proper name for given parameter + */ + public $label; + public $active; @@ -480,7 +485,12 @@ class CtyperesourceLine */ public $code; - public $label; + + /** + * @var string proper name for given parameter + */ + public $label; + public $active; /** diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php index 0a1e3c26f2f..f06cc5da0dd 100644 --- a/htdocs/core/class/html.formmail.class.php +++ b/htdocs/core/class/html.formmail.class.php @@ -1395,7 +1395,12 @@ class FormMail extends Form class ModelMail { public $id; - public $label; + + /** + * @var string proper name for given parameter + */ + public $label; + public $topic; public $content; public $content_lines; diff --git a/htdocs/core/class/link.class.php b/htdocs/core/class/link.class.php index 0d695baaf8d..951c6e75b02 100644 --- a/htdocs/core/class/link.class.php +++ b/htdocs/core/class/link.class.php @@ -41,7 +41,12 @@ class Link extends CommonObject public $entity; public $datea; public $url; + + /** + * @var string proper name for given parameter + */ public $label; + public $objecttype; public $objectid; diff --git a/htdocs/core/modules/import/modules_import.php b/htdocs/core/modules/import/modules_import.php index 7c26fdb68d3..429f1cdbae8 100644 --- a/htdocs/core/modules/import/modules_import.php +++ b/htdocs/core/modules/import/modules_import.php @@ -40,7 +40,12 @@ class ModeleImports public $error=''; public $id; // Id of driver - public $label; // Label of driver + + /** + * @var string proper name for given parameter + */ + public $label; + public $extension; // Extension of files imported by driver public $version; // Version of driver From c352bbbd18f075e23631124eb2fbf991c3e586cb Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Tue, 28 Aug 2018 10:37:16 +0200 Subject: [PATCH 02/48] Update accountancycategory.class.php --- .../accountancy/class/accountancycategory.class.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/accountancy/class/accountancycategory.class.php b/htdocs/accountancy/class/accountancycategory.class.php index b919e7b70ee..a4c5ac7b0ec 100644 --- a/htdocs/accountancy/class/accountancycategory.class.php +++ b/htdocs/accountancy/class/accountancycategory.class.php @@ -31,9 +31,9 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php'; class AccountancyCategory // extends CommonObject { /** - * @var DoliDB Database handler. - */ - public $db; + * @var DoliDB Database handler. + */ + public $db; /** * @var string Error string @@ -60,9 +60,9 @@ class AccountancyCategory // extends CommonObject public $code; /** - * @var string proper name for given parameter - */ - public $label; + * @var string proper name for given parameter + */ + public $label; public $range_account; public $sens; From 34ea3d479f5a1d78bd7f76cbfa6fcaa867dfa4d7 Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Tue, 28 Aug 2018 10:38:01 +0200 Subject: [PATCH 03/48] Update accountingaccount.class.php --- htdocs/accountancy/class/accountingaccount.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php index 99c23604703..aa12b887f7d 100644 --- a/htdocs/accountancy/class/accountingaccount.class.php +++ b/htdocs/accountancy/class/accountingaccount.class.php @@ -81,9 +81,9 @@ class AccountingAccount extends CommonObject var $account_category; /** - * @var string proper name for given parameter - */ - public $label; + * @var string proper name for given parameter + */ + public $label; var $fk_user_author; var $fk_user_modif; From df05eb785b858ee0262c52f78a8f24511eb9d631 Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Tue, 28 Aug 2018 10:38:42 +0200 Subject: [PATCH 04/48] Update accountingjournal.class.php --- htdocs/accountancy/class/accountingjournal.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/accountancy/class/accountingjournal.class.php b/htdocs/accountancy/class/accountingjournal.class.php index af084f16b5f..cd8131981c1 100644 --- a/htdocs/accountancy/class/accountingjournal.class.php +++ b/htdocs/accountancy/class/accountingjournal.class.php @@ -45,9 +45,9 @@ class AccountingJournal extends CommonObject public $code; /** - * @var string proper name for given parameter - */ - public $label; + * @var string proper name for given parameter + */ + public $label; public $nature; // 1:various operations, 2:sale, 3:purchase, 4:bank, 5:expense-report, 8:inventory, 9: has-new public $active; From 32d63aa50ca046e837229a961920e3594c4f4016 Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Tue, 28 Aug 2018 10:39:11 +0200 Subject: [PATCH 05/48] Update asset.class.php --- htdocs/asset/class/asset.class.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/asset/class/asset.class.php b/htdocs/asset/class/asset.class.php index 9e722310983..93ee5014dc2 100644 --- a/htdocs/asset/class/asset.class.php +++ b/htdocs/asset/class/asset.class.php @@ -100,9 +100,9 @@ class Asset extends CommonObject public $entity; /** - * @var string proper name for given parameter - */ - public $label; + * @var string proper name for given parameter + */ + public $label; public $amount; public $fk_soc; @@ -470,4 +470,4 @@ class Asset extends CommonObject return 0; } -} \ No newline at end of file +} From 405f3ca858a0db9f364ace26194c79a1d365a85f Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Tue, 28 Aug 2018 10:40:03 +0200 Subject: [PATCH 06/48] Update categorie.class.php --- htdocs/categories/class/categorie.class.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php index 381263b9097..8903e43c2ba 100644 --- a/htdocs/categories/class/categorie.class.php +++ b/htdocs/categories/class/categorie.class.php @@ -6,7 +6,7 @@ * Copyright (C) 2006-2012 Laurent Destailleur * Copyright (C) 2007 Patrick Raguin * Copyright (C) 2013-2016 Juanjo Menent - * Copyright (C) 2013-2016 Philippe Grand + * Copyright (C) 2013-2018 Philippe Grand * Copyright (C) 2015 Marcos García * Copyright (C) 2015 Raphaël Doursenaud * Copyright (C) 2016 Charlie Benke @@ -51,7 +51,7 @@ class Categorie extends CommonObject const TYPE_USER = 'user'; const TYPE_PROJECT = 'project'; const TYPE_ACCOUNT = 'bank_account'; - const TYPE_BANK_LINE = 'bank_line'; + const TYPE_BANK_LINE = 'bank_line'; public $picto = 'category'; @@ -161,9 +161,9 @@ class Categorie extends CommonObject public $fk_parent; /** - * @var string proper name for given parameter - */ - public $label; + * @var string proper name for given parameter + */ + public $label; public $description; /** From 1337d85a2924a9f362f6509484db6fe36910219c Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Tue, 28 Aug 2018 10:40:41 +0200 Subject: [PATCH 07/48] Update bankcateg.class.php --- htdocs/compta/bank/class/bankcateg.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/compta/bank/class/bankcateg.class.php b/htdocs/compta/bank/class/bankcateg.class.php index ad470148abc..04a668704a8 100644 --- a/htdocs/compta/bank/class/bankcateg.class.php +++ b/htdocs/compta/bank/class/bankcateg.class.php @@ -35,9 +35,9 @@ class BankCateg // extends CommonObject public $id; /** - * @var string proper name for given parameter - */ - public $label; + * @var string proper name for given parameter + */ + public $label; /** From b7bc34963a5236e403e8e430851b6d4c38a0b64e Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Tue, 28 Aug 2018 10:41:05 +0200 Subject: [PATCH 08/48] Update paymentsalary.class.php --- htdocs/compta/salaries/class/paymentsalary.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/compta/salaries/class/paymentsalary.class.php b/htdocs/compta/salaries/class/paymentsalary.class.php index 00eac1ac3b4..0103e46fc8b 100644 --- a/htdocs/compta/salaries/class/paymentsalary.class.php +++ b/htdocs/compta/salaries/class/paymentsalary.class.php @@ -53,9 +53,9 @@ class PaymentSalary extends CommonObject public $num_payment; /** - * @var string proper name for given parameter - */ - public $label; + * @var string proper name for given parameter + */ + public $label; public $datesp; public $dateep; From 1856fb894649968c7684a3f7e3c5c96d3bb15218 Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Tue, 28 Aug 2018 10:41:26 +0200 Subject: [PATCH 09/48] Update ctyperesource.class.php --- htdocs/core/class/ctyperesource.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/core/class/ctyperesource.class.php b/htdocs/core/class/ctyperesource.class.php index f7c84ceae98..2195ab2cbb0 100644 --- a/htdocs/core/class/ctyperesource.class.php +++ b/htdocs/core/class/ctyperesource.class.php @@ -50,9 +50,9 @@ class Ctyperesource public $code; /** - * @var string proper name for given parameter - */ - public $label; + * @var string proper name for given parameter + */ + public $label; public $active; From b73fd487c0f2360c158426baa67fbdad470ae5ce Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Tue, 28 Aug 2018 10:41:54 +0200 Subject: [PATCH 10/48] Update ctyperesource.class.php --- htdocs/core/class/ctyperesource.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/core/class/ctyperesource.class.php b/htdocs/core/class/ctyperesource.class.php index 2195ab2cbb0..598b250a777 100644 --- a/htdocs/core/class/ctyperesource.class.php +++ b/htdocs/core/class/ctyperesource.class.php @@ -487,9 +487,9 @@ class CtyperesourceLine public $code; /** - * @var string proper name for given parameter - */ - public $label; + * @var string proper name for given parameter + */ + public $label; public $active; From 6fc813254b44e76cea5b143ac8d27275f80562f0 Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Tue, 28 Aug 2018 10:43:13 +0200 Subject: [PATCH 11/48] Update html.formmail.class.php --- htdocs/core/class/html.formmail.class.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php index f06cc5da0dd..5895ce23576 100644 --- a/htdocs/core/class/html.formmail.class.php +++ b/htdocs/core/class/html.formmail.class.php @@ -1,9 +1,9 @@ - * Copyright (C) 2005-2012 Regis Houssin - * Copyright (C) 2010-2011 Juanjo Menent + * Copyright (C) 2005-2012 Regis Houssin + * Copyright (C) 2010-2011 Juanjo Menent * Copyright (C) 2015-2017 Marcos García - * Copyright (C) 2015-2017 Nicolas ZABOURI + * Copyright (C) 2015-2017 Nicolas ZABOURI * * 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 @@ -36,9 +36,9 @@ require_once DOL_DOCUMENT_ROOT .'/core/class/html.form.class.php'; class FormMail extends Form { /** - * @var DoliDB Database handler. - */ - public $db; + * @var DoliDB Database handler. + */ + public $db; var $withform; // 1=Include HTML form tag and show submit button, 0=Do not include form tag and submit button, -1=Do not include form tag but include submit button @@ -1397,9 +1397,9 @@ class ModelMail public $id; /** - * @var string proper name for given parameter - */ - public $label; + * @var string proper name for given parameter + */ + public $label; public $topic; public $content; From fa992c3e6d5aac0f75239490360651b08b91d62a Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Tue, 28 Aug 2018 10:44:18 +0200 Subject: [PATCH 12/48] Update modules_import.php --- htdocs/core/modules/import/modules_import.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/modules/import/modules_import.php b/htdocs/core/modules/import/modules_import.php index 429f1cdbae8..8f17078e4c1 100644 --- a/htdocs/core/modules/import/modules_import.php +++ b/htdocs/core/modules/import/modules_import.php @@ -41,7 +41,7 @@ class ModeleImports public $id; // Id of driver - /** + /** * @var string proper name for given parameter */ public $label; From 84a9ca3f68d1d31b80b734fe6009b2eccef947cf Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Wed, 29 Aug 2018 10:40:30 +0200 Subject: [PATCH 13/48] fix : Parse error: ./htdocs/comm/mailing/cibles.php:644 --- htdocs/comm/mailing/cibles.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php index 13d72acb3d7..7b01c1c5a22 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -326,6 +326,8 @@ if ($object->fetch($id) >= 0) } // Si le module mailing est qualifie + if ($qualified) + { if ($allowaddtarget) { print '
'; From 8785c10ad8a4d79951fbaa334532ca8f9a56e787 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Wed, 29 Aug 2018 10:52:27 +0200 Subject: [PATCH 14/48] typo --- htdocs/contrat/class/api_contracts.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/contrat/class/api_contracts.class.php b/htdocs/contrat/class/api_contracts.class.php index 8c206554ee1..61c548c4f50 100644 --- a/htdocs/contrat/class/api_contracts.class.php +++ b/htdocs/contrat/class/api_contracts.class.php @@ -457,7 +457,7 @@ class Contracts extends DolibarrApi throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login); } - // TODO Check the lineid $lineid is a line of ojbect + // TODO Check the lineid $lineid is a line of object $updateRes = $this->contract->deleteline($lineid, DolibarrApiAccess::$user); if ($updateRes > 0) { @@ -472,7 +472,7 @@ class Contracts extends DolibarrApi /** * Update contract general fields (won't touch lines of contract) * - * @param int $id Id of contrat to update + * @param int $id Id of contract to update * @param array $request_data Datas * * @return int @@ -541,7 +541,7 @@ class Contracts extends DolibarrApi } /** - * Validate an contract + * Validate a contract * * @param int $id Contract ID * @param int $notrigger 1=Does not execute triggers, 0= execute triggers From 881ab54cf08ea46aff1314706e06899428249fa8 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Wed, 29 Aug 2018 11:06:20 +0200 Subject: [PATCH 15/48] typo and translation --- htdocs/contrat/class/contrat.class.php | 30 +++++++++++++------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php index 537d18245fd..5ce01cb5a60 100644 --- a/htdocs/contrat/class/contrat.class.php +++ b/htdocs/contrat/class/contrat.class.php @@ -241,8 +241,8 @@ class Contrat extends CommonObject * * @param User $user Objet User who activate contract * @param int $line_id Id of line to activate - * @param int $date Date d'ouverture - * @param int|string $date_end Date fin prevue + * @param int $date Opening date + * @param int|string $date_end Expected end date * @param string $comment A comment typed by user * @return int <0 if KO, >0 if OK */ @@ -263,7 +263,7 @@ class Contrat extends CommonObject * * @param User $user Objet User who close contract * @param int $line_id Id of line to close - * @param int $date_end Date end + * @param int $date_end End date * @param string $comment A comment typed by user * @return int <0 if KO, >0 if OK */ @@ -526,7 +526,7 @@ class Contrat extends CommonObject /** * Unvalidate a contract * - * @param User $user Objet User + * @param User $user Object User * @param int $notrigger 1=Does not execute triggers, 0=execute triggers * @return int <0 if KO, >0 if OK */ @@ -568,7 +568,7 @@ class Contrat extends CommonObject // End call triggers } - // Set new ref and define current statut + // Set new ref and define current status if (! $error) { $this->statut=0; @@ -666,7 +666,7 @@ class Contrat extends CommonObject $this->db->free($resql); - // Retreive all extrafield + // Retreive all extrafields // fetch optionals attributes and labels $this->fetch_optionals(); @@ -729,7 +729,7 @@ class Contrat extends CommonObject $this->lines=array(); $pos = 0; - // Selectionne les lignes contrats liees a un produit + // Selects contract lines related to a product $sql = "SELECT p.label as product_label, p.description as product_desc, p.ref as product_ref,"; $sql.= " d.rowid, d.fk_contrat, d.statut, d.description, d.price_ht, d.vat_src_code, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.localtax1_type, d.localtax2_type, d.qty, d.remise_percent, d.subprice, d.fk_product_fournisseur_price as fk_fournprice, d.buy_price_ht as pa_ht,"; $sql.= " d.total_ht,"; @@ -763,7 +763,7 @@ class Contrat extends CommonObject $line->id = $objp->rowid; $line->ref = $objp->rowid; $line->fk_contrat = $objp->fk_contrat; - $line->desc = $objp->description; // Description ligne + $line->desc = $objp->description; // Description line $line->qty = $objp->qty; $line->vat_src_code = $objp->vat_src_code ; $line->tva_tx = $objp->tva_tx; @@ -794,9 +794,9 @@ class Contrat extends CommonObject $line->fk_unit = $objp->fk_unit; $line->ref = $objp->product_ref; // deprecated - $line->product_ref = $objp->product_ref; // Ref product - $line->product_desc = $objp->product_desc; // Description product - $line->product_label = $objp->product_label; // Label product + $line->product_ref = $objp->product_ref; // Product Ref + $line->product_desc = $objp->product_desc; // Product Description + $line->product_label = $objp->product_label; // Product Label $line->description = $objp->description; @@ -814,7 +814,7 @@ class Contrat extends CommonObject $line->date_fin_prevue = $this->db->jdate($objp->date_fin_validite); $line->date_fin_reel = $this->db->jdate($objp->date_cloture); - // Retreive all extrafield for contract + // Retreive all extrafields for contract // fetch optionals attributes and labels $line->fetch_optionals(); @@ -920,7 +920,7 @@ class Contrat extends CommonObject $modCodeContract = new $module(); if (!empty($modCodeContract->code_auto)) { - // Mise a jour ref + // Update ref $sql = 'UPDATE '.MAIN_DB_PREFIX."contrat SET ref='(PROV".$this->id.")' WHERE rowid=".$this->id; if ($this->db->query($sql)) { @@ -944,14 +944,14 @@ class Contrat extends CommonObject } } - // Insert contacts commerciaux ('SALESREPSIGN','contrat') + // Insert business contacts ('SALESREPSIGN','contrat') if (! $error) { $result=$this->add_contact($this->commercial_signature_id,'SALESREPSIGN','internal'); if ($result < 0) $error++; } - // Insert contacts commerciaux ('SALESREPFOLL','contrat') + // Insert business contacts ('SALESREPFOLL','contrat') if (! $error) { $result=$this->add_contact($this->commercial_suivi_id,'SALESREPFOLL','internal'); From 65f90136349a0210cb74f5b76163010cfec0acff Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Wed, 29 Aug 2018 11:35:51 +0200 Subject: [PATCH 16/48] Update api_contracts.class.php --- htdocs/contrat/class/api_contracts.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/contrat/class/api_contracts.class.php b/htdocs/contrat/class/api_contracts.class.php index 61c548c4f50..a13fdc3e9c3 100644 --- a/htdocs/contrat/class/api_contracts.class.php +++ b/htdocs/contrat/class/api_contracts.class.php @@ -61,7 +61,7 @@ class Contracts extends DolibarrApi * * @param int $id ID of contract * @return array|mixed data without useless information - * + * * @throws RestException */ function get($id) From 5b0425706c614d79e20ba2220605c313942b7018 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Wed, 29 Aug 2018 11:39:38 +0200 Subject: [PATCH 17/48] try to fix space errors --- htdocs/comm/mailing/cibles.php | 1 - 1 file changed, 1 deletion(-) diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php index 7b01c1c5a22..dc332fc0c51 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -66,7 +66,6 @@ $modulesdir = dolGetModulesDirs('/mailings'); $object = new Mailing($db); - /* * Actions */ From 4395d04132df6a609b6909ff18603c4f852e8ec5 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Wed, 29 Aug 2018 11:44:57 +0200 Subject: [PATCH 18/48] try to fix space errors --- htdocs/resource/class/dolresource.class.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/htdocs/resource/class/dolresource.class.php b/htdocs/resource/class/dolresource.class.php index 604e4f8849d..f08e3e75921 100644 --- a/htdocs/resource/class/dolresource.class.php +++ b/htdocs/resource/class/dolresource.class.php @@ -19,7 +19,6 @@ * \file resource/class/resource.class.php * \ingroup resource * \brief Class file for resource object - */ require_once DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"; @@ -33,13 +32,13 @@ class Dolresource extends CommonObject /** * @var string ID to identify managed object */ - public $element='dolresource'; - + public $element='dolresource'; + /** * @var string Name of table without prefix where object is stored */ - public $table_element='resource'; - + public $table_element='resource'; + public $picto = 'resource'; public $resource_id; From d3ccf4e2b398a1dd76f3f119d84e9fdb385d0d0d Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Wed, 29 Aug 2018 11:55:52 +0200 Subject: [PATCH 19/48] try to fix space errors --- htdocs/expensereport/class/paymentexpensereport.class.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/htdocs/expensereport/class/paymentexpensereport.class.php b/htdocs/expensereport/class/paymentexpensereport.class.php index a827b095bff..e3a86d0c23c 100644 --- a/htdocs/expensereport/class/paymentexpensereport.class.php +++ b/htdocs/expensereport/class/paymentexpensereport.class.php @@ -34,12 +34,12 @@ class PaymentExpenseReport extends CommonObject * @var string ID to identify managed object */ public $element='payment_expensereport'; - + /** * @var string Name of table without prefix where object is stored */ - public $table_element='payment_expensereport'; - + public $table_element='payment_expensereport'; + public $picto = 'payment'; var $rowid; @@ -248,7 +248,6 @@ class PaymentExpenseReport extends CommonObject if (isset($this->fk_user_modif)) $this->fk_user_modif=trim($this->fk_user_modif); - // Check parameters // Put here code to add control on parameters values From e92b96acfd1a45db4323aeb26c10044957f295f5 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Wed, 29 Aug 2018 12:00:53 +0200 Subject: [PATCH 20/48] try to fix space errors --- .../class/paymentsocialcontribution.class.php | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php index 560e47abe7c..88528ef5a40 100644 --- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php +++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php @@ -35,30 +35,30 @@ class PaymentSocialContribution extends CommonObject * @var string ID to identify managed object */ public $element='paiementcharge'; - + /** * @var string Name of table without prefix where object is stored */ - public $table_element='paiementcharge'; - + public $table_element='paiementcharge'; + public $picto = 'payment'; - var $fk_charge; - var $datec=''; - var $tms=''; - var $datep=''; + public $fk_charge; + public $datec=''; + public $tms=''; + public $datep=''; /** * @deprecated * @see amount */ - var $total; - var $amount; // Total amount of payment - var $amounts=array(); // Array of amounts - var $fk_typepaiement; - var $num_paiement; - var $fk_bank; - var $fk_user_creat; - var $fk_user_modif; + public $total; + public $amount; // Total amount of payment + public $amounts=array(); // Array of amounts + public $fk_typepaiement; + public $num_paiement; + public $fk_bank; + public $fk_user_creat; + public $fk_user_modif; /** * Constructor From 684913de17f8f8aa1115e7b7fe6f890b0b3ffe3c Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Wed, 29 Aug 2018 12:05:20 +0200 Subject: [PATCH 21/48] Update accountancycategory.class.php --- .../class/accountancycategory.class.php | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/htdocs/accountancy/class/accountancycategory.class.php b/htdocs/accountancy/class/accountancycategory.class.php index a4c5ac7b0ec..5ba9172c289 100644 --- a/htdocs/accountancy/class/accountancycategory.class.php +++ b/htdocs/accountancy/class/accountancycategory.class.php @@ -31,39 +31,39 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php'; class AccountancyCategory // extends CommonObject { /** - * @var DoliDB Database handler. - */ - public $db; - + * @var DoliDB Database handler. + */ + public $db; + /** * @var string Error string * @see errors */ public $error; - + /** * @var string[] Error codes (or messages) */ public $errors = array(); - + /** * @var string ID to identify managed object */ - public $element='c_accounting_category'; - + public $element='c_accounting_category'; + /** * @var string Name of table without prefix where object is stored */ - public $table_element='c_accounting_category'; + public $table_element='c_accounting_category'; public $id; public $code; - + /** - * @var string proper name for given parameter - */ - public $label; - + * @var string proper name for given parameter + */ + public $label; + public $range_account; public $sens; public $category_type; From 81eae4cbda3e67b4765051e3497db5c1d9516ec9 Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Wed, 29 Aug 2018 12:09:31 +0200 Subject: [PATCH 22/48] Update accountingaccount.class.php --- .../class/accountingaccount.class.php | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php index aa12b887f7d..29d86cd0beb 100644 --- a/htdocs/accountancy/class/accountingaccount.class.php +++ b/htdocs/accountancy/class/accountingaccount.class.php @@ -31,12 +31,12 @@ class AccountingAccount extends CommonObject { public $element='accounting_account'; - + /** * @var string Name of table without prefix where object is stored */ public $table_element='accounting_account'; - + public $picto = 'billr'; /** @@ -44,7 +44,7 @@ class AccountingAccount extends CommonObject * @var int */ public $ismultientitymanaged = 1; - + /** * 0=Default, 1=View may be restricted to sales representative only if no permission to see all or to company of external user if external user * @var integer @@ -55,22 +55,22 @@ class AccountingAccount extends CommonObject * @var DoliDB Database handler. */ public $db; - + /** * @var string Error code (or message) */ - public $error=''; + public $error=''; /** * @var string[] Error codes (or messages) */ public $errors = array(); - + /** * @var int ID */ public $id; - + var $rowid; var $datec; // Creation date var $fk_pcg_version; @@ -79,12 +79,12 @@ class AccountingAccount extends CommonObject var $account_number; var $account_parent; var $account_category; - + /** - * @var string proper name for given parameter - */ - public $label; - + * @var string proper name for given parameter + */ + public $label; + var $fk_user_author; var $fk_user_modif; var $active; // duplicate with status From 79988282af64b8c03721c227599e718971451451 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Wed, 29 Aug 2018 12:14:07 +0200 Subject: [PATCH 23/48] Fix white spaces --- .../class/accountancycategory.class.php | 28 +++++++++---------- .../class/accountingaccount.class.php | 24 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/htdocs/accountancy/class/accountancycategory.class.php b/htdocs/accountancy/class/accountancycategory.class.php index a4c5ac7b0ec..5ba9172c289 100644 --- a/htdocs/accountancy/class/accountancycategory.class.php +++ b/htdocs/accountancy/class/accountancycategory.class.php @@ -31,39 +31,39 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php'; class AccountancyCategory // extends CommonObject { /** - * @var DoliDB Database handler. - */ - public $db; - + * @var DoliDB Database handler. + */ + public $db; + /** * @var string Error string * @see errors */ public $error; - + /** * @var string[] Error codes (or messages) */ public $errors = array(); - + /** * @var string ID to identify managed object */ - public $element='c_accounting_category'; - + public $element='c_accounting_category'; + /** * @var string Name of table without prefix where object is stored */ - public $table_element='c_accounting_category'; + public $table_element='c_accounting_category'; public $id; public $code; - + /** - * @var string proper name for given parameter - */ - public $label; - + * @var string proper name for given parameter + */ + public $label; + public $range_account; public $sens; public $category_type; diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php index aa12b887f7d..29d86cd0beb 100644 --- a/htdocs/accountancy/class/accountingaccount.class.php +++ b/htdocs/accountancy/class/accountingaccount.class.php @@ -31,12 +31,12 @@ class AccountingAccount extends CommonObject { public $element='accounting_account'; - + /** * @var string Name of table without prefix where object is stored */ public $table_element='accounting_account'; - + public $picto = 'billr'; /** @@ -44,7 +44,7 @@ class AccountingAccount extends CommonObject * @var int */ public $ismultientitymanaged = 1; - + /** * 0=Default, 1=View may be restricted to sales representative only if no permission to see all or to company of external user if external user * @var integer @@ -55,22 +55,22 @@ class AccountingAccount extends CommonObject * @var DoliDB Database handler. */ public $db; - + /** * @var string Error code (or message) */ - public $error=''; + public $error=''; /** * @var string[] Error codes (or messages) */ public $errors = array(); - + /** * @var int ID */ public $id; - + var $rowid; var $datec; // Creation date var $fk_pcg_version; @@ -79,12 +79,12 @@ class AccountingAccount extends CommonObject var $account_number; var $account_parent; var $account_category; - + /** - * @var string proper name for given parameter - */ - public $label; - + * @var string proper name for given parameter + */ + public $label; + var $fk_user_author; var $fk_user_modif; var $active; // duplicate with status From b29721df61a9fb222ce4b86daa1c003ecb9ae0d3 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Wed, 29 Aug 2018 12:17:59 +0200 Subject: [PATCH 24/48] Fix white spaces --- .../class/accountingjournal.class.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/htdocs/accountancy/class/accountingjournal.class.php b/htdocs/accountancy/class/accountingjournal.class.php index cd8131981c1..f10e0d1ce01 100644 --- a/htdocs/accountancy/class/accountingjournal.class.php +++ b/htdocs/accountancy/class/accountingjournal.class.php @@ -30,25 +30,25 @@ class AccountingJournal extends CommonObject * @var string ID to identify managed object */ public $element='accounting_journal'; - + /** * @var string Name of table without prefix where object is stored */ public $table_element='accounting_journal'; - + public $fk_element = ''; public $ismultientitymanaged = 0; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe public $picto = 'generic'; - var $rowid; + public $rowid; public $code; - + /** - * @var string proper name for given parameter - */ - public $label; - + * @var string proper name for given parameter + */ + public $label; + public $nature; // 1:various operations, 2:sale, 3:purchase, 4:bank, 5:expense-report, 8:inventory, 9: has-new public $active; From a1f31120ba087c23bdb2e3b325e2785c679414a4 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Wed, 29 Aug 2018 12:20:35 +0200 Subject: [PATCH 25/48] Fix white spaces --- htdocs/asset/class/asset.class.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/htdocs/asset/class/asset.class.php b/htdocs/asset/class/asset.class.php index 93ee5014dc2..9676f050518 100644 --- a/htdocs/asset/class/asset.class.php +++ b/htdocs/asset/class/asset.class.php @@ -35,22 +35,22 @@ class Asset extends CommonObject * @var string ID to identify managed object */ public $element = 'asset'; - + /** * @var string Name of table without prefix where object is stored */ public $table_element = 'asset'; - + /** * @var int Does module support multicompany module ? 0=No test on entity, 1=Test with field entity, 2=Test with link by societe */ public $ismultientitymanaged = 0; - + /** * @var int Does asset support extrafields ? 0=No, 1=Yes */ public $isextrafieldmanaged = 1; - + /** * @var string String with name of icon for asset. Must be the part after the 'object_' into object_asset.png */ @@ -98,12 +98,12 @@ class Asset extends CommonObject public $rowid; public $ref; public $entity; - + /** - * @var string proper name for given parameter - */ - public $label; - + * @var string proper name for given parameter + */ + public $label; + public $amount; public $fk_soc; public $description; From 9681dfca1b9be85829d3abb5d2885a98666739af Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Wed, 29 Aug 2018 12:23:03 +0200 Subject: [PATCH 26/48] Fix white spaces --- htdocs/categories/class/categorie.class.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php index 8903e43c2ba..d846257f68d 100644 --- a/htdocs/categories/class/categorie.class.php +++ b/htdocs/categories/class/categorie.class.php @@ -152,19 +152,19 @@ class Categorie extends CommonObject * @var string ID to identify managed object */ public $element='category'; - + /** * @var string Name of table without prefix where object is stored */ public $table_element='categorie'; public $fk_parent; - + /** - * @var string proper name for given parameter - */ - public $label; - + * @var string proper name for given parameter + */ + public $label; + public $description; /** * @var string Color From 88ad651743a7481ee6a50097fedc8e9d269e4cc6 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Wed, 29 Aug 2018 12:26:47 +0200 Subject: [PATCH 27/48] Fix white spaces --- htdocs/compta/bank/class/bankcateg.class.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/compta/bank/class/bankcateg.class.php b/htdocs/compta/bank/class/bankcateg.class.php index 04a668704a8..efd249e3a01 100644 --- a/htdocs/compta/bank/class/bankcateg.class.php +++ b/htdocs/compta/bank/class/bankcateg.class.php @@ -33,11 +33,11 @@ class BankCateg // extends CommonObject public $picto='generic'; public $id; - + /** - * @var string proper name for given parameter - */ - public $label; + * @var string proper name for given parameter + */ + public $label; /** From 4b7dd5ace338061b16fe8788fa0a61fc776ee422 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Wed, 29 Aug 2018 12:29:05 +0200 Subject: [PATCH 28/48] Fix white spaces --- .../salaries/class/paymentsalary.class.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/htdocs/compta/salaries/class/paymentsalary.class.php b/htdocs/compta/salaries/class/paymentsalary.class.php index 0103e46fc8b..550a8577f52 100644 --- a/htdocs/compta/salaries/class/paymentsalary.class.php +++ b/htdocs/compta/salaries/class/paymentsalary.class.php @@ -35,12 +35,12 @@ class PaymentSalary extends CommonObject * @var string ID to identify managed object */ public $element='payment_salary'; - + /** * @var string Name of table without prefix where object is stored */ - public $table_element='payment_salary'; - + public $table_element='payment_salary'; + public $picto='payment'; public $tms; @@ -51,12 +51,12 @@ class PaymentSalary extends CommonObject public $fk_project; public $type_payment; public $num_payment; - + /** - * @var string proper name for given parameter - */ - public $label; - + * @var string proper name for given parameter + */ + public $label; + public $datesp; public $dateep; public $fk_bank; From 32a9e35a6a38ec4b57bf32d92431bf01227fac5b Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Wed, 29 Aug 2018 12:31:36 +0200 Subject: [PATCH 29/48] Fix white spaces --- htdocs/core/class/ctyperesource.class.php | 24 +++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/htdocs/core/class/ctyperesource.class.php b/htdocs/core/class/ctyperesource.class.php index 598b250a777..9a6c90a3293 100644 --- a/htdocs/core/class/ctyperesource.class.php +++ b/htdocs/core/class/ctyperesource.class.php @@ -36,7 +36,7 @@ class Ctyperesource * @var string Id to identify managed objects */ public $element = 'ctyperesource'; - + /** * @var string Name of table without prefix where object is stored */ @@ -48,12 +48,12 @@ class Ctyperesource public $lines = array(); public $code; - + /** - * @var string proper name for given parameter - */ - public $label; - + * @var string proper name for given parameter + */ + public $label; + public $active; @@ -480,17 +480,17 @@ class CtyperesourceLine * @var int ID */ public $id; + /** * @var mixed Sample line property 1 */ - public $code; - + /** - * @var string proper name for given parameter - */ - public $label; - + * @var string proper name for given parameter + */ + public $label; + public $active; /** From 660f02f5a63a95095394263b61c1cec18134fca8 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Wed, 29 Aug 2018 12:35:56 +0200 Subject: [PATCH 30/48] Fix white spaces --- htdocs/core/class/html.formmail.class.php | 83 ++++++++++++----------- 1 file changed, 43 insertions(+), 40 deletions(-) diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php index 5895ce23576..9cd52189991 100644 --- a/htdocs/core/class/html.formmail.class.php +++ b/htdocs/core/class/html.formmail.class.php @@ -1,7 +1,7 @@ - * Copyright (C) 2005-2012 Regis Houssin - * Copyright (C) 2010-2011 Juanjo Menent + * Copyright (C) 2005-2012 Regis Houssin + * Copyright (C) 2010-2011 Juanjo Menent * Copyright (C) 2015-2017 Marcos García * Copyright (C) 2015-2017 Nicolas ZABOURI * @@ -36,54 +36,57 @@ require_once DOL_DOCUMENT_ROOT .'/core/class/html.form.class.php'; class FormMail extends Form { /** - * @var DoliDB Database handler. - */ - public $db; + * @var DoliDB Database handler. + */ + public $db; - var $withform; // 1=Include HTML form tag and show submit button, 0=Do not include form tag and submit button, -1=Do not include form tag but include submit button + public $withform; // 1=Include HTML form tag and show submit button, 0=Do not include form tag and submit button, -1=Do not include form tag but include submit button - var $fromname; - var $frommail; - var $replytoname; - var $replytomail; - var $toname; - var $tomail; - var $trackid; + public $fromname; + public $frommail; + public $replytoname; + public $replytomail; + public $toname; + public $tomail; + public $trackid; + + public $withsubstit; // Show substitution array + public $withfrom; - var $withsubstit; // Show substitution array - var $withfrom; /** * @var int * @deprecated Fill withto with array before calling method. * @see withto */ public $withtosocid; + /** * @var int|int[] */ public $withto; // Show recipient emails - var $withtofree; // Show free text for recipient emails - var $withtocc; - var $withtoccc; - var $withtopic; - var $withfile; // 0=No attaches files, 1=Show attached files, 2=Can add new attached files - var $withmaindocfile; // 1=Add a checkbox "Attach also main document" for mass actions (checked by default), -1=Add checkbox (not checked by default) - var $withbody; - var $withfromreadonly; - var $withreplytoreadonly; - var $withtoreadonly; - var $withtoccreadonly; - var $withtocccreadonly; - var $withtopicreadonly; - var $withfilereadonly; - var $withdeliveryreceipt; - var $withcancel; - var $withfckeditor; + public $withtofree; // Show free text for recipient emails + public $withtocc; + public $withtoccc; + public $withtopic; + public $withfile; // 0=No attaches files, 1=Show attached files, 2=Can add new attached files + public $withmaindocfile; // 1=Add a checkbox "Attach also main document" for mass actions (checked by default), -1=Add checkbox (not checked by default) + public $withbody; - var $substit=array(); - var $substit_lines=array(); - var $param=array(); + public $withfromreadonly; + public $withreplytoreadonly; + public $withtoreadonly; + public $withtoccreadonly; + public $withtocccreadonly; + public $withtopicreadonly; + public $withfilereadonly; + public $withdeliveryreceipt; + public $withcancel; + public $withfckeditor; + + public $substit=array(); + public $substit_lines=array(); + public $param=array(); public $withtouser=array(); public $withtoccuser=array(); @@ -1395,12 +1398,12 @@ class FormMail extends Form class ModelMail { public $id; - + /** - * @var string proper name for given parameter - */ - public $label; - + * @var string proper name for given parameter + */ + public $label; + public $topic; public $content; public $content_lines; From d948c9e2db16122e741b161becb1a3d6e7a2edb7 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Wed, 29 Aug 2018 12:42:55 +0200 Subject: [PATCH 31/48] Fix white spaces --- htdocs/core/modules/import/modules_import.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/htdocs/core/modules/import/modules_import.php b/htdocs/core/modules/import/modules_import.php index 8f17078e4c1..67109446fee 100644 --- a/htdocs/core/modules/import/modules_import.php +++ b/htdocs/core/modules/import/modules_import.php @@ -34,18 +34,21 @@ class ModeleImports * @var DoliDB Database handler. */ public $db; - + public $datatoimport; public $error=''; - public $id; // Id of driver - + /** + * @var int id of driver + */ + public $id; + /** * @var string proper name for given parameter */ public $label; - + public $extension; // Extension of files imported by driver public $version; // Version of driver From 46b00705b330ae9d356aceed573e5171a4c71fdd Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Wed, 29 Aug 2018 12:54:03 +0200 Subject: [PATCH 32/48] Fix white spaces --- htdocs/contrat/class/api_contracts.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/contrat/class/api_contracts.class.php b/htdocs/contrat/class/api_contracts.class.php index a13fdc3e9c3..a89f834cd36 100644 --- a/htdocs/contrat/class/api_contracts.class.php +++ b/htdocs/contrat/class/api_contracts.class.php @@ -55,9 +55,9 @@ class Contracts extends DolibarrApi } /** - * Get properties of a contrat object + * Get properties of a contract object * - * Return an array with contrat informations + * Return an array with contract informations * * @param int $id ID of contract * @return array|mixed data without useless information From b03f4004ea9c7be6b6be672f02e05026f3c803dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 29 Aug 2018 21:25:22 +0200 Subject: [PATCH 33/48] PSR2 FunctionClosingBrace --- dev/setup/codesniffer/ruleset.xml | 3 ++ dev/translation/autotranslator.class.php | 1 - .../actions_adherentcard_default.class.php | 1 - htdocs/adherents/class/adherent.class.php | 2 -- htdocs/admin/tools/eaccelerator.php | 1 - htdocs/api/class/api_access.class.php | 1 - htdocs/blockedlog/class/authority.class.php | 8 ----- htdocs/blockedlog/class/blockedlog.class.php | 4 --- htdocs/bookmarks/class/bookmark.class.php | 1 - htdocs/cashdesk/class/Facturation.class.php | 13 -------- htdocs/comm/action/class/actioncomm.class.php | 2 -- .../action/class/api_agendaevents.class.php | 1 - htdocs/comm/action/class/ical.class.php | 1 - htdocs/comm/mailing/class/mailing.class.php | 1 - .../comm/propal/class/api_proposals.class.php | 1 - htdocs/commande/class/api_orders.class.php | 1 - htdocs/commande/class/commande.class.php | 1 - htdocs/compta/bank/class/account.class.php | 3 -- .../deplacement/class/deplacement.class.php | 1 - .../facture/class/facture-rec.class.php | 1 - htdocs/compta/facture/class/facture.class.php | 1 - .../compta/paiement/class/cpaiement.class.php | 2 -- .../class/bonprelevement.class.php | 3 -- .../class/rejetprelevement.class.php | 3 -- .../sociales/class/cchargesociales.class.php | 2 -- .../sociales/class/chargesociales.class.php | 1 - .../class/paymentsocialcontribution.class.php | 2 -- .../actions_contactcard_default.class.php | 1 - htdocs/contrat/class/api_contracts.class.php | 1 - htdocs/contrat/class/contrat.class.php | 14 ++++----- htdocs/core/boxes/box_clients.php | 1 - htdocs/core/boxes/box_comptes.php | 1 - htdocs/core/boxes/box_factures_fourn_imp.php | 1 - htdocs/core/boxes/box_fournisseurs.php | 1 - htdocs/core/boxes/box_goodcustomers.php | 1 - .../boxes/box_graph_product_distribution.php | 1 - htdocs/core/boxes/box_lastlogin.php | 1 - htdocs/core/boxes/box_members.php | 1 - htdocs/core/boxes/box_project.php | 1 - htdocs/core/boxes/box_services_contracts.php | 1 - htdocs/core/boxes/box_task.php | 1 - htdocs/core/class/CMailFile.class.php | 1 - .../core/class/commondocgenerator.class.php | 1 - htdocs/core/class/commonobject.class.php | 3 -- htdocs/core/class/conf.class.php | 1 - htdocs/core/class/coreobject.class.php | 2 -- htdocs/core/class/doleditor.class.php | 1 - htdocs/core/class/dolreceiptprinter.class.php | 1 - htdocs/core/class/extrafields.class.php | 3 -- htdocs/core/class/html.formfile.class.php | 1 - htdocs/core/class/link.class.php | 1 - htdocs/core/class/rssparser.class.php | 1 - htdocs/core/class/smtps.class.php | 1 - htdocs/core/lib/bank.lib.php | 1 - htdocs/core/lib/date.lib.php | 1 - htdocs/core/lib/files.lib.php | 1 - htdocs/core/lib/functions.lib.php | 1 - htdocs/core/lib/resource.lib.php | 1 - htdocs/core/menus/standard/empty.php | 1 - .../core/modules/bank/doc/pdf_ban.modules.php | 3 -- .../bank/doc/pdf_sepamandate.modules.php | 2 -- .../barcode/mod_barcode_product_standard.php | 1 - .../commande/doc/pdf_einstein.modules.php | 1 - .../modules/dons/html_cerfafr.modules.php | 1 - .../expedition/doc/pdf_rouget.modules.php | 1 - .../doc/pdf_standard.modules.php | 1 - .../modules/export/export_csv.modules.php | 1 - .../modules/facture/doc/pdf_crabe.modules.php | 1 - .../mailings/advthirdparties.modules.php | 1 - .../modules/mailings/thirdparties.modules.php | 1 - .../modules/mailings/xinputuser.modules.php | 1 - htdocs/core/modules/member/modules_cards.php | 2 -- htdocs/core/modules/modAccounting.class.php | 1 - htdocs/core/modules/modAdherent.class.php | 1 - htdocs/core/modules/modAgenda.class.php | 1 - htdocs/core/modules/modBanque.class.php | 1 - htdocs/core/modules/modBookmark.class.php | 1 - htdocs/core/modules/modComptabilite.class.php | 1 - htdocs/core/modules/modDon.class.php | 1 - .../core/modules/modDynamicPrices.class.php | 1 - htdocs/core/modules/modExport.class.php | 1 - htdocs/core/modules/modExternalSite.class.php | 1 - htdocs/core/modules/modFicheinter.class.php | 1 - htdocs/core/modules/modHRM.class.php | 1 - htdocs/core/modules/modImport.class.php | 1 - htdocs/core/modules/modLabel.class.php | 1 - htdocs/core/modules/modLoan.class.php | 1 - htdocs/core/modules/modMailing.class.php | 1 - htdocs/core/modules/modMailmanSpip.class.php | 1 - .../core/modules/modModuleBuilder.class.php | 1 - htdocs/core/modules/modOauth.class.php | 2 -- htdocs/core/modules/modPrelevement.class.php | 1 - htdocs/core/modules/modPrinting.class.php | 2 -- htdocs/core/modules/modProductBatch.class.php | 1 - htdocs/core/modules/modPropale.class.php | 1 - .../core/modules/modReceiptPrinter.class.php | 2 -- htdocs/core/modules/modResource.class.php | 1 - htdocs/core/modules/modStock.class.php | 1 - htdocs/core/modules/modTax.class.php | 1 - htdocs/core/modules/modUser.class.php | 1 - .../modules/printsheet/modules_labels.php | 2 -- .../product/mod_codeproduct_elephant.php | 1 - .../doc/doc_generic_project_odt.modules.php | 1 - .../project/doc/pdf_timespent.modules.php | 1 - .../modules/propale/doc/pdf_azur.modules.php | 1 - .../modules/rapport/pdf_paiement.class.php | 1 - .../generate/modGeneratePassPerso.class.php | 1 - .../societe/mod_codeclient_elephant.php | 1 - .../stock/doc/pdf_standard.modules.php | 1 - .../stock/doc/pdf_stdmovement.modules.php | 1 - .../pdf/pdf_canelle.modules.php | 2 -- .../pdf/pdf_muscadet.modules.php | 1 - .../doc/pdf_standard.modules.php | 2 -- .../doc/pdf_aurore.modules.php | 1 - htdocs/dav/dav.class.php | 1 - htdocs/don/class/don.class.php | 1 - htdocs/don/class/paymentdonation.class.php | 2 -- htdocs/ecm/class/ecmdirectory.class.php | 1 - .../expedition/class/api_shipments.class.php | 1 - htdocs/expedition/class/expedition.class.php | 4 --- .../class/api_expensereports.class.php | 1 - .../class/expensereport.class.php | 3 -- .../class/paymentexpensereport.class.php | 2 -- .../class/api_interventions.class.php | 1 - htdocs/fichinter/class/fichinter.class.php | 1 - htdocs/fourn/class/fournisseur.class.php | 1 - .../fournisseur.commande.dispatch.class.php | 2 -- .../fourn/class/fournisseur.product.class.php | 1 - htdocs/holiday/class/holiday.class.php | 3 -- .../Classes/PHPExcel/Shared/OLERead.php | 1 - .../PHPExcel/Writer/Excel2007/Chart.php | 2 -- htdocs/loan/class/loan.class.php | 1 - .../template/class/api_mymodule.class.php | 1 - .../class/multicurrency.class.php | 1 - htdocs/paypal/lib/paypal.lib.php | 1 - .../product/actions_card_product.class.php | 1 - .../service/actions_card_service.class.php | 1 - .../product/class/html.formproduct.class.php | 3 +- htdocs/product/class/product.class.php | 6 ++-- htdocs/product/class/productbatch.class.php | 2 -- .../class/propalmergepdfproduct.class.php | 2 -- htdocs/product/stock/class/entrepot.class.php | 4 --- .../class/productstockentrepot.class.php | 2 -- htdocs/projet/class/api_projects.class.php | 1 - htdocs/projet/class/api_tasks.class.php | 1 - htdocs/projet/class/project.class.php | 2 -- htdocs/projet/ganttchart.inc.php | 2 -- htdocs/resource/class/dolresource.class.php | 4 --- htdocs/societe/class/address.class.php | 1 - .../societe/class/api_thirdparties.class.php | 1 - htdocs/societe/class/client.class.php | 1 - htdocs/societe/class/societe.class.php | 2 -- htdocs/stripe/class/stripe.class.php | 1 - htdocs/user/class/user.class.php | 5 --- htdocs/user/class/usergroup.class.php | 2 -- htdocs/website/class/website.class.php | 2 -- test/phpunit/ExportTest.php | 31 +++++++++---------- test/phpunit/Functions2LibTest.php | 8 ++--- test/phpunit/FunctionsLibTest.php | 7 ++--- 159 files changed, 32 insertions(+), 269 deletions(-) diff --git a/dev/setup/codesniffer/ruleset.xml b/dev/setup/codesniffer/ruleset.xml index bbe101112d0..fa19bc94372 100644 --- a/dev/setup/codesniffer/ruleset.xml +++ b/dev/setup/codesniffer/ruleset.xml @@ -374,6 +374,9 @@ + + + 0 diff --git a/dev/translation/autotranslator.class.php b/dev/translation/autotranslator.class.php index 47d6a25ec15..0a84bf03b70 100644 --- a/dev/translation/autotranslator.class.php +++ b/dev/translation/autotranslator.class.php @@ -65,7 +65,6 @@ class autoTranslator //ini_set('default_charset','UTF-8'); ini_set('default_charset',$this->_outputpagecode); $this->parse_refLangTranslationFiles(); - } /** diff --git a/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php b/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php index 451f46f899f..a03712daa79 100644 --- a/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php +++ b/htdocs/adherents/canvas/default/actions_adherentcard_default.class.php @@ -117,7 +117,6 @@ class ActionsAdherentCardDefault extends ActionsAdherentCardCommon { $this->LoadListDatas($limit, $offset, $sortfield, $sortorder); } - } diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index bf4fe0d73c2..7a4cc378baf 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -690,7 +690,6 @@ class Adherent extends CommonObject $this->db->rollback(); return -1; } - } /** @@ -2107,7 +2106,6 @@ class Adherent extends CommonObject $this->error=$this->db->error(); return -1; } - } /** diff --git a/htdocs/admin/tools/eaccelerator.php b/htdocs/admin/tools/eaccelerator.php index 9999734a8f8..a3205c11a27 100644 --- a/htdocs/admin/tools/eaccelerator.php +++ b/htdocs/admin/tools/eaccelerator.php @@ -181,7 +181,6 @@ function create_script_table($list) print ''; } print ''; - } /** diff --git a/htdocs/api/class/api_access.class.php b/htdocs/api/class/api_access.class.php index d067d6e2ad6..abd8df94275 100644 --- a/htdocs/api/class/api_access.class.php +++ b/htdocs/api/class/api_access.class.php @@ -196,6 +196,5 @@ class DolibarrApiAccess implements iAuthenticate return $requires ? static::$role == 'admin' || in_array(static::$role, (array) $requires) : true; - } } diff --git a/htdocs/blockedlog/class/authority.class.php b/htdocs/blockedlog/class/authority.class.php index 11bb3aa2d0f..b976857a522 100644 --- a/htdocs/blockedlog/class/authority.class.php +++ b/htdocs/blockedlog/class/authority.class.php @@ -54,7 +54,6 @@ class BlockedLogAuthority { $this->db = $db; - } /** @@ -90,7 +89,6 @@ class BlockedLogAuthority { return md5($this->signature.$this->blockchain); - } /** @@ -103,7 +101,6 @@ class BlockedLogAuthority { return ($hash === $this->getBlockchainHash() ); - } /** @@ -116,7 +113,6 @@ class BlockedLogAuthority { $this->blockchain.=$block; - } /** @@ -197,7 +193,6 @@ class BlockedLogAuthority $this->error=$this->db->error(); return -1; } - } /** @@ -252,7 +247,6 @@ class BlockedLogAuthority $this->db->rollback(); return -1; } - } /** @@ -291,7 +285,6 @@ class BlockedLogAuthority $this->db->rollback(); return -1; } - } /** @@ -340,5 +333,4 @@ class BlockedLogAuthority return 1; } - } diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php index 654709cec6f..59268d15c90 100644 --- a/htdocs/blockedlog/class/blockedlog.class.php +++ b/htdocs/blockedlog/class/blockedlog.class.php @@ -283,7 +283,6 @@ class BlockedLog } return ''.$langs->trans('ImpossibleToReloadObject', $this->element, $this->fk_object).''; - } /** @@ -676,7 +675,6 @@ class BlockedLog $this->error=$this->db->error(); return -1; } - } @@ -716,8 +714,6 @@ class BlockedLog if($res===false) return false; return true; - - } /** diff --git a/htdocs/bookmarks/class/bookmark.class.php b/htdocs/bookmarks/class/bookmark.class.php index 9491b10c267..005e73acad7 100644 --- a/htdocs/bookmarks/class/bookmark.class.php +++ b/htdocs/bookmarks/class/bookmark.class.php @@ -226,7 +226,6 @@ class Bookmark extends CommonObject $this->error=$this->db->lasterror(); return -1; } - } /** diff --git a/htdocs/cashdesk/class/Facturation.class.php b/htdocs/cashdesk/class/Facturation.class.php index ac26a326962..48339044576 100644 --- a/htdocs/cashdesk/class/Facturation.class.php +++ b/htdocs/cashdesk/class/Facturation.class.php @@ -167,7 +167,6 @@ class Facturation $_SESSION['poscart']=$newcartarray; $this->raz(); - } /** @@ -269,7 +268,6 @@ class Facturation $this->prixTotalHt('RESET'); $this->montantTva('RESET'); $this->prixTotalTtc('RESET'); - } @@ -324,7 +322,6 @@ class Facturation { $this->ref = $aRef; } - } /** @@ -348,7 +345,6 @@ class Facturation { $this->qte = $aQte; } - } /** @@ -372,7 +368,6 @@ class Facturation { $this->stock = $aStock; } - } /** @@ -396,7 +391,6 @@ class Facturation { $this->remise_percent = $aRemisePercent; } - } /** @@ -421,7 +415,6 @@ class Facturation $this->montant_remise = $aMontantRemise; } - } /** @@ -446,7 +439,6 @@ class Facturation $this->prix = $aPrix; } - } /** @@ -470,7 +462,6 @@ class Facturation $this->tva = $aTva; } - } /** @@ -518,7 +509,6 @@ class Facturation $this->mode_reglement = $aModeReglement; } - } /** @@ -543,7 +533,6 @@ class Facturation $this->montant_encaisse = $aMontantEncaisse; } - } /** @@ -567,7 +556,6 @@ class Facturation $this->montant_rendu = $aMontantRendu; } - } /** @@ -637,7 +625,6 @@ class Facturation $this->montant_tva = $aMontantTva; } - } /** diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 42c884fa8b3..1adb2da8822 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -437,7 +437,6 @@ class ActionComm extends CommonObject $this->error=$this->db->lasterror(); return -1; } - } /** @@ -648,7 +647,6 @@ class ActionComm extends CommonObject } return $num; - } /** diff --git a/htdocs/comm/action/class/api_agendaevents.class.php b/htdocs/comm/action/class/api_agendaevents.class.php index e5818a9f462..dedc515f61c 100644 --- a/htdocs/comm/action/class/api_agendaevents.class.php +++ b/htdocs/comm/action/class/api_agendaevents.class.php @@ -293,7 +293,6 @@ class AgendaEvents extends DolibarrApi 'message' => 'Agenda Event deleted' ) ); - } /** diff --git a/htdocs/comm/action/class/ical.class.php b/htdocs/comm/action/class/ical.class.php index 708b52c9151..df348e4db51 100644 --- a/htdocs/comm/action/class/ical.class.php +++ b/htdocs/comm/action/class/ical.class.php @@ -44,7 +44,6 @@ class ICal */ public function __construct() { - } /** diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php index 1078ea84c94..506a2e99f31 100644 --- a/htdocs/comm/mailing/class/mailing.class.php +++ b/htdocs/comm/mailing/class/mailing.class.php @@ -93,7 +93,6 @@ class Mailing extends CommonObject $this->statut_dest[1] = 'MailingStatusSent'; $this->statut_dest[2] = 'MailingStatusRead'; $this->statut_dest[3] = 'MailingStatusReadAndUnsubscribe'; // Read but ask to not be contacted anymore - } /** diff --git a/htdocs/comm/propal/class/api_proposals.class.php b/htdocs/comm/propal/class/api_proposals.class.php index 0313add9cae..fc721912462 100644 --- a/htdocs/comm/propal/class/api_proposals.class.php +++ b/htdocs/comm/propal/class/api_proposals.class.php @@ -491,7 +491,6 @@ class Proposals extends DolibarrApi 'message' => 'Commercial Proposal deleted' ) ); - } /** diff --git a/htdocs/commande/class/api_orders.class.php b/htdocs/commande/class/api_orders.class.php index c0266d76d70..60011592afe 100644 --- a/htdocs/commande/class/api_orders.class.php +++ b/htdocs/commande/class/api_orders.class.php @@ -473,7 +473,6 @@ class Orders extends DolibarrApi 'message' => 'Order deleted' ) ); - } /** diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 2a7be254fd8..c392684d967 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -3411,7 +3411,6 @@ class Commande extends CommonOrder if ($statut==self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return ''.$langs->trans('StatusOrderProcessed').$billedtext.' '.img_picto($langs->trans('StatusOrderProcessed').$billedtext,'statut6'); if ($statut==self::STATUS_CLOSED && (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return ''.$langs->trans('StatusOrderDelivered').' '.img_picto($langs->trans('StatusOrderDelivered'),'statut6'); } - } diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php index 46c3e168a1b..405237a98fa 100644 --- a/htdocs/compta/bank/class/account.class.php +++ b/htdocs/compta/bank/class/account.class.php @@ -1170,7 +1170,6 @@ class Account extends CommonObject } return $solde; - } /** @@ -1513,7 +1512,6 @@ class Account extends CommonObject */ function info($id) { - } /** @@ -1558,7 +1556,6 @@ class Account extends CommonObject //Get the order the properties are shown return $fieldarray; - } /** diff --git a/htdocs/compta/deplacement/class/deplacement.class.php b/htdocs/compta/deplacement/class/deplacement.class.php index d9172219abe..9304ac75b87 100644 --- a/htdocs/compta/deplacement/class/deplacement.class.php +++ b/htdocs/compta/deplacement/class/deplacement.class.php @@ -154,7 +154,6 @@ class Deplacement extends CommonObject $this->db->rollback(); return -1; } - } /** diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php index 59966827ae5..03fbb9086b1 100644 --- a/htdocs/compta/facture/class/facture-rec.class.php +++ b/htdocs/compta/facture/class/facture-rec.class.php @@ -1858,7 +1858,6 @@ class FactureLigneRec extends CommonInvoiceLine $this->db->rollback(); return -2; } - } } diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 5e5eca7337f..7b743ad0b36 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -1551,7 +1551,6 @@ class Facture extends CommonInvoice } } } - } /** diff --git a/htdocs/compta/paiement/class/cpaiement.class.php b/htdocs/compta/paiement/class/cpaiement.class.php index 1919b5fa94c..1c10e78c1b7 100644 --- a/htdocs/compta/paiement/class/cpaiement.class.php +++ b/htdocs/compta/paiement/class/cpaiement.class.php @@ -369,8 +369,6 @@ class Cpaiement $this->active = ''; $this->accountancy_code = ''; $this->module = ''; - - } } diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php index 76224451c0a..b041c6acab7 100644 --- a/htdocs/compta/prelevement/class/bonprelevement.class.php +++ b/htdocs/compta/prelevement/class/bonprelevement.class.php @@ -164,7 +164,6 @@ class BonPrelevement extends CommonObject } return $result; - } /** @@ -1457,7 +1456,6 @@ class BonPrelevement extends CommonObject if (! empty($conf->global->MAIN_UMASK)) @chmod($this->file, octdec($conf->global->MAIN_UMASK)); return $result; - } @@ -1687,7 +1685,6 @@ class BonPrelevement extends CommonObject fputs($this->file, substr(" ",0,5)); fputs($this->file, "\n"); - } /** diff --git a/htdocs/compta/prelevement/class/rejetprelevement.class.php b/htdocs/compta/prelevement/class/rejetprelevement.class.php index 606208b5193..75c67146d6d 100644 --- a/htdocs/compta/prelevement/class/rejetprelevement.class.php +++ b/htdocs/compta/prelevement/class/rejetprelevement.class.php @@ -69,7 +69,6 @@ class RejetPrelevement $this->facturer[0]=$langs->trans("NoInvoiceRefused"); $this->facturer[1]=$langs->trans("InvoiceRefused"); - } /** @@ -198,7 +197,6 @@ class RejetPrelevement dol_syslog("RejetPrelevement::Create Rollback"); $this->db->rollback(); } - } /** @@ -327,7 +325,6 @@ class RejetPrelevement } return $arr; - } /** diff --git a/htdocs/compta/sociales/class/cchargesociales.class.php b/htdocs/compta/sociales/class/cchargesociales.class.php index de382423cc5..aab637a693c 100644 --- a/htdocs/compta/sociales/class/cchargesociales.class.php +++ b/htdocs/compta/sociales/class/cchargesociales.class.php @@ -523,8 +523,6 @@ class Cchargesociales $this->fk_pays = ''; $this->module = ''; $this->accountancy_code = ''; - - } } diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php index 229cbef2442..41d91235150 100644 --- a/htdocs/compta/sociales/class/chargesociales.class.php +++ b/htdocs/compta/sociales/class/chargesociales.class.php @@ -289,7 +289,6 @@ class ChargeSociales extends CommonObject $this->db->rollback(); return -1; } - } diff --git a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php index b61132ee145..1c80161736c 100644 --- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php +++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php @@ -501,8 +501,6 @@ class PaymentSocialContribution extends CommonObject $this->fk_bank=''; $this->fk_user_creat=''; $this->fk_user_modif=''; - - } diff --git a/htdocs/contact/canvas/default/actions_contactcard_default.class.php b/htdocs/contact/canvas/default/actions_contactcard_default.class.php index bfcb5a21142..01007d28aa8 100644 --- a/htdocs/contact/canvas/default/actions_contactcard_default.class.php +++ b/htdocs/contact/canvas/default/actions_contactcard_default.class.php @@ -116,7 +116,6 @@ class ActionsContactCardDefault extends ActionsContactCardCommon { $this->LoadListDatas($limit, $offset, $sortfield, $sortorder); } - } diff --git a/htdocs/contrat/class/api_contracts.class.php b/htdocs/contrat/class/api_contracts.class.php index 8c206554ee1..1a3d90e9662 100644 --- a/htdocs/contrat/class/api_contracts.class.php +++ b/htdocs/contrat/class/api_contracts.class.php @@ -537,7 +537,6 @@ class Contracts extends DolibarrApi 'message' => 'Contract deleted' ) ); - } /** diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php index 537d18245fd..7fd4d923bc1 100644 --- a/htdocs/contrat/class/contrat.class.php +++ b/htdocs/contrat/class/contrat.class.php @@ -45,22 +45,22 @@ class Contrat extends CommonObject * @var string ID to identify managed object */ public $element='contrat'; - + /** * @var string Name of table without prefix where object is stored */ public $table_element='contrat'; - + public $table_element_line='contratdet'; public $fk_element='fk_contrat'; public $picto='contract'; - + /** * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe * @var int */ public $ismultientitymanaged = 1; - + /** * 0=Default, 1=View may be restricted to sales representative only if no permission to see all or to company of external user if external user * @var integer @@ -520,7 +520,6 @@ class Contrat extends CommonObject $this->db->rollback(); return -1; } - } /** @@ -699,7 +698,6 @@ class Contrat extends CommonObject $this->error=$this->db->error(); return -1; } - } /** @@ -2465,7 +2463,7 @@ class ContratLigne extends CommonObjectLine * @var string ID to identify managed object */ public $element='contratdet'; - + /** * @var string Name of table without prefix where object is stored */ @@ -2475,7 +2473,7 @@ class ContratLigne extends CommonObjectLine * @var int ID */ public $id; - + var $ref; var $tms; diff --git a/htdocs/core/boxes/box_clients.php b/htdocs/core/boxes/box_clients.php index fc31baee716..a3383370e40 100644 --- a/htdocs/core/boxes/box_clients.php +++ b/htdocs/core/boxes/box_clients.php @@ -163,7 +163,6 @@ class box_clients extends ModeleBoxes 'text' => $langs->trans("ReadPermissionNotAllowed") ); } - } /** diff --git a/htdocs/core/boxes/box_comptes.php b/htdocs/core/boxes/box_comptes.php index b951e0fe79b..5e0582fd49c 100644 --- a/htdocs/core/boxes/box_comptes.php +++ b/htdocs/core/boxes/box_comptes.php @@ -174,7 +174,6 @@ class box_comptes extends ModeleBoxes 'text' => $langs->trans("ReadPermissionNotAllowed") ); } - } /** diff --git a/htdocs/core/boxes/box_factures_fourn_imp.php b/htdocs/core/boxes/box_factures_fourn_imp.php index 9f696eac2b9..75561643526 100644 --- a/htdocs/core/boxes/box_factures_fourn_imp.php +++ b/htdocs/core/boxes/box_factures_fourn_imp.php @@ -191,7 +191,6 @@ class box_factures_fourn_imp extends ModeleBoxes 'text' => $langs->trans("ReadPermissionNotAllowed") ); } - } /** diff --git a/htdocs/core/boxes/box_fournisseurs.php b/htdocs/core/boxes/box_fournisseurs.php index 1bfd7d7ac16..6878c1780a5 100644 --- a/htdocs/core/boxes/box_fournisseurs.php +++ b/htdocs/core/boxes/box_fournisseurs.php @@ -150,7 +150,6 @@ class box_fournisseurs extends ModeleBoxes 'text' => $langs->trans("ReadPermissionNotAllowed") ); } - } /** diff --git a/htdocs/core/boxes/box_goodcustomers.php b/htdocs/core/boxes/box_goodcustomers.php index 334cbc0fc56..16668987a40 100644 --- a/htdocs/core/boxes/box_goodcustomers.php +++ b/htdocs/core/boxes/box_goodcustomers.php @@ -159,7 +159,6 @@ class box_goodcustomers extends ModeleBoxes 'text' => $langs->trans("ReadPermissionNotAllowed") ); } - } /** diff --git a/htdocs/core/boxes/box_graph_product_distribution.php b/htdocs/core/boxes/box_graph_product_distribution.php index 9ed59422466..66c3bf1145a 100644 --- a/htdocs/core/boxes/box_graph_product_distribution.php +++ b/htdocs/core/boxes/box_graph_product_distribution.php @@ -401,7 +401,6 @@ class box_graph_product_distribution extends ModeleBoxes 'text' => $mesg ); } - } /** diff --git a/htdocs/core/boxes/box_lastlogin.php b/htdocs/core/boxes/box_lastlogin.php index 38745616aa4..c8149c6384b 100644 --- a/htdocs/core/boxes/box_lastlogin.php +++ b/htdocs/core/boxes/box_lastlogin.php @@ -98,7 +98,6 @@ class box_lastlogin extends ModeleBoxes 'td' => '', 'text' => $tmp, ); - } diff --git a/htdocs/core/boxes/box_members.php b/htdocs/core/boxes/box_members.php index 063a7390808..3b556e6d5db 100644 --- a/htdocs/core/boxes/box_members.php +++ b/htdocs/core/boxes/box_members.php @@ -168,7 +168,6 @@ class box_members extends ModeleBoxes 'text' => $langs->trans("ReadPermissionNotAllowed") ); } - } /** diff --git a/htdocs/core/boxes/box_project.php b/htdocs/core/boxes/box_project.php index 6c959deb303..cb45c12351e 100644 --- a/htdocs/core/boxes/box_project.php +++ b/htdocs/core/boxes/box_project.php @@ -184,7 +184,6 @@ class box_project extends ModeleBoxes 'td' => '', 'text' => " ", ); - } /** diff --git a/htdocs/core/boxes/box_services_contracts.php b/htdocs/core/boxes/box_services_contracts.php index 38532ca3d2f..87cf179daaf 100644 --- a/htdocs/core/boxes/box_services_contracts.php +++ b/htdocs/core/boxes/box_services_contracts.php @@ -222,7 +222,6 @@ class box_services_contracts extends ModeleBoxes 'text' => $langs->trans("ReadPermissionNotAllowed") ); } - } /** diff --git a/htdocs/core/boxes/box_task.php b/htdocs/core/boxes/box_task.php index 7d40ee8482d..9625cfa1bea 100644 --- a/htdocs/core/boxes/box_task.php +++ b/htdocs/core/boxes/box_task.php @@ -137,7 +137,6 @@ class box_task extends ModeleBoxes $this->info_box_contents[$i][] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totalplannedtot,'all',25200,5)); $this->info_box_contents[$i][] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totaldurationtot,'all',25200,5)); $this->info_box_contents[$i][] = array('td' => '', 'text' => ""); - } /** diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php index f5382a91550..51f2ae671ef 100644 --- a/htdocs/core/class/CMailFile.class.php +++ b/htdocs/core/class/CMailFile.class.php @@ -471,7 +471,6 @@ class CMailFile // -------------------------------------- $this->error = 'Bad value for sendmode'; } - } diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php index 8f3f763f0b2..c0ac94461e0 100644 --- a/htdocs/core/class/commondocgenerator.class.php +++ b/htdocs/core/class/commondocgenerator.class.php @@ -767,7 +767,6 @@ abstract class CommonDocGenerator } return $array_to_fill; - } diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 1b9e9c73224..111ae066821 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -1063,7 +1063,6 @@ abstract class CommonObject dol_print_error($this->db); return -1; } - } /** @@ -2026,7 +2025,6 @@ abstract class CommonObject $this->db->commit(); return 1; } - } @@ -4622,7 +4620,6 @@ abstract class CommonObject if (isset($conf->global->$keyforfieldname)) return $conf->global->$keyforfieldname; // TODO Ad here a scan into table llx_overwrite_default with a filter on $this->element and $fieldname - } diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index c86051d7088..34b2fd97c55 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -666,7 +666,6 @@ class Conf $this->loghandlers[$handler] = $loghandlerinstance; } } - } } diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php index fbd7b7b1448..215ad36ba60 100644 --- a/htdocs/core/class/coreobject.class.php +++ b/htdocs/core/class/coreobject.class.php @@ -75,7 +75,6 @@ class CoreObject extends CommonObject { return false; } - } /** @@ -271,7 +270,6 @@ class CoreObject extends CommonObject $this->db->rollback(); return -1; } - } /** diff --git a/htdocs/core/class/doleditor.class.php b/htdocs/core/class/doleditor.class.php index 860d89afea8..98fed20a691 100644 --- a/htdocs/core/class/doleditor.class.php +++ b/htdocs/core/class/doleditor.class.php @@ -135,7 +135,6 @@ class DolEditor $this->height = $height; $this->width = $width; } - } /** diff --git a/htdocs/core/class/dolreceiptprinter.class.php b/htdocs/core/class/dolreceiptprinter.class.php index eb40e974ca9..57f2e42922c 100644 --- a/htdocs/core/class/dolreceiptprinter.class.php +++ b/htdocs/core/class/dolreceiptprinter.class.php @@ -204,7 +204,6 @@ class dolReceiptPrinter extends Escpos 'dol_print_if_customer_tax_number', 'dol_print_if_customer_account_balance_positive', ); - } /** diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php index 2d0398dae16..06a096337ba 100644 --- a/htdocs/core/class/extrafields.class.php +++ b/htdocs/core/class/extrafields.class.php @@ -460,7 +460,6 @@ class ExtraFields { return 0; } - } /** @@ -500,7 +499,6 @@ class ExtraFields { return 0; } - } /** @@ -610,7 +608,6 @@ class ExtraFields { return 0; } - } /** diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index 15e22944d83..8d550a922b4 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -1658,7 +1658,6 @@ class FormFile // Include template include DOL_DOCUMENT_ROOT.'/core/tpl/ajax/fileupload_view.tpl.php'; - } /** diff --git a/htdocs/core/class/link.class.php b/htdocs/core/class/link.class.php index 0d695baaf8d..fd3616a9414 100644 --- a/htdocs/core/class/link.class.php +++ b/htdocs/core/class/link.class.php @@ -385,7 +385,6 @@ class Link extends CommonObject $this->db->rollback(); return -1; } - } } diff --git a/htdocs/core/class/rssparser.class.php b/htdocs/core/class/rssparser.class.php index 34738c09bf7..587575ccd49 100644 --- a/htdocs/core/class/rssparser.class.php +++ b/htdocs/core/class/rssparser.class.php @@ -786,6 +786,5 @@ function xml2php($xml) } return $array; - } diff --git a/htdocs/core/class/smtps.class.php b/htdocs/core/class/smtps.class.php index c18e2232c01..ea7d5a769fa 100644 --- a/htdocs/core/class/smtps.class.php +++ b/htdocs/core/class/smtps.class.php @@ -1165,7 +1165,6 @@ class SMTPs $this->_setErr(102, 'eMail type not defined.'); return false; } - } /** diff --git a/htdocs/core/lib/bank.lib.php b/htdocs/core/lib/bank.lib.php index 3116d85287a..ded980e3246 100644 --- a/htdocs/core/lib/bank.lib.php +++ b/htdocs/core/lib/bank.lib.php @@ -215,7 +215,6 @@ function checkSwiftForAccount($account) } else { return false; } - } /** diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php index 084c06a08e1..1b10f6d4233 100644 --- a/htdocs/core/lib/date.lib.php +++ b/htdocs/core/lib/date.lib.php @@ -439,7 +439,6 @@ function dol_get_next_week($day, $week, $month, $year) $tmparray=dol_getdate($time,true); return array('year' => $tmparray['year'], 'month' => $tmparray['mon'], 'day' => $tmparray['mday']); - } /** Return GMT time for first day of a month or year diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php index a7001d357b8..feb41f5dffd 100644 --- a/htdocs/core/lib/files.lib.php +++ b/htdocs/core/lib/files.lib.php @@ -651,7 +651,6 @@ function dolReplaceInFile($srcfile, $arrayreplacement, $destfile='', $newmask=0, function dolReplaceRegExInFile($srcfile, $arrayreplacement, $destfile='', $newmask=0, $indexdatabase=0) { // TODO - } /** diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 8a06a0d7764..412b1427f46 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -4859,7 +4859,6 @@ function get_localtax_by_third($local) } return 0; - } diff --git a/htdocs/core/lib/resource.lib.php b/htdocs/core/lib/resource.lib.php index bf586b83f88..6dcc7825153 100644 --- a/htdocs/core/lib/resource.lib.php +++ b/htdocs/core/lib/resource.lib.php @@ -114,5 +114,4 @@ function resource_admin_prepare_head() complete_head_from_modules($conf,$langs,null,$head,$h,'resource_admin','remove'); return $head; - } diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php index a9d8e2f9a41..172b6c483c5 100644 --- a/htdocs/core/menus/standard/empty.php +++ b/htdocs/core/menus/standard/empty.php @@ -57,7 +57,6 @@ class MenuManager */ function loadMenu() { - } diff --git a/htdocs/core/modules/bank/doc/pdf_ban.modules.php b/htdocs/core/modules/bank/doc/pdf_ban.modules.php index 710d996757c..8b1a9d165ef 100644 --- a/htdocs/core/modules/bank/doc/pdf_ban.modules.php +++ b/htdocs/core/modules/bank/doc/pdf_ban.modules.php @@ -280,8 +280,6 @@ class pdf_ban extends ModeleBankAccountDoc global $conf,$mysoc; $default_font_size = pdf_getPDFFontSize($outputlangs); - - } /** @@ -368,7 +366,6 @@ class pdf_ban extends ModeleBankAccountDoc } } */ - } /** diff --git a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php index 2061b03d2ae..5ec25f994df 100644 --- a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php +++ b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php @@ -423,7 +423,6 @@ class pdf_sepamandate extends ModeleBankAccountDoc global $conf,$mysoc; $default_font_size = pdf_getPDFFontSize($outputlangs); - } @@ -592,7 +591,6 @@ class pdf_sepamandate extends ModeleBankAccountDoc } } */ - } /** diff --git a/htdocs/core/modules/barcode/mod_barcode_product_standard.php b/htdocs/core/modules/barcode/mod_barcode_product_standard.php index 3e233eb1843..f494219c445 100644 --- a/htdocs/core/modules/barcode/mod_barcode_product_standard.php +++ b/htdocs/core/modules/barcode/mod_barcode_product_standard.php @@ -253,7 +253,6 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode { return -2; } - } /** diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php index c3a5d143c48..224688b9982 100644 --- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php +++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php @@ -654,7 +654,6 @@ class pdf_einstein extends ModelePDFCommandes */ function _tableau_versements(&$pdf, $object, $posy, $outputlangs) { - } diff --git a/htdocs/core/modules/dons/html_cerfafr.modules.php b/htdocs/core/modules/dons/html_cerfafr.modules.php index c9d2b4984ad..a8334e050c7 100644 --- a/htdocs/core/modules/dons/html_cerfafr.modules.php +++ b/htdocs/core/modules/dons/html_cerfafr.modules.php @@ -424,5 +424,4 @@ $chif2=array('', 'dix', 'vingt', 'trente', 'quarante', 'cinquante', 'soixante', return $somme. ' et zéro '. $dev2; else return $somme. $trio_c. ' ' .$secon_c. ' ' . $dev2; - } diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php index 84a9831223b..af534ec1571 100644 --- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php +++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php @@ -832,7 +832,6 @@ class pdf_rouget extends ModelePdfExpedition } } - } /** diff --git a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php index 2d6a8850ed8..e974f72fabd 100644 --- a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php +++ b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php @@ -776,7 +776,6 @@ class pdf_standard extends ModeleExpenseReport } } } - } /** diff --git a/htdocs/core/modules/export/export_csv.modules.php b/htdocs/core/modules/export/export_csv.modules.php index 10014eb6d6c..77f754a504b 100644 --- a/htdocs/core/modules/export/export_csv.modules.php +++ b/htdocs/core/modules/export/export_csv.modules.php @@ -76,7 +76,6 @@ class ExportCsv extends ModeleExports // If driver use an external library, put its name here $this->label_lib='Dolibarr'; $this->version_lib=DOL_VERSION; - } /** diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php index 7eb5abe1e5c..3762cfc2d0a 100644 --- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php @@ -910,7 +910,6 @@ class pdf_crabe extends ModelePDFFactures $this->error=$this->db->lasterror(); return -1; } - } diff --git a/htdocs/core/modules/mailings/advthirdparties.modules.php b/htdocs/core/modules/mailings/advthirdparties.modules.php index 08249104909..53ca23a9880 100644 --- a/htdocs/core/modules/mailings/advthirdparties.modules.php +++ b/htdocs/core/modules/mailings/advthirdparties.modules.php @@ -277,7 +277,6 @@ class mailing_advthirdparties extends MailingTargets $s.=''; return $s; - } diff --git a/htdocs/core/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php index f7a2ed5bc3c..523f26290b7 100644 --- a/htdocs/core/modules/mailings/thirdparties.modules.php +++ b/htdocs/core/modules/mailings/thirdparties.modules.php @@ -309,7 +309,6 @@ class mailing_thirdparties extends MailingTargets $s.=''; $s.=''; return $s; - } diff --git a/htdocs/core/modules/mailings/xinputuser.modules.php b/htdocs/core/modules/mailings/xinputuser.modules.php index 794de3d9294..f733f6de134 100644 --- a/htdocs/core/modules/mailings/xinputuser.modules.php +++ b/htdocs/core/modules/mailings/xinputuser.modules.php @@ -157,7 +157,6 @@ class mailing_xinputuser extends MailingTargets $this->error = $langs->trans("ErrorBadEmail",$email); return -1; } - } } diff --git a/htdocs/core/modules/member/modules_cards.php b/htdocs/core/modules/member/modules_cards.php index 4e3e1a2dac4..9c277df6108 100644 --- a/htdocs/core/modules/member/modules_cards.php +++ b/htdocs/core/modules/member/modules_cards.php @@ -163,7 +163,5 @@ function members_card_pdf_create($db, $arrayofmembers, $modele, $outputlangs, $o dol_print_error('',$langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file)); return -1; } - - } diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php index ba56042ec61..8aef56a4e57 100644 --- a/htdocs/core/modules/modAccounting.class.php +++ b/htdocs/core/modules/modAccounting.class.php @@ -287,6 +287,5 @@ class modAccounting extends DolibarrModules 'aa.account_parent'=>array('rule'=>'zeroifnull'), ); $this->import_examplevalues_array[$r]=array('aa.fk_pcg_version'=>"PCG99-ABREGE",'aa.account_number'=>"707",'aa.label'=>"Product sales",'aa.account_parent'=>"1407","aa.fk_accounting_category"=>"","aa.pcg_type"=>"PROD",'aa.pcg_subtype'=>'PRODUCT','aa.active'=>'1','aa.datec'=>"2017-04-28"); - } } diff --git a/htdocs/core/modules/modAdherent.class.php b/htdocs/core/modules/modAdherent.class.php index de84c653060..4c22f4b31b4 100644 --- a/htdocs/core/modules/modAdherent.class.php +++ b/htdocs/core/modules/modAdherent.class.php @@ -362,7 +362,6 @@ class modAdherent extends DolibarrModules 'test'=>true, ), ); - } diff --git a/htdocs/core/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php index d5620d6805b..405e60c0190 100644 --- a/htdocs/core/modules/modAgenda.class.php +++ b/htdocs/core/modules/modAgenda.class.php @@ -419,7 +419,6 @@ class modAgenda extends DolibarrModules if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .=' AND (sc.fk_user = '.(empty($user)?0:$user->id).' OR ac.fk_soc IS NULL)'; if (empty($user->rights->agenda->allactions->read)) $this->export_sql_end[$r] .=' AND acr.fk_element = '.(empty($user)?0:$user->id); $this->export_sql_end[$r] .=' ORDER BY ac.datep'; - } } diff --git a/htdocs/core/modules/modBanque.class.php b/htdocs/core/modules/modBanque.class.php index 602085b9f5a..3ca1a082580 100644 --- a/htdocs/core/modules/modBanque.class.php +++ b/htdocs/core/modules/modBanque.class.php @@ -199,7 +199,6 @@ class modBanque extends DolibarrModules $this->export_sql_end[$r] .=' AND p.fk_paiement = 7'; $this->export_sql_end[$r] .=' AND ba.entity IN ('.getEntity('bank_account').')'; $this->export_sql_order[$r] =' ORDER BY b.datev, b.num_releve'; - } diff --git a/htdocs/core/modules/modBookmark.class.php b/htdocs/core/modules/modBookmark.class.php index 191e12bc2eb..db844393cd0 100644 --- a/htdocs/core/modules/modBookmark.class.php +++ b/htdocs/core/modules/modBookmark.class.php @@ -101,6 +101,5 @@ class modBookmark extends DolibarrModules // Menus //------- $this->menu = 1; // This module add menu entries. They are coded into menu manager. - } } diff --git a/htdocs/core/modules/modComptabilite.class.php b/htdocs/core/modules/modComptabilite.class.php index 41349d214fc..3c523a61ab4 100644 --- a/htdocs/core/modules/modComptabilite.class.php +++ b/htdocs/core/modules/modComptabilite.class.php @@ -98,7 +98,6 @@ class modComptabilite extends DolibarrModules // Menus //------- $this->menu = 1; // This module add menu entries. They are coded into menu manager. - } diff --git a/htdocs/core/modules/modDon.class.php b/htdocs/core/modules/modDon.class.php index dacfad736bf..76bdb2ccb63 100644 --- a/htdocs/core/modules/modDon.class.php +++ b/htdocs/core/modules/modDon.class.php @@ -140,7 +140,6 @@ class modDon extends DolibarrModules // Menus //------- $this->menu = 1; // This module add menu entries. They are coded into menu manager. - } diff --git a/htdocs/core/modules/modDynamicPrices.class.php b/htdocs/core/modules/modDynamicPrices.class.php index c7bc152ff64..a164bec953c 100644 --- a/htdocs/core/modules/modDynamicPrices.class.php +++ b/htdocs/core/modules/modDynamicPrices.class.php @@ -82,6 +82,5 @@ class modDynamicPrices extends DolibarrModules $this->rights = array(); $this->rights_class = 'dynamicprices'; $r=0; - } } diff --git a/htdocs/core/modules/modExport.class.php b/htdocs/core/modules/modExport.class.php index b88438f5fe1..9b0d2e42a45 100644 --- a/htdocs/core/modules/modExport.class.php +++ b/htdocs/core/modules/modExport.class.php @@ -94,6 +94,5 @@ class modExport extends DolibarrModules // Menus //------- $this->menu = 1; // This module add menu entries. They are coded into menu manager. - } } diff --git a/htdocs/core/modules/modExternalSite.class.php b/htdocs/core/modules/modExternalSite.class.php index 18bb0b000b2..374e9b2f02a 100644 --- a/htdocs/core/modules/modExternalSite.class.php +++ b/htdocs/core/modules/modExternalSite.class.php @@ -113,7 +113,6 @@ class modExternalSite extends DolibarrModules 'user'=>0 ); $r++; - } } diff --git a/htdocs/core/modules/modFicheinter.class.php b/htdocs/core/modules/modFicheinter.class.php index 7db2ac45e30..d30da2d3664 100644 --- a/htdocs/core/modules/modFicheinter.class.php +++ b/htdocs/core/modules/modFicheinter.class.php @@ -196,7 +196,6 @@ class modFicheinter extends DolibarrModules $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid'; $this->export_sql_end[$r] .=' AND f.entity IN ('.getEntity('intervention').')'; $r++; - } diff --git a/htdocs/core/modules/modHRM.class.php b/htdocs/core/modules/modHRM.class.php index d713b4edc4a..5da8cf74e71 100644 --- a/htdocs/core/modules/modHRM.class.php +++ b/htdocs/core/modules/modHRM.class.php @@ -120,7 +120,6 @@ class modHRM extends DolibarrModules // Menus //------- $this->menu = 1; // This module add menu entries. They are coded into menu manager. - } /** diff --git a/htdocs/core/modules/modImport.class.php b/htdocs/core/modules/modImport.class.php index ffaac0bf29e..42bbc07c616 100644 --- a/htdocs/core/modules/modImport.class.php +++ b/htdocs/core/modules/modImport.class.php @@ -91,6 +91,5 @@ class modImport extends DolibarrModules // Menus //------- $this->menu = 1; // This module add menu entries. They are coded into menu manager. - } } diff --git a/htdocs/core/modules/modLabel.class.php b/htdocs/core/modules/modLabel.class.php index 563dddca3cc..915b9e732a1 100644 --- a/htdocs/core/modules/modLabel.class.php +++ b/htdocs/core/modules/modLabel.class.php @@ -90,7 +90,6 @@ class modLabel extends DolibarrModules $this->rights[4][1] = 'Supprimer les etiquettes'; // libelle de la permission $this->rights[4][3] = 0; // La permission est-elle une permission par defaut $this->rights[4][4] = 'supprimer'; - } /** diff --git a/htdocs/core/modules/modLoan.class.php b/htdocs/core/modules/modLoan.class.php index 70386a1647a..662ded1da21 100644 --- a/htdocs/core/modules/modLoan.class.php +++ b/htdocs/core/modules/modLoan.class.php @@ -145,7 +145,6 @@ class modLoan extends DolibarrModules // Exports //-------- $r=0; - } diff --git a/htdocs/core/modules/modMailing.class.php b/htdocs/core/modules/modMailing.class.php index 062b9113e76..749369ee8e9 100644 --- a/htdocs/core/modules/modMailing.class.php +++ b/htdocs/core/modules/modMailing.class.php @@ -133,7 +133,6 @@ class modMailing extends DolibarrModules // Menus //------- $this->menu = 1; // This module add menu entries. They are coded into menu manager. - } diff --git a/htdocs/core/modules/modMailmanSpip.class.php b/htdocs/core/modules/modMailmanSpip.class.php index 8403147fd74..e1a8f7c2cd6 100644 --- a/htdocs/core/modules/modMailmanSpip.class.php +++ b/htdocs/core/modules/modMailmanSpip.class.php @@ -83,6 +83,5 @@ class modMailmanSpip extends DolibarrModules // Menus //------- $this->menu = 1; // This module add menu entries. They are coded into menu manager. - } } diff --git a/htdocs/core/modules/modModuleBuilder.class.php b/htdocs/core/modules/modModuleBuilder.class.php index 3f106de6c78..b27a03cc798 100644 --- a/htdocs/core/modules/modModuleBuilder.class.php +++ b/htdocs/core/modules/modModuleBuilder.class.php @@ -98,6 +98,5 @@ class modModuleBuilder extends DolibarrModules 'enabled'=>'$conf->modulebuilder->enabled && preg_match(\'/^(admintools|all)/\',$leftmenu) && ($user->admin || $conf->global->MODULEBUILDER_FOREVERYONE)', 'target'=>'_modulebuilder', 'user'=>0); - } } diff --git a/htdocs/core/modules/modOauth.class.php b/htdocs/core/modules/modOauth.class.php index 74689230525..674b7c88fe7 100644 --- a/htdocs/core/modules/modOauth.class.php +++ b/htdocs/core/modules/modOauth.class.php @@ -119,8 +119,6 @@ class modOauth extends DolibarrModules // 'user'=>0); // 0=Menu for internal users, 1=external users, 2=both //$r++; - - } diff --git a/htdocs/core/modules/modPrelevement.class.php b/htdocs/core/modules/modPrelevement.class.php index cc74273d29c..afa7ac3abb8 100644 --- a/htdocs/core/modules/modPrelevement.class.php +++ b/htdocs/core/modules/modPrelevement.class.php @@ -135,7 +135,6 @@ class modPrelevement extends DolibarrModules // Menus //------- $this->menu = 1; // This module add menu entries. They are coded into menu manager. - } diff --git a/htdocs/core/modules/modPrinting.class.php b/htdocs/core/modules/modPrinting.class.php index ea086e2dbbe..d66e8d21d6f 100644 --- a/htdocs/core/modules/modPrinting.class.php +++ b/htdocs/core/modules/modPrinting.class.php @@ -117,7 +117,5 @@ class modPrinting extends DolibarrModules 'user'=>0); // 0=Menu for internal users, 1=external users, 2=both $r++; - - } } diff --git a/htdocs/core/modules/modProductBatch.class.php b/htdocs/core/modules/modProductBatch.class.php index ac968233772..dd5fa032394 100644 --- a/htdocs/core/modules/modProductBatch.class.php +++ b/htdocs/core/modules/modProductBatch.class.php @@ -104,7 +104,6 @@ class modProductBatch extends DolibarrModules // Exports $r=0; - } /** diff --git a/htdocs/core/modules/modPropale.class.php b/htdocs/core/modules/modPropale.class.php index 5b3b2fdd4d8..68f3a222e96 100644 --- a/htdocs/core/modules/modPropale.class.php +++ b/htdocs/core/modules/modPropale.class.php @@ -283,6 +283,5 @@ class modPropale extends DolibarrModules ); return $this->_init($sql,$options); - } } diff --git a/htdocs/core/modules/modReceiptPrinter.class.php b/htdocs/core/modules/modReceiptPrinter.class.php index b2ed975a404..1622b2a8766 100644 --- a/htdocs/core/modules/modReceiptPrinter.class.php +++ b/htdocs/core/modules/modReceiptPrinter.class.php @@ -119,8 +119,6 @@ class modReceiptPrinter extends DolibarrModules // 'user'=>0); // 0=Menu for internal users, 1=external users, 2=both $r++; - - } diff --git a/htdocs/core/modules/modResource.class.php b/htdocs/core/modules/modResource.class.php index b088a301c6b..d125a9c55ac 100644 --- a/htdocs/core/modules/modResource.class.php +++ b/htdocs/core/modules/modResource.class.php @@ -285,7 +285,6 @@ class modResource extends DolibarrModules $this->import_regex_array[$r]=array('s.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]( [0-9][0-9]:[0-9][0-9]:[0-9][0-9])?$'); $this->import_examplevalues_array[$r]=array('r.ref'=>"REF1",'r.fk_code_type_resource'=>"Code from dictionary resource type",'r.datec'=>"2017-01-01 or 2017-01-01 12:30:00"); $this->import_updatekeys_array[$r]=array('r.rf'=>'ResourceFormLabel_ref'); - } /** diff --git a/htdocs/core/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php index 9622e087699..e6064d57ec0 100644 --- a/htdocs/core/modules/modStock.class.php +++ b/htdocs/core/modules/modStock.class.php @@ -348,7 +348,6 @@ class modStock extends DolibarrModules $this->import_run_sql_after_array[$r]=array( // Because we may change data that are denormalized, we must update dernormalized data after. 'UPDATE llx_product p SET p.stock= (SELECT SUM(ps.reel) FROM llx_product_stock ps WHERE ps.fk_product = p.rowid);' ); - } diff --git a/htdocs/core/modules/modTax.class.php b/htdocs/core/modules/modTax.class.php index 91ed84366de..7dacae51b67 100644 --- a/htdocs/core/modules/modTax.class.php +++ b/htdocs/core/modules/modTax.class.php @@ -174,7 +174,6 @@ class modTax extends DolibarrModules $this->import_examplevalues_array[$r]=array('t.label'=>"VAT Payment 1st quarter 2016",'t.fk_typepayment'=>"CHQ (must be id or code found into dictionary)", 't.datep'=>"2016-04-02", 't.datev'=>"2016-03-31", 't.amount'=>1000, 't.num_payment'=>'123456' ); - } diff --git a/htdocs/core/modules/modUser.class.php b/htdocs/core/modules/modUser.class.php index 19e146a6e8c..c9a69a7e053 100644 --- a/htdocs/core/modules/modUser.class.php +++ b/htdocs/core/modules/modUser.class.php @@ -291,7 +291,6 @@ class modUser extends DolibarrModules 'u.email'=>"test@mycompany.com",'u.salary'=>"10000",'u.note'=>"This is an example of note for record",'u.datec'=>"2015-01-01 or 2015-01-01 12:30:00" ); $this->import_updatekeys_array[$r]=array('u.lastname'=>'Lastname','u.firstname'=>'Firstname','u.login'=>'Login'); - } diff --git a/htdocs/core/modules/printsheet/modules_labels.php b/htdocs/core/modules/printsheet/modules_labels.php index 047d7aeed76..8c64c202f9d 100644 --- a/htdocs/core/modules/printsheet/modules_labels.php +++ b/htdocs/core/modules/printsheet/modules_labels.php @@ -164,7 +164,5 @@ function doc_label_pdf_create($db, $arrayofrecords, $modele, $outputlangs, $outp dol_print_error('',$langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file)); return -1; } - - } diff --git a/htdocs/core/modules/product/mod_codeproduct_elephant.php b/htdocs/core/modules/product/mod_codeproduct_elephant.php index 32941ca1ec9..ec31adfb609 100644 --- a/htdocs/core/modules/product/mod_codeproduct_elephant.php +++ b/htdocs/core/modules/product/mod_codeproduct_elephant.php @@ -303,7 +303,6 @@ class mod_codeproduct_elephant extends ModeleProductCode { return -2; } - } } diff --git a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php index 5bede258b07..ce2d0fec7d3 100644 --- a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php +++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php @@ -177,7 +177,6 @@ class doc_generic_project_odt extends ModelePDFProjects $resarray = $this->fill_substitutionarray_with_extrafields($task,$resarray,$extrafields,'task',$outputlangs); return $resarray; - } /** diff --git a/htdocs/core/modules/project/doc/pdf_timespent.modules.php b/htdocs/core/modules/project/doc/pdf_timespent.modules.php index 6bcfe287b70..a03b1ee8a57 100644 --- a/htdocs/core/modules/project/doc/pdf_timespent.modules.php +++ b/htdocs/core/modules/project/doc/pdf_timespent.modules.php @@ -582,7 +582,6 @@ class pdf_timespent extends ModelePDFProjects } } */ - } /** diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php index 4d52707649e..5393c5b9804 100644 --- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php +++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php @@ -839,7 +839,6 @@ class pdf_azur extends ModelePDFPropales */ function _tableau_versements(&$pdf, $object, $posy, $outputlangs) { - } diff --git a/htdocs/core/modules/rapport/pdf_paiement.class.php b/htdocs/core/modules/rapport/pdf_paiement.class.php index a645b105610..3e050f12b9e 100644 --- a/htdocs/core/modules/rapport/pdf_paiement.class.php +++ b/htdocs/core/modules/rapport/pdf_paiement.class.php @@ -80,7 +80,6 @@ class pdf_paiement } // which type of document will be generated: clients (client) or providers (fourn) invoices $this->doc_type = "client"; - } diff --git a/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php b/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php index 60537bca1d3..d0ae019bf09 100644 --- a/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php +++ b/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php @@ -113,7 +113,6 @@ class modGeneratePassPerso extends ModeleGenPassword //$this->All = str_shuffle($this->Maj. $this->Min. $this->Nb. $this->Spe); //$this->All = $this->Maj. $this->Min. $this->Nb. $this->Spe; //$this->All = $this->Spe; - } /** diff --git a/htdocs/core/modules/societe/mod_codeclient_elephant.php b/htdocs/core/modules/societe/mod_codeclient_elephant.php index 993bb2ed2b3..c9cc44c8479 100644 --- a/htdocs/core/modules/societe/mod_codeclient_elephant.php +++ b/htdocs/core/modules/societe/mod_codeclient_elephant.php @@ -323,7 +323,6 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode { return -2; } - } } diff --git a/htdocs/core/modules/stock/doc/pdf_standard.modules.php b/htdocs/core/modules/stock/doc/pdf_standard.modules.php index 6adcd2e9cb7..9cc092875bf 100644 --- a/htdocs/core/modules/stock/doc/pdf_standard.modules.php +++ b/htdocs/core/modules/stock/doc/pdf_standard.modules.php @@ -898,7 +898,6 @@ class pdf_standard extends ModelePDFStock $pdf->SetLineStyle(array('dash'=>'0','color'=>array(220,26,26))); $pdf->line($this->marge_gauche, $tab_top+11, $this->page_largeur-$this->marge_droite, $tab_top+11); $pdf->SetLineStyle(array('dash'=>0)); - } /** diff --git a/htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php b/htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php index 5f8a62a90c6..3413a49549a 100644 --- a/htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php +++ b/htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php @@ -900,7 +900,6 @@ class pdf_stdmovement extends ModelePDFMovement $pdf->SetLineStyle(array('dash'=>'0','color'=>array(220,26,26))); $pdf->line($this->marge_gauche, $tab_top+11, $this->page_largeur-$this->marge_droite, $tab_top+11); $pdf->SetLineStyle(array('dash'=>0)); - } /** diff --git a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php index be563f4d495..158aecb8c49 100644 --- a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php +++ b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php @@ -923,7 +923,6 @@ class pdf_canelle extends ModelePDFSuppliersInvoices $pdf->SetXY($this->postotalht-1, $tab_top+1); $pdf->MultiCell(30,2, $outputlangs->transnoentities("TotalHTShort"),'','C'); } - } /** @@ -1015,7 +1014,6 @@ class pdf_canelle extends ModelePDFSuppliersInvoices $this->error=$this->db->lasterror(); return -1; } - } /** diff --git a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php index 9294ff1a47e..0b4e9a89dff 100644 --- a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php +++ b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php @@ -715,7 +715,6 @@ class pdf_muscadet extends ModelePDFSuppliersOrders */ function _tableau_versements(&$pdf, $object, $posy, $outputlangs) { - } diff --git a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php index 1bd1b89cd38..fcbb7094c3a 100644 --- a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php +++ b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php @@ -567,7 +567,6 @@ class pdf_standard extends ModelePDFSuppliersPayments // Date $pdf->SetXY($this->page_largeur - $this->marge_droite - 30, $posy); $pdf->MultiCell(150, 4, date("d").' '.$outputlangs->transnoentitiesnoconv(date("F")).' '.date("Y"), 0, 'L', 1); - } @@ -613,7 +612,6 @@ class pdf_standard extends ModelePDFSuppliersPayments // Output Rect //$this->printRect($pdf,$this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect prend une longueur en 3eme param et 4eme param - } diff --git a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php index 7d7009a3c58..4a594e71191 100644 --- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php +++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php @@ -707,7 +707,6 @@ class pdf_aurore extends ModelePDFSupplierProposal */ function _tableau_versements(&$pdf, $object, $posy, $outputlangs) { - } diff --git a/htdocs/dav/dav.class.php b/htdocs/dav/dav.class.php index 9e5121112d0..7d6ea446493 100644 --- a/htdocs/dav/dav.class.php +++ b/htdocs/dav/dav.class.php @@ -106,7 +106,6 @@ class CdavLib } return $sql; - } /** diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php index 9aa55945d2b..1c22b27bfc4 100644 --- a/htdocs/don/class/don.class.php +++ b/htdocs/don/class/don.class.php @@ -691,7 +691,6 @@ class Don extends CommonObject dol_print_error($this->db); return -1; } - } /** diff --git a/htdocs/don/class/paymentdonation.class.php b/htdocs/don/class/paymentdonation.class.php index a4d89c36457..ec9535e51b7 100644 --- a/htdocs/don/class/paymentdonation.class.php +++ b/htdocs/don/class/paymentdonation.class.php @@ -490,8 +490,6 @@ class PaymentDonation extends CommonObject $this->fk_bank=''; $this->fk_user_creat=''; $this->fk_user_modif=''; - - } diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php index 3e3559847b8..93499706614 100644 --- a/htdocs/ecm/class/ecmdirectory.class.php +++ b/htdocs/ecm/class/ecmdirectory.class.php @@ -786,7 +786,6 @@ class EcmDirectory // extends CommonObject } } return $result; - } diff --git a/htdocs/expedition/class/api_shipments.class.php b/htdocs/expedition/class/api_shipments.class.php index 0e07c3706a4..109b847fc62 100644 --- a/htdocs/expedition/class/api_shipments.class.php +++ b/htdocs/expedition/class/api_shipments.class.php @@ -472,7 +472,6 @@ class Shipments extends DolibarrApi 'message' => 'Shipment deleted' ) ); - } /** diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index a4bcfeb2281..8c1c3cb8d20 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -1294,7 +1294,6 @@ class Expedition extends CommonObject $this->db->rollback(); return -1; } - } /** @@ -1703,7 +1702,6 @@ class Expedition extends CommonObject $this->lines[]=$line; $xnbp++; } - } /** @@ -1841,7 +1839,6 @@ class Expedition extends CommonObject $sql.= ' WHERE rowid='.$id; $resql = $this->db->query($sql); - } /** @@ -1857,7 +1854,6 @@ class Expedition extends CommonObject $sql.= ' WHERE rowid='.$id; $resql = $this->db->query($sql); - } diff --git a/htdocs/expensereport/class/api_expensereports.class.php b/htdocs/expensereport/class/api_expensereports.class.php index d83714356a2..80c22fb961a 100644 --- a/htdocs/expensereport/class/api_expensereports.class.php +++ b/htdocs/expensereport/class/api_expensereports.class.php @@ -445,7 +445,6 @@ class ExpenseReports extends DolibarrApi 'message' => 'Expense Report deleted' ) ); - } /** diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php index 5de34c41caa..0fb1ef518fb 100644 --- a/htdocs/expensereport/class/expensereport.class.php +++ b/htdocs/expensereport/class/expensereport.class.php @@ -895,7 +895,6 @@ class ExpenseReport extends CommonObject return -1; } } - } /** @@ -1756,8 +1755,6 @@ class ExpenseReport extends CommonObject $this->error = 'ErrorExpenseNotDraft'; return -3; } - - } /** diff --git a/htdocs/expensereport/class/paymentexpensereport.class.php b/htdocs/expensereport/class/paymentexpensereport.class.php index 417ba0fdb4a..bb0654c634a 100644 --- a/htdocs/expensereport/class/paymentexpensereport.class.php +++ b/htdocs/expensereport/class/paymentexpensereport.class.php @@ -488,8 +488,6 @@ class PaymentExpenseReport extends CommonObject $this->fk_bank=''; $this->fk_user_creat=''; $this->fk_user_modif=''; - - } diff --git a/htdocs/fichinter/class/api_interventions.class.php b/htdocs/fichinter/class/api_interventions.class.php index 7701af5fe91..7a258c8c864 100644 --- a/htdocs/fichinter/class/api_interventions.class.php +++ b/htdocs/fichinter/class/api_interventions.class.php @@ -317,7 +317,6 @@ class Interventions extends DolibarrApi 'message' => 'Intervention deleted' ) ); - } /** diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php index 7c772d460a5..f34bb56c540 100644 --- a/htdocs/fichinter/class/fichinter.class.php +++ b/htdocs/fichinter/class/fichinter.class.php @@ -274,7 +274,6 @@ class Fichinter extends CommonObject $this->db->rollback(); return -1; } - } /** diff --git a/htdocs/fourn/class/fournisseur.class.php b/htdocs/fourn/class/fournisseur.class.php index ba486e066cc..a177fdd26a1 100644 --- a/htdocs/fourn/class/fournisseur.class.php +++ b/htdocs/fourn/class/fournisseur.class.php @@ -141,7 +141,6 @@ class Fournisseur extends Societe $this->error=$this->db->error(); return -1; } - } /** diff --git a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php index f5933b453ed..f81507141fb 100644 --- a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php +++ b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php @@ -547,8 +547,6 @@ class CommandeFournisseurDispatch extends CommonObject $this->batch=''; $this->eatby=''; $this->sellby=''; - - } /** diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php index 8f77d152036..098fba679f3 100644 --- a/htdocs/fourn/class/fournisseur.product.class.php +++ b/htdocs/fourn/class/fournisseur.product.class.php @@ -181,7 +181,6 @@ class ProductFournisseur extends Product $this->db->rollback(); return -1; } - } diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php index 833b46b2bca..0f86476be04 100644 --- a/htdocs/holiday/class/holiday.class.php +++ b/htdocs/holiday/class/holiday.class.php @@ -1018,7 +1018,6 @@ class Holiday extends CommonObject $statut.= ''."\n"; print $statut; - } /** @@ -1248,7 +1247,6 @@ class Holiday extends CommonObject return -1; } } - } /** @@ -1326,7 +1324,6 @@ class Holiday extends CommonObject $sql.= " WHERE fk_user = '".$user_id."'"; $this->db->query($sql); - } diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLERead.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLERead.php index 261bdde5812..444d8ec641f 100644 --- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLERead.php +++ b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLERead.php @@ -289,7 +289,6 @@ class PHPExcel_Shared_OLERead { $offset += self::PROPERTY_STORAGE_BLOCK_SIZE; } - } /** diff --git a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Chart.php b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Chart.php index 4846910fa29..93e85582d5c 100644 --- a/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Chart.php +++ b/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel2007/Chart.php @@ -1042,7 +1042,6 @@ class PHPExcel_Writer_Excel2007_Chart extends } $objWriter->endElement(); - } /** @@ -1322,7 +1321,6 @@ class PHPExcel_Writer_Excel2007_Chart extends $objWriter->endElement(); } $objWriter->endElement(); - } /** diff --git a/htdocs/loan/class/loan.class.php b/htdocs/loan/class/loan.class.php index ce7a1a9c57f..94008db546d 100644 --- a/htdocs/loan/class/loan.class.php +++ b/htdocs/loan/class/loan.class.php @@ -286,7 +286,6 @@ class Loan extends CommonObject $this->db->rollback(); return -1; } - } diff --git a/htdocs/modulebuilder/template/class/api_mymodule.class.php b/htdocs/modulebuilder/template/class/api_mymodule.class.php index 50527690bbb..36b8b1d3fa8 100644 --- a/htdocs/modulebuilder/template/class/api_mymodule.class.php +++ b/htdocs/modulebuilder/template/class/api_mymodule.class.php @@ -279,7 +279,6 @@ class MyModuleApi extends DolibarrApi 'message' => 'MyObject deleted' ) ); - } diff --git a/htdocs/multicurrency/class/multicurrency.class.php b/htdocs/multicurrency/class/multicurrency.class.php index c7822961570..ea1f6b56dd5 100644 --- a/htdocs/multicurrency/class/multicurrency.class.php +++ b/htdocs/multicurrency/class/multicurrency.class.php @@ -488,7 +488,6 @@ class MultiCurrency extends CommonObject $this->rate = new CurrencyRate($this->db); return $this->rate->fetch($obj->rowid); } - } /** diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php index 4855799c508..4a6dbe63768 100644 --- a/htdocs/paypal/lib/paypal.lib.php +++ b/htdocs/paypal/lib/paypal.lib.php @@ -287,7 +287,6 @@ function print_paypal_redirect($paymentAmount,$currencyCodeType,$paymentType,$re return $mesg; } - } /** diff --git a/htdocs/product/canvas/product/actions_card_product.class.php b/htdocs/product/canvas/product/actions_card_product.class.php index a6a182fc64f..c0722fcd765 100644 --- a/htdocs/product/canvas/product/actions_card_product.class.php +++ b/htdocs/product/canvas/product/actions_card_product.class.php @@ -238,7 +238,6 @@ class ActionsCardProduct { $this->LoadListDatas($limit, $offset, $sortfield, $sortorder); } - } diff --git a/htdocs/product/canvas/service/actions_card_service.class.php b/htdocs/product/canvas/service/actions_card_service.class.php index 108c6ccb748..afda34aec23 100644 --- a/htdocs/product/canvas/service/actions_card_service.class.php +++ b/htdocs/product/canvas/service/actions_card_service.class.php @@ -217,7 +217,6 @@ class ActionsCardService { $this->LoadListDatas($limit, $offset, $sortfield, $sortorder); } - } diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php index 9161581eaae..99fd6c07ede 100644 --- a/htdocs/product/class/html.formproduct.class.php +++ b/htdocs/product/class/html.formproduct.class.php @@ -33,7 +33,7 @@ class FormProduct * @var DoliDB Database handler. */ public $db; - + /** * @var string Error code (or message) */ @@ -188,7 +188,6 @@ class FormProduct } return $final_label; - } /** diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 78415504477..ee98537a195 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -47,12 +47,12 @@ class Product extends CommonObject * @var string ID to identify managed object */ public $element='product'; - + /** * @var string Name of table without prefix where object is stored */ public $table_element='product'; - + public $fk_element='fk_product'; protected $childtables=array('supplier_proposaldet', 'propaldet','commandedet','facturedet','contratdet','facture_fourn_det','commande_fournisseurdet'); // To test if we can delete object public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe @@ -647,7 +647,6 @@ class Product extends CommonObject dol_syslog(get_class($this)."::Create fails verify ".join(',',$this->errors), LOG_WARNING); return -3; } - } @@ -3014,7 +3013,6 @@ class Product extends CommonObject { return 1; } - } /** diff --git a/htdocs/product/class/productbatch.class.php b/htdocs/product/class/productbatch.class.php index 0c0ed55855f..87815d5b07b 100644 --- a/htdocs/product/class/productbatch.class.php +++ b/htdocs/product/class/productbatch.class.php @@ -395,8 +395,6 @@ class Productbatch extends CommonObject $this->eatby=''; $this->batch=''; $this->import_key=''; - - } /** diff --git a/htdocs/product/class/propalmergepdfproduct.class.php b/htdocs/product/class/propalmergepdfproduct.class.php index 23282586d22..d79e68b9f48 100644 --- a/htdocs/product/class/propalmergepdfproduct.class.php +++ b/htdocs/product/class/propalmergepdfproduct.class.php @@ -632,8 +632,6 @@ class Propalmergepdfproduct extends CommonObject $this->datec=''; $this->tms=''; $this->import_key=''; - - } } diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php index f8e60f135b9..59e966035d4 100644 --- a/htdocs/product/stock/class/entrepot.class.php +++ b/htdocs/product/stock/class/entrepot.class.php @@ -93,7 +93,6 @@ class Entrepot extends CommonObject { $this->statuts[self::STATUS_OPEN_ALL] = 'Opened'; } - } /** @@ -167,7 +166,6 @@ class Entrepot extends CommonObject $this->db->rollback(); return -1; } - } /** @@ -301,7 +299,6 @@ class Entrepot extends CommonObject $this->error=$this->db->lasterror(); return -1; } - } @@ -714,7 +711,6 @@ class Entrepot extends CommonObject } return $TChildWarehouses; - } /** diff --git a/htdocs/product/stock/class/productstockentrepot.class.php b/htdocs/product/stock/class/productstockentrepot.class.php index 01379e8859c..5dbaa95f395 100644 --- a/htdocs/product/stock/class/productstockentrepot.class.php +++ b/htdocs/product/stock/class/productstockentrepot.class.php @@ -572,8 +572,6 @@ class ProductStockEntrepot extends CommonObject $this->seuil_stock_alerte = ''; $this->desiredstock = ''; $this->import_key = ''; - - } } diff --git a/htdocs/projet/class/api_projects.class.php b/htdocs/projet/class/api_projects.class.php index e5a73590d75..6deacab7204 100644 --- a/htdocs/projet/class/api_projects.class.php +++ b/htdocs/projet/class/api_projects.class.php @@ -483,7 +483,6 @@ class Projects extends DolibarrApi 'message' => 'Project deleted' ) ); - } /** diff --git a/htdocs/projet/class/api_tasks.class.php b/htdocs/projet/class/api_tasks.class.php index cd79a12cecc..294c0f0faae 100644 --- a/htdocs/projet/class/api_tasks.class.php +++ b/htdocs/projet/class/api_tasks.class.php @@ -487,7 +487,6 @@ class Tasks extends DolibarrApi 'message' => 'Task deleted' ) ); - } diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php index 91cc8dbbcad..17c36bb5a54 100644 --- a/htdocs/projet/class/project.class.php +++ b/htdocs/projet/class/project.class.php @@ -1607,7 +1607,6 @@ class Project extends CommonObject }else { return 1; } - } /** @@ -1640,7 +1639,6 @@ class Project extends CommonObject }else { return 1; } - } /** diff --git a/htdocs/projet/ganttchart.inc.php b/htdocs/projet/ganttchart.inc.php index bc85e5bae78..dc76e098b59 100644 --- a/htdocs/projet/ganttchart.inc.php +++ b/htdocs/projet/ganttchart.inc.php @@ -271,8 +271,6 @@ function constructGanttLine($tarr, $task, $task_dependencies, $level=0, $project $s.= "g.AddTaskItem(new JSGantt.TaskItem('".$taskid."', '".dol_escape_js(trim($name))."', '".$start_date."', '".$end_date."', '".$css."', '".$link."', ".$task['task_milestone'].", '".dol_escape_js($resources)."', ".($percent >= 0 ? $percent : 0).", ".$line_is_auto_group.", '".$parent."', 1, '".$dependency."', '".(empty($task["task_is_group"]) ? (($percent >= 0 && $percent != '') ? $percent.'%' : '') : '')."', '".dol_escape_js($note)."', g));"; echo $s; - - } /** diff --git a/htdocs/resource/class/dolresource.class.php b/htdocs/resource/class/dolresource.class.php index f08e3e75921..b6eaca2143e 100644 --- a/htdocs/resource/class/dolresource.class.php +++ b/htdocs/resource/class/dolresource.class.php @@ -570,7 +570,6 @@ class Dolresource extends CommonObject $this->error = $this->db->lasterror(); return -1; } - } /** @@ -648,7 +647,6 @@ class Dolresource extends CommonObject $this->error = $this->db->lasterror(); return -1; } - } /** @@ -726,7 +724,6 @@ class Dolresource extends CommonObject $this->error = $this->db->lasterror(); return -1; } - } /** @@ -874,7 +871,6 @@ class Dolresource extends CommonObject $i++; } return $i; - } diff --git a/htdocs/societe/class/address.class.php b/htdocs/societe/class/address.class.php index 43e46008910..7f89e081e8b 100644 --- a/htdocs/societe/class/address.class.php +++ b/htdocs/societe/class/address.class.php @@ -228,7 +228,6 @@ class Address return $result; } } - } /** diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php index 3e39768ada9..07bc59f4757 100644 --- a/htdocs/societe/class/api_thirdparties.class.php +++ b/htdocs/societe/class/api_thirdparties.class.php @@ -1527,7 +1527,6 @@ class Thirdparties extends DolibarrApi $i++; } } - } /** diff --git a/htdocs/societe/class/client.class.php b/htdocs/societe/class/client.class.php index 59eea72c2c7..b0e275dbab8 100644 --- a/htdocs/societe/class/client.class.php +++ b/htdocs/societe/class/client.class.php @@ -88,7 +88,6 @@ class Client extends Societe $this->error=$this->db->lasterror(); return -1; } - } /** diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index 5c3363bc4c8..b50343d03d8 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -2428,7 +2428,6 @@ class Societe extends CommonObject { dol_print_error($this->db); } - } @@ -3825,7 +3824,6 @@ class Societe extends CommonObject if ($statut==1) return $langs->trans("Customer"); if ($statut==2) return $langs->trans("Prospect"); if ($statut==3) return $langs->trans("ProspectCustomer"); - } diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php index b8472d0b821..eda7bca78b9 100644 --- a/htdocs/stripe/class/stripe.class.php +++ b/htdocs/stripe/class/stripe.class.php @@ -47,7 +47,6 @@ class Stripe extends CommonObject public function __construct($db) { $this->db = $db; - } diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index 40c6a6b9f19..ab4c66f0799 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -562,7 +562,6 @@ class User extends CommonObject $this->db->commit(); return 1; } - } @@ -686,7 +685,6 @@ class User extends CommonObject $this->db->commit(); return 1; } - } @@ -1253,7 +1251,6 @@ class User extends CommonObject $this->db->rollback(); return $result; } - } /** @@ -1661,7 +1658,6 @@ class User extends CommonObject $this->db->rollback(); return -2; } - } /** @@ -3158,7 +3154,6 @@ class User extends CommonObject $this->errors[] = $this->db->lasterror(); return -1; } - } } diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php index 8f89b4a2e35..0da00e64caf 100644 --- a/htdocs/user/class/usergroup.class.php +++ b/htdocs/user/class/usergroup.class.php @@ -385,7 +385,6 @@ class UserGroup extends CommonObject $this->db->commit(); return 1; } - } @@ -511,7 +510,6 @@ class UserGroup extends CommonObject $this->db->commit(); return 1; } - } diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php index be6770743bc..103d0ffca39 100644 --- a/htdocs/website/class/website.class.php +++ b/htdocs/website/class/website.class.php @@ -762,8 +762,6 @@ class Website extends CommonObject $this->fk_user_modif = $user->id; $this->date_creation = dol_now(); $this->tms = dol_now(); - - } diff --git a/test/phpunit/ExportTest.php b/test/phpunit/ExportTest.php index 364eaf7568d..eb9d0b733f1 100644 --- a/test/phpunit/ExportTest.php +++ b/test/phpunit/ExportTest.php @@ -128,31 +128,31 @@ class ExportTest extends PHPUnit_Framework_TestCase public function testExportOther() { global $conf,$user,$langs,$db; - + $model='csv'; - + // Creation of class to export using model ExportXXX $dir = DOL_DOCUMENT_ROOT . "/core/modules/export/"; $file = "export_".$model.".modules.php"; $classname = "Export".$model; require_once $dir.$file; $objmodel = new $classname($this->db); - + // First test without option USE_STRICT_CSV_RULES unset($conf->global->USE_STRICT_CSV_RULES); - + $valtotest='A simple string'; print __METHOD__." valtotest=".$valtotest."\n"; $result = $objmodel->csvClean($valtotest, $langs->charset_output); print __METHOD__." result=".$result."\n"; $this->assertEquals($result, 'A simple string'); - + $valtotest='A string with , and ; inside'; print __METHOD__." valtotest=".$valtotest."\n"; $result = $objmodel->csvClean($valtotest, $langs->charset_output); print __METHOD__." result=".$result."\n"; $this->assertEquals($result, '"A string with , and ; inside"'); - + $valtotest='A string with " inside'; print __METHOD__." valtotest=".$valtotest."\n"; $result = $objmodel->csvClean($valtotest, $langs->charset_output); @@ -164,48 +164,47 @@ class ExportTest extends PHPUnit_Framework_TestCase $result = $objmodel->csvClean($valtotest, $langs->charset_output); print __METHOD__." result=".$result."\n"; $this->assertEquals($result, '"A string with "" inside and \n carriage returns"'); - + $valtotest='A string with html
content inside
'."\n"; print __METHOD__." valtotest=".$valtotest."\n"; $result = $objmodel->csvClean($valtotest, $langs->charset_output); print __METHOD__." result=".$result."\n"; $this->assertEquals($result, '"A string with html
content inside"'); - + // Same tests with strict mode $conf->global->USE_STRICT_CSV_RULES=1; - + $valtotest='A simple string'; print __METHOD__." valtotest=".$valtotest."\n"; $result = $objmodel->csvClean($valtotest, $langs->charset_output); print __METHOD__." result=".$result."\n"; $this->assertEquals($result, 'A simple string'); - + $valtotest='A string with , and ; inside'; print __METHOD__." valtotest=".$valtotest."\n"; $result = $objmodel->csvClean($valtotest, $langs->charset_output); print __METHOD__." result=".$result."\n"; $this->assertEquals($result, '"A string with , and ; inside"'); - + $valtotest='A string with " inside'; print __METHOD__." valtotest=".$valtotest."\n"; $result = $objmodel->csvClean($valtotest, $langs->charset_output); print __METHOD__." result=".$result."\n"; $this->assertEquals($result, '"A string with "" inside"'); - + $valtotest='A string with " inside and '."\r\n".' carriage returns'; print __METHOD__." valtotest=".$valtotest."\n"; $result = $objmodel->csvClean($valtotest, $langs->charset_output); print __METHOD__." result=".$result."\n"; $this->assertEquals($result, "\"A string with \"\" inside and \r\n carriage returns\""); - + $valtotest='A string with html
content inside
'."\n"; print __METHOD__." valtotest=".$valtotest."\n"; $result = $objmodel->csvClean($valtotest, $langs->charset_output); print __METHOD__." result=".$result."\n"; $this->assertEquals($result, '"A string with html
content inside"'); - } - + /** * Test export function for a personalized dataset * @@ -353,5 +352,5 @@ class ExportTest extends PHPUnit_Framework_TestCase return true; } - + } diff --git a/test/phpunit/Functions2LibTest.php b/test/phpunit/Functions2LibTest.php index 470a570bf6e..a9df42b8b1c 100644 --- a/test/phpunit/Functions2LibTest.php +++ b/test/phpunit/Functions2LibTest.php @@ -138,7 +138,6 @@ class Functions2LibTest extends PHPUnit_Framework_TestCase */ public function testIsValidMailDomain() { - } /** @@ -241,10 +240,9 @@ class Functions2LibTest extends PHPUnit_Framework_TestCase print __METHOD__." for ".$ip." result=".$result."\n"; $this->assertEquals(2,$result,$ip); - $ip='192.168.0.0'; - $result=is_ip($ip); + $ip='192.168.0.0'; + $result=is_ip($ip); print __METHOD__." for ".$ip." result=".$result."\n"; - $this->assertEquals(2,$result,$ip); - + $this->assertEquals(2,$result,$ip); } } diff --git a/test/phpunit/FunctionsLibTest.php b/test/phpunit/FunctionsLibTest.php index e32b17ec09d..a96e36c3262 100644 --- a/test/phpunit/FunctionsLibTest.php +++ b/test/phpunit/FunctionsLibTest.php @@ -110,7 +110,8 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase print __METHOD__."\n"; } - /** + + /** * End phpunit tests * * @return void @@ -121,7 +122,6 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase } - /** * testIsValidMXRecord * @@ -390,7 +390,6 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase $input='This is a text with html comments '; // we suppose this is not enough to be html content $after=dol_textishtml($input); $this->assertFalse($after); - } @@ -837,7 +836,6 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase $object->country_code='CA'; $phone=dol_print_phone('1234567890', $object->country_code, 0, 0, 0, ' '); $this->assertEquals('(123) 456-7890', $phone, 'Phone for CA 1'); - } @@ -1008,7 +1006,6 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase // Test RULE 5 (FR-US) $vat=get_default_tva($companyfr,$companyus,0); $this->assertEquals(0,$vat,'RULE 5 ECOMMERCE_200238EC'); - } /** From 6aee680a4f7ec7740e605bb7390399b505f54b10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 29 Aug 2018 22:06:05 +0200 Subject: [PATCH 34/48] PSR2 ClassDeclaration --- dev/setup/codesniffer/ruleset.xml | 2 +- dev/translation/autotranslator.class.php | 1 - .../accountancy/class/accountancycategory.class.php | 3 +-- .../canvas/actions_adherentcard_common.class.php | 1 - htdocs/adherents/class/adherent.class.php | 1 - htdocs/adherents/class/adherent_type.class.php | 1 - htdocs/adherents/class/adherentstats.class.php | 1 - htdocs/adherents/class/api_members.class.php | 1 - htdocs/adherents/class/api_memberstypes.class.php | 1 - htdocs/api/class/api_setup.class.php | 1 - htdocs/asset/class/asset_type.class.php | 1 - htdocs/blockedlog/class/blockedlog.class.php | 1 - htdocs/bookmarks/class/bookmark.class.php | 1 - htdocs/cashdesk/class/Auth.class.php | 1 - htdocs/cashdesk/class/Facturation.class.php | 1 - htdocs/comm/action/class/actioncomm.class.php | 1 - htdocs/comm/action/class/actioncommreminder.class.php | 1 - htdocs/comm/action/class/cactioncomm.class.php | 1 - htdocs/comm/mailing/class/advtargetemailing.class.php | 2 -- htdocs/comm/mailing/class/mailing.class.php | 1 - htdocs/comm/propal/class/propal.class.php | 1 - htdocs/commande/class/commandestats.class.php | 1 - htdocs/compta/bank/class/account.class.php | 2 -- htdocs/compta/bank/class/bankcateg.class.php | 1 - htdocs/compta/bank/class/paymentvarious.class.php | 1 - htdocs/compta/deplacement/class/deplacement.class.php | 1 - htdocs/compta/facture/class/api_invoices.class.php | 1 - htdocs/compta/facture/class/facture-rec.class.php | 1 - htdocs/compta/facture/class/facturestats.class.php | 2 -- htdocs/compta/facture/class/paymentterm.class.php | 1 - htdocs/compta/localtax/class/localtax.class.php | 1 - .../paiement/cheque/class/remisecheque.class.php | 1 - htdocs/compta/paiement/class/cpaiement.class.php | 1 - .../compta/prelevement/class/bonprelevement.class.php | 1 - .../prelevement/class/rejetprelevement.class.php | 1 - htdocs/compta/salaries/class/paymentsalary.class.php | 1 - .../compta/sociales/class/cchargesociales.class.php | 1 - .../canvas/actions_contactcard_common.class.php | 1 - htdocs/core/boxes/box_actions.php | 1 - htdocs/core/boxes/box_bookmarks.php | 1 - htdocs/core/boxes/box_clients.php | 1 - htdocs/core/boxes/box_commandes.php | 1 - htdocs/core/boxes/box_comptes.php | 1 - htdocs/core/boxes/box_contacts.php | 1 - htdocs/core/boxes/box_contracts.php | 1 - htdocs/core/boxes/box_external_rss.php | 1 - htdocs/core/boxes/box_factures.php | 1 - htdocs/core/boxes/box_factures_fourn.php | 1 - htdocs/core/boxes/box_factures_fourn_imp.php | 1 - htdocs/core/boxes/box_factures_imp.php | 1 - htdocs/core/boxes/box_ficheinter.php | 1 - htdocs/core/boxes/box_fournisseurs.php | 1 - htdocs/core/boxes/box_graph_invoices_permonth.php | 1 - .../boxes/box_graph_invoices_supplier_permonth.php | 1 - htdocs/core/boxes/box_graph_orders_permonth.php | 1 - .../core/boxes/box_graph_orders_supplier_permonth.php | 1 - htdocs/core/boxes/box_graph_product_distribution.php | 1 - htdocs/core/boxes/box_graph_propales_permonth.php | 1 - htdocs/core/boxes/box_members.php | 1 - htdocs/core/boxes/box_produits.php | 1 - htdocs/core/boxes/box_produits_alerte_stock.php | 1 - htdocs/core/boxes/box_propales.php | 1 - htdocs/core/boxes/box_prospect.php | 1 - htdocs/core/boxes/box_services_contracts.php | 1 - htdocs/core/boxes/box_services_expired.php | 3 +-- htdocs/core/boxes/box_supplier_orders.php | 1 - htdocs/core/boxes/modules_boxes.php | 4 +--- htdocs/core/class/CSMSFile.class.php | 1 - htdocs/core/class/antivir.class.php | 1 - htdocs/core/class/canvas.class.php | 1 - htdocs/core/class/ccountry.class.php | 1 - htdocs/core/class/commonobject.class.php | 1 - htdocs/core/class/commonorder.class.php | 1 - htdocs/core/class/commonstickergenerator.class.php | 1 - htdocs/core/class/coreobject.class.php | 1 - htdocs/core/class/cstate.class.php | 1 - htdocs/core/class/ctypent.class.php | 1 - htdocs/core/class/ctyperesource.class.php | 2 -- htdocs/core/class/doleditor.class.php | 1 - htdocs/core/class/dolgraph.class.php | 1 - htdocs/core/class/emailsenderprofile.class.php | 1 - htdocs/core/class/events.class.php | 1 - htdocs/core/class/fiscalyear.class.php | 1 - htdocs/core/class/genericobject.class.php | 1 - htdocs/core/class/hookmanager.class.php | 1 - htdocs/core/class/html.form.class.php | 1 - htdocs/core/class/html.formactions.class.php | 1 - htdocs/core/class/html.formbarcode.class.php | 1 - htdocs/core/class/html.formcompany.class.php | 1 - htdocs/core/class/html.formcontract.class.php | 1 - htdocs/core/class/html.formfile.class.php | 1 - htdocs/core/class/html.formmail.class.php | 1 - htdocs/core/class/html.formmargin.class.php | 1 - htdocs/core/class/html.formorder.class.php | 1 - htdocs/core/class/html.formother.class.php | 1 - htdocs/core/class/html.formprojet.class.php | 1 - htdocs/core/class/html.formsms.class.php | 1 - htdocs/core/class/html.formsocialcontrib.class.php | 1 - htdocs/core/class/html.formwebsite.class.php | 1 - htdocs/core/class/infobox.class.php | 1 - htdocs/core/class/interfaces.class.php | 1 - htdocs/core/class/link.class.php | 1 - htdocs/core/class/menubase.class.php | 1 - htdocs/core/class/notify.class.php | 1 - htdocs/core/class/openid.class.php | 1 - htdocs/core/class/rssparser.class.php | 1 - htdocs/core/class/smtps.class.php | 2 -- htdocs/core/class/vcard.class.php | 1 - htdocs/core/class/workboardresponse.class.php | 1 - htdocs/core/db/Database.interface.php | 1 - htdocs/core/db/mssql.class.php | 1 - htdocs/core/db/sqlite3.class.php | 1 - htdocs/core/menus/standard/eldy_menu.php | 1 - htdocs/core/modules/DolibarrModules.class.php | 2 +- htdocs/core/modules/bank/doc/pdf_ban.modules.php | 1 - .../core/modules/bank/doc/pdf_sepamandate.modules.php | 1 - .../core/modules/barcode/doc/phpbarcode.modules.php | 1 - .../modules/barcode/mod_barcode_product_standard.php | 1 - htdocs/core/modules/barcode/modules_barcode.class.php | 2 -- htdocs/core/modules/cheque/mod_chequereceipt_mint.php | 1 - .../core/modules/cheque/mod_chequereceipt_thyme.php | 1 - .../commande/doc/doc_generic_order_odt.modules.php | 1 - .../modules/commande/doc/pdf_einstein.modules.php | 1 - .../modules/commande/doc/pdf_proforma.modules.php | 1 - htdocs/core/modules/commande/mod_commande_marbre.php | 1 - htdocs/core/modules/commande/mod_commande_saphir.php | 1 - .../contract/doc/doc_generic_contract_odt.modules.php | 1 - .../core/modules/contract/doc/pdf_strato.modules.php | 1 - htdocs/core/modules/contract/mod_contract_magre.php | 1 - htdocs/core/modules/contract/mod_contract_serpis.php | 1 - .../doc/doc_generic_shipment_odt.modules.php | 1 - .../modules/expedition/doc/pdf_rouget.modules.php | 1 - .../core/modules/expedition/mod_expedition_ribera.php | 1 - .../core/modules/expedition/mod_expedition_safor.php | 1 - .../expensereport/doc/pdf_standard.modules.php | 1 - .../modules/expensereport/modules_expensereport.php | 1 - htdocs/core/modules/export/export_csv.modules.php | 1 - .../core/modules/export/export_excel2007.modules.php | 1 - htdocs/core/modules/export/export_tsv.modules.php | 1 - htdocs/core/modules/export/modules_export.php | 1 - .../facture/doc/doc_generic_invoice_odt.modules.php | 1 - htdocs/core/modules/facture/doc/pdf_crabe.modules.php | 1 - htdocs/core/modules/facture/mod_facture_mars.php | 1 - htdocs/core/modules/facture/mod_facture_mercure.php | 1 - htdocs/core/modules/facture/mod_facture_terre.php | 1 - .../core/modules/fichinter/doc/pdf_soleil.modules.php | 1 - htdocs/core/modules/fichinter/mod_arctic.php | 1 - htdocs/core/modules/fichinter/mod_pacific.php | 1 - htdocs/core/modules/holiday/mod_holiday_madonna.php | 1 - htdocs/core/modules/import/import_csv.modules.php | 1 - htdocs/core/modules/import/import_xlsx.modules.php | 1 - htdocs/core/modules/import/modules_import.php | 1 - .../core/modules/livraison/doc/pdf_typhon.modules.php | 1 - htdocs/core/modules/livraison/mod_livraison_jade.php | 1 - .../core/modules/livraison/mod_livraison_saphir.php | 1 - .../core/modules/mailings/advthirdparties.modules.php | 1 - htdocs/core/modules/mailings/contacts1.modules.php | 1 - htdocs/core/modules/mailings/example.modules.php | 1 - htdocs/core/modules/mailings/fraise.modules.php | 1 - htdocs/core/modules/mailings/modules_mailings.php | 3 +-- htdocs/core/modules/mailings/pomme.modules.php | 1 - htdocs/core/modules/mailings/thirdparties.modules.php | 1 - .../thirdparties_services_expired.modules.php | 1 - htdocs/core/modules/mailings/xinputfile.modules.php | 1 - htdocs/core/modules/mailings/xinputuser.modules.php | 1 - htdocs/core/modules/member/doc/pdf_standard.class.php | 1 - htdocs/core/modules/modAgenda.class.php | 1 - htdocs/core/modules/modAsset.class.php | 1 - htdocs/core/modules/modDav.class.php | 1 - htdocs/core/modules/modExternalRss.class.php | 1 - htdocs/core/modules/modReceiptPrinter.class.php | 1 - htdocs/core/modules/modSupplierProposal.class.php | 1 - htdocs/core/modules/modTicket.class.php | 1 - htdocs/core/modules/payment/mod_payment_ant.php | 1 - htdocs/core/modules/payment/mod_payment_cicada.php | 1 - htdocs/core/modules/printing/modules_printing.php | 1 - htdocs/core/modules/printing/printgcp.modules.php | 1 - htdocs/core/modules/printing/printipp.modules.php | 1 - .../product/doc/doc_generic_product_odt.modules.php | 1 - .../core/modules/product/doc/pdf_standard.modules.php | 1 - .../core/modules/product/mod_codeproduct_elephant.php | 1 - htdocs/core/modules/product/modules_product.class.php | 1 - .../project/doc/doc_generic_project_odt.modules.php | 1 - .../core/modules/project/doc/pdf_baleine.modules.php | 1 - .../core/modules/project/doc/pdf_beluga.modules.php | 1 - .../modules/project/doc/pdf_timespent.modules.php | 1 - .../project/task/doc/doc_generic_task_odt.modules.php | 1 - .../propale/doc/doc_generic_proposal_odt.modules.php | 1 - htdocs/core/modules/propale/mod_propale_marbre.php | 1 - htdocs/core/modules/propale/mod_propale_saphir.php | 1 - .../security/generate/modGeneratePassNone.class.php | 1 - .../modules/security/generate/modules_genpassword.php | 1 - .../modules/societe/doc/doc_generic_odt.modules.php | 1 - .../core/modules/societe/mod_codeclient_elephant.php | 1 - htdocs/core/modules/societe/mod_codeclient_monkey.php | 1 - htdocs/core/modules/societe/modules_societe.class.php | 2 -- .../stock/doc/doc_generic_stock_odt.modules.php | 1 - .../core/modules/stock/doc/pdf_standard.modules.php | 1 - .../modules/stock/doc/pdf_stdmovement.modules.php | 1 - .../supplier_invoice/modules_facturefournisseur.php | 1 - .../supplier_invoice/pdf/pdf_canelle.modules.php | 1 - .../supplier_order/modules_commandefournisseur.php | 1 - .../supplier_order/pdf/pdf_muscadet.modules.php | 1 - .../supplier_payment/doc/pdf_standard.modules.php | 1 - .../mod_supplier_payment_brodator.php | 1 - .../supplier_payment/mod_supplier_payment_bronan.php | 1 - .../supplier_payment/modules_supplier_payment.php | 1 - .../doc/doc_generic_supplier_proposal_odt.modules.php | 1 - .../supplier_proposal/doc/pdf_aurore.modules.php | 1 - .../mod_supplier_proposal_marbre.php | 1 - .../mod_supplier_proposal_saphir.php | 1 - htdocs/core/modules/ticket/mod_ticket_simple.php | 1 - htdocs/core/modules/ticket/mod_ticket_universal.php | 1 - .../modules/user/doc/doc_generic_user_odt.modules.php | 1 - .../doc/doc_generic_usergroup_odt.modules.php | 1 - htdocs/core/triggers/dolibarrtriggers.class.php | 1 - .../triggers/interface_20_all_Logevents.class.php | 1 - ...interface_20_modWorkflow_WorkflowManager.class.php | 1 - .../interface_50_modAgenda_ActionsAuto.class.php | 1 - ...rface_50_modBlockedlog_ActionsBlockedLog.class.php | 1 - .../interface_50_modLdap_Ldapsynchro.class.php | 1 - ...ace_50_modMailmanspip_Mailmanspipsynchro.class.php | 1 - ...nterface_50_modNotification_Notification.class.php | 1 - htdocs/dav/dav.class.php | 1 - htdocs/don/class/don.class.php | 1 - htdocs/ecm/class/ecmdirectory.class.php | 2 -- htdocs/expedition/class/expeditionbatch.class.php | 1 - htdocs/expensereport/class/expensereport.class.php | 1 - htdocs/exports/class/export.class.php | 1 - htdocs/fichinter/class/api_interventions.class.php | 2 -- htdocs/fichinter/class/fichinter.class.php | 1 - htdocs/fichinter/class/fichinterstats.class.php | 1 - htdocs/fourn/class/fournisseur.class.php | 1 - .../class/fournisseur.commande.dispatch.class.php | 1 - htdocs/fourn/class/fournisseur.product.class.php | 1 - htdocs/fourn/class/paiementfourn.class.php | 1 - htdocs/holiday/class/holiday.class.php | 1 - htdocs/imports/class/import.class.php | 1 - htdocs/livraison/class/livraison.class.php | 2 -- htdocs/mailmanspip/class/mailmanspip.class.php | 1 - .../template/class/actions_mymodule.class.php | 1 - .../mailinglist_mymodule_myobject.modules.php | 1 - .../template/core/modules/modMyModule.class.php | 1 - htdocs/multicurrency/class/multicurrency.class.php | 1 - htdocs/opensurvey/class/opensurveysondage.class.php | 1 - .../canvas/product/actions_card_product.class.php | 1 - .../canvas/service/actions_card_service.class.php | 1 - htdocs/product/class/product.class.php | 1 - htdocs/product/class/productbatch.class.php | 1 - htdocs/product/class/propalmergepdfproduct.class.php | 1 - htdocs/product/inventory/class/inventory.class.php | 1 - htdocs/product/stock/class/entrepot.class.php | 1 - htdocs/product/stock/class/productlot.class.php | 1 - .../stock/class/productstockentrepot.class.php | 1 - htdocs/projet/class/project.class.php | 1 - htdocs/resource/class/html.formresource.class.php | 3 --- htdocs/societe/canvas/actions_card_common.class.php | 1 - .../canvas/company/actions_card_company.class.php | 1 - .../individual/actions_card_individual.class.php | 1 - htdocs/societe/class/address.class.php | 1 - htdocs/societe/class/client.class.php | 1 - htdocs/societe/class/companybankaccount.class.php | 1 - htdocs/societe/class/companypaymentmode.class.php | 1 - htdocs/stripe/class/actions_stripe.class.php | 1 - htdocs/stripe/class/stripe.class.php | 1 - .../class/supplier_proposal.class.php | 2 -- htdocs/ticket/class/ticket.class.php | 2 -- htdocs/user/class/user.class.php | 1 - htdocs/website/class/website.class.php | 1 - htdocs/website/class/websitepage.class.php | 1 - test/phpunit/AccountingAccountTest.php | 1 - test/phpunit/ActionCommTest.php | 1 - test/phpunit/AdminLibTest.php | 1 - test/phpunit/AllTests.php | 1 - test/phpunit/BankAccountTest.php | 1 - test/phpunit/BonPrelevementTest.php | 1 - test/phpunit/CMailFileTest.php | 11 +++++------ test/phpunit/CategorieTest.php | 1 - test/phpunit/ChargeSocialesTest.php | 1 - test/phpunit/CodingSqlTest.php | 1 - test/phpunit/CommandeFournisseurTest.php | 1 - test/phpunit/CommandeTest.php | 1 - test/phpunit/CompanyBankAccountTest.php | 1 - test/phpunit/ContratTest.php | 1 - test/phpunit/DateLibTest.php | 1 - test/phpunit/DateLibTzFranceTest.php | 1 - test/phpunit/EntrepotTest.php | 1 - test/phpunit/ExpenseReportTest.php | 3 +-- test/phpunit/ExportTest.php | 1 - test/phpunit/FactureFournisseurTest.php | 1 - test/phpunit/FactureTestRounding.php | 1 - test/phpunit/FichinterTest.php | 1 - test/phpunit/FilesLibTest.php | 1 - test/phpunit/FormAdminTest.php | 1 - test/phpunit/FunctionsLibTest.php | 1 - test/phpunit/HolidayTest.php | 1 - test/phpunit/ImagesLibTest.php | 1 - test/phpunit/ImportTest.php | 1 - test/phpunit/MarginsLibTest.php | 5 ++--- test/phpunit/ModulesTest.php | 1 - test/phpunit/MouvementStockTest.php | 1 - test/phpunit/NumberingModulesTest.php | 1 - test/phpunit/PaypalTest.php | 5 ++--- test/phpunit/PricesTest.php | 1 - test/phpunit/ProjectTest.php | 1 - test/phpunit/PropalTest.php | 1 - test/phpunit/RestAPIUserTest.php | 3 +-- test/phpunit/SecurityTest.php | 1 - test/phpunit/SocieteTest.php | 1 - test/phpunit/SupplierProposalTest.php | 1 - test/phpunit/UserGroupTest.php | 1 - test/phpunit/UtilsTest.php | 3 --- test/phpunit/WebservicesInvoicesTest.php | 1 - test/phpunit/WebservicesOrdersTest.php | 1 - test/phpunit/WebservicesOtherTest.php | 1 - test/phpunit/WebservicesProductsTest.php | 1 - test/phpunit/WebservicesThirdpartyTest.php | 1 - test/phpunit/WebservicesUserTest.php | 1 - test/phpunit/XCalLibTest.php | 1 - 319 files changed, 17 insertions(+), 351 deletions(-) diff --git a/dev/setup/codesniffer/ruleset.xml b/dev/setup/codesniffer/ruleset.xml index fa19bc94372..be06c52ea7c 100644 --- a/dev/setup/codesniffer/ruleset.xml +++ b/dev/setup/codesniffer/ruleset.xml @@ -374,7 +374,7 @@ - + diff --git a/dev/translation/autotranslator.class.php b/dev/translation/autotranslator.class.php index 0a84bf03b70..060f590d656 100644 --- a/dev/translation/autotranslator.class.php +++ b/dev/translation/autotranslator.class.php @@ -345,5 +345,4 @@ class autoTranslator return $rep; } - } diff --git a/htdocs/accountancy/class/accountancycategory.class.php b/htdocs/accountancy/class/accountancycategory.class.php index d0191d92c09..fc3950cbeef 100644 --- a/htdocs/accountancy/class/accountancycategory.class.php +++ b/htdocs/accountancy/class/accountancycategory.class.php @@ -28,7 +28,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php'; /** * Class to manage categories of an accounting account */ -class AccountancyCategory // extends CommonObject +class AccountancyCategory // extends CommonObject { /** * @var DoliDB Database handler. @@ -824,5 +824,4 @@ class AccountancyCategory // extends CommonObject return -1; } } - } diff --git a/htdocs/adherents/canvas/actions_adherentcard_common.class.php b/htdocs/adherents/canvas/actions_adherentcard_common.class.php index a141a1e568a..a0396363da7 100644 --- a/htdocs/adherents/canvas/actions_adherentcard_common.class.php +++ b/htdocs/adherents/canvas/actions_adherentcard_common.class.php @@ -277,5 +277,4 @@ abstract class ActionsAdherentCardCommon } } } - } diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index 7a4cc378baf..e60f728766a 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -2669,5 +2669,4 @@ class Adherent extends CommonObject return 0; } - } diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php index 937d3e197a8..cef414ce38a 100644 --- a/htdocs/adherents/class/adherent_type.class.php +++ b/htdocs/adherents/class/adherent_type.class.php @@ -555,5 +555,4 @@ class AdherentType extends CommonObject return ''; } - } diff --git a/htdocs/adherents/class/adherentstats.class.php b/htdocs/adherents/class/adherentstats.class.php index bfa990a04c0..eb722b987a9 100644 --- a/htdocs/adherents/class/adherentstats.class.php +++ b/htdocs/adherents/class/adherentstats.class.php @@ -181,5 +181,4 @@ class AdherentStats extends Stats return $this->_getAllByYear($sql); } - } diff --git a/htdocs/adherents/class/api_members.class.php b/htdocs/adherents/class/api_members.class.php index 1758da55b1b..8591dd13195 100644 --- a/htdocs/adherents/class/api_members.class.php +++ b/htdocs/adherents/class/api_members.class.php @@ -409,5 +409,4 @@ class Members extends DolibarrApi return $result; } - } diff --git a/htdocs/adherents/class/api_memberstypes.class.php b/htdocs/adherents/class/api_memberstypes.class.php index bcba76056f1..ecf7f45d371 100644 --- a/htdocs/adherents/class/api_memberstypes.class.php +++ b/htdocs/adherents/class/api_memberstypes.class.php @@ -320,5 +320,4 @@ class MembersTypes extends DolibarrApi return $object; } - } diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php index 1a958210559..9389e2ff5ed 100644 --- a/htdocs/api/class/api_setup.class.php +++ b/htdocs/api/class/api_setup.class.php @@ -918,5 +918,4 @@ class Setup extends DolibarrApi return array('resultcode'=>$resultcode, 'resultcomment'=>$resultcomment, 'expectedchecksum'=> $outexpectedchecksum, 'currentchecksum'=> $outcurrentchecksum, 'out'=>$out); } - } diff --git a/htdocs/asset/class/asset_type.class.php b/htdocs/asset/class/asset_type.class.php index 5455eb4c7ea..213efb2b186 100644 --- a/htdocs/asset/class/asset_type.class.php +++ b/htdocs/asset/class/asset_type.class.php @@ -437,5 +437,4 @@ class AssetType extends CommonObject { return ''; } - } diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php index 59268d15c90..eaec787b099 100644 --- a/htdocs/blockedlog/class/blockedlog.class.php +++ b/htdocs/blockedlog/class/blockedlog.class.php @@ -1056,5 +1056,4 @@ class BlockedLog return $result; } - } diff --git a/htdocs/bookmarks/class/bookmark.class.php b/htdocs/bookmarks/class/bookmark.class.php index 005e73acad7..2d156832861 100644 --- a/htdocs/bookmarks/class/bookmark.class.php +++ b/htdocs/bookmarks/class/bookmark.class.php @@ -255,5 +255,4 @@ class Bookmark extends CommonObject { return ''; } - } diff --git a/htdocs/cashdesk/class/Auth.class.php b/htdocs/cashdesk/class/Auth.class.php index 5e431514d1c..78b76e20d11 100644 --- a/htdocs/cashdesk/class/Auth.class.php +++ b/htdocs/cashdesk/class/Auth.class.php @@ -138,6 +138,5 @@ class Auth return $ret; } - } diff --git a/htdocs/cashdesk/class/Facturation.class.php b/htdocs/cashdesk/class/Facturation.class.php index 48339044576..755c48faf88 100644 --- a/htdocs/cashdesk/class/Facturation.class.php +++ b/htdocs/cashdesk/class/Facturation.class.php @@ -648,5 +648,4 @@ class Facturation $this->prix_total_ttc = $aTotalTtc; } } - } diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 1adb2da8822..0bc0a8236f6 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -1688,5 +1688,4 @@ class ActionComm extends CommonObject return $error; } - } diff --git a/htdocs/comm/action/class/actioncommreminder.class.php b/htdocs/comm/action/class/actioncommreminder.class.php index ce32234be56..15991978fec 100644 --- a/htdocs/comm/action/class/actioncommreminder.class.php +++ b/htdocs/comm/action/class/actioncommreminder.class.php @@ -227,6 +227,5 @@ class ActionCommReminder extends CommonObject { $this->initAsSpecimenCommon(); } - } diff --git a/htdocs/comm/action/class/cactioncomm.class.php b/htdocs/comm/action/class/cactioncomm.class.php index cdccca9968b..43844522a5a 100644 --- a/htdocs/comm/action/class/cactioncomm.class.php +++ b/htdocs/comm/action/class/cactioncomm.class.php @@ -225,5 +225,4 @@ class CActionComm $transcode=$langs->trans("Action".$this->code); if ($transcode != "Action".$this->code) return $transcode; } - } diff --git a/htdocs/comm/mailing/class/advtargetemailing.class.php b/htdocs/comm/mailing/class/advtargetemailing.class.php index 2d7a7ca4000..56c2f5ddd22 100644 --- a/htdocs/comm/mailing/class/advtargetemailing.class.php +++ b/htdocs/comm/mailing/class/advtargetemailing.class.php @@ -970,6 +970,4 @@ class AdvanceTargetingMailing extends CommonObject return $return_sql_criteria; } - - } diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php index 506a2e99f31..d114ad5225f 100644 --- a/htdocs/comm/mailing/class/mailing.class.php +++ b/htdocs/comm/mailing/class/mailing.class.php @@ -643,6 +643,5 @@ class Mailing extends CommonObject if ($statut==3) return $langs->trans("MailingStatusNotContact").' '.img_picto($langs->trans("MailingStatusNotContact"),'statut3'); } } - } diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index cc918b5b9f1..0a1efae5e58 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -4235,6 +4235,5 @@ class PropaleLigne extends CommonObjectLine return -2; } } - } diff --git a/htdocs/commande/class/commandestats.class.php b/htdocs/commande/class/commandestats.class.php index 6ab9965f307..13d7e245f05 100644 --- a/htdocs/commande/class/commandestats.class.php +++ b/htdocs/commande/class/commandestats.class.php @@ -222,6 +222,5 @@ class CommandeStats extends Stats return $this->_getAllByProduct($sql); } - } diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php index 405237a98fa..7a367a88b03 100644 --- a/htdocs/compta/bank/class/account.class.php +++ b/htdocs/compta/bank/class/account.class.php @@ -1629,7 +1629,6 @@ class Account extends CommonObject $this->owner_address = 'Owner address'; $this->country_id = 1; } - } @@ -2312,5 +2311,4 @@ class AccountLine extends CommonObject } return 0; } - } diff --git a/htdocs/compta/bank/class/bankcateg.class.php b/htdocs/compta/bank/class/bankcateg.class.php index 44e4f72c496..53711fc800c 100644 --- a/htdocs/compta/bank/class/bankcateg.class.php +++ b/htdocs/compta/bank/class/bankcateg.class.php @@ -339,5 +339,4 @@ class BankCateg // extends CommonObject $this->id = 0; $this->label = ''; } - } diff --git a/htdocs/compta/bank/class/paymentvarious.class.php b/htdocs/compta/bank/class/paymentvarious.class.php index 90ec1558981..169b864b9b3 100644 --- a/htdocs/compta/bank/class/paymentvarious.class.php +++ b/htdocs/compta/bank/class/paymentvarious.class.php @@ -599,5 +599,4 @@ class PaymentVarious extends CommonObject dol_print_error($this->db); } } - } diff --git a/htdocs/compta/deplacement/class/deplacement.class.php b/htdocs/compta/deplacement/class/deplacement.class.php index 9304ac75b87..14d37d15516 100644 --- a/htdocs/compta/deplacement/class/deplacement.class.php +++ b/htdocs/compta/deplacement/class/deplacement.class.php @@ -452,6 +452,5 @@ class Deplacement extends CommonObject dol_print_error($this->db); } } - } diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php index ab2903c95b4..5075d9d8cb7 100644 --- a/htdocs/compta/facture/class/api_invoices.class.php +++ b/htdocs/compta/facture/class/api_invoices.class.php @@ -1259,5 +1259,4 @@ class Invoices extends DolibarrApi } return $invoice; } - } diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php index 03fbb9086b1..b6be8315897 100644 --- a/htdocs/compta/facture/class/facture-rec.class.php +++ b/htdocs/compta/facture/class/facture-rec.class.php @@ -1859,5 +1859,4 @@ class FactureLigneRec extends CommonInvoiceLine return -2; } } - } diff --git a/htdocs/compta/facture/class/facturestats.class.php b/htdocs/compta/facture/class/facturestats.class.php index e8d8d30e1b5..ef54a6ffa5f 100644 --- a/htdocs/compta/facture/class/facturestats.class.php +++ b/htdocs/compta/facture/class/facturestats.class.php @@ -224,7 +224,5 @@ class FactureStats extends Stats return $this->_getAllByProduct($sql); } - - } diff --git a/htdocs/compta/facture/class/paymentterm.class.php b/htdocs/compta/facture/class/paymentterm.class.php index 18a43d6d68d..2bdd288e748 100644 --- a/htdocs/compta/facture/class/paymentterm.class.php +++ b/htdocs/compta/facture/class/paymentterm.class.php @@ -482,5 +482,4 @@ class PaymentTerm // extends CommonObject $this->nbjour=''; $this->decalage=''; } - } diff --git a/htdocs/compta/localtax/class/localtax.class.php b/htdocs/compta/localtax/class/localtax.class.php index b83379f028c..2d98182b668 100644 --- a/htdocs/compta/localtax/class/localtax.class.php +++ b/htdocs/compta/localtax/class/localtax.class.php @@ -648,5 +648,4 @@ class Localtax extends CommonObject return ''; } - } diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php index ceb376f7a37..cc3879f3c8d 100644 --- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php +++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php @@ -1100,5 +1100,4 @@ class RemiseCheque extends CommonObject } return $langs->trans('Unknown'); } - } diff --git a/htdocs/compta/paiement/class/cpaiement.class.php b/htdocs/compta/paiement/class/cpaiement.class.php index 1c10e78c1b7..c9794d9662e 100644 --- a/htdocs/compta/paiement/class/cpaiement.class.php +++ b/htdocs/compta/paiement/class/cpaiement.class.php @@ -370,5 +370,4 @@ class Cpaiement $this->accountancy_code = ''; $this->module = ''; } - } diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php index b041c6acab7..bfce2e8af95 100644 --- a/htdocs/compta/prelevement/class/bonprelevement.class.php +++ b/htdocs/compta/prelevement/class/bonprelevement.class.php @@ -1937,6 +1937,5 @@ class BonPrelevement extends CommonObject if ($statut==2) return $this->labelstatut[$statut].' '.img_picto($this->labelstatut[$statut],'statut6'); } } - } diff --git a/htdocs/compta/prelevement/class/rejetprelevement.class.php b/htdocs/compta/prelevement/class/rejetprelevement.class.php index 75c67146d6d..7abdf64d1f0 100644 --- a/htdocs/compta/prelevement/class/rejetprelevement.class.php +++ b/htdocs/compta/prelevement/class/rejetprelevement.class.php @@ -368,6 +368,5 @@ class RejetPrelevement return -2; } } - } diff --git a/htdocs/compta/salaries/class/paymentsalary.class.php b/htdocs/compta/salaries/class/paymentsalary.class.php index 613a51f45b0..2f4f7bfb0df 100644 --- a/htdocs/compta/salaries/class/paymentsalary.class.php +++ b/htdocs/compta/salaries/class/paymentsalary.class.php @@ -627,5 +627,4 @@ class PaymentSalary extends CommonObject }*/ return ''; } - } diff --git a/htdocs/compta/sociales/class/cchargesociales.class.php b/htdocs/compta/sociales/class/cchargesociales.class.php index aab637a693c..3add8b14076 100644 --- a/htdocs/compta/sociales/class/cchargesociales.class.php +++ b/htdocs/compta/sociales/class/cchargesociales.class.php @@ -524,5 +524,4 @@ class Cchargesociales $this->module = ''; $this->accountancy_code = ''; } - } diff --git a/htdocs/contact/canvas/actions_contactcard_common.class.php b/htdocs/contact/canvas/actions_contactcard_common.class.php index 1276e501dc6..c0477a6c752 100644 --- a/htdocs/contact/canvas/actions_contactcard_common.class.php +++ b/htdocs/contact/canvas/actions_contactcard_common.class.php @@ -316,6 +316,5 @@ abstract class ActionsContactCardCommon $this->object->country = $langs->trans("Country".$obj->code)?$langs->trans("Country".$obj->code):$obj->label; } } - } diff --git a/htdocs/core/boxes/box_actions.php b/htdocs/core/boxes/box_actions.php index 6ccf61690ed..9bcfb002bb6 100644 --- a/htdocs/core/boxes/box_actions.php +++ b/htdocs/core/boxes/box_actions.php @@ -260,6 +260,5 @@ class box_actions extends ModeleBoxes return ''; } - } diff --git a/htdocs/core/boxes/box_bookmarks.php b/htdocs/core/boxes/box_bookmarks.php index 50cebe91b1f..c3a29877104 100644 --- a/htdocs/core/boxes/box_bookmarks.php +++ b/htdocs/core/boxes/box_bookmarks.php @@ -161,6 +161,5 @@ class box_bookmarks extends ModeleBoxes { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } - } diff --git a/htdocs/core/boxes/box_clients.php b/htdocs/core/boxes/box_clients.php index a3383370e40..96ccd7b675d 100644 --- a/htdocs/core/boxes/box_clients.php +++ b/htdocs/core/boxes/box_clients.php @@ -177,6 +177,5 @@ class box_clients extends ModeleBoxes { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } - } diff --git a/htdocs/core/boxes/box_commandes.php b/htdocs/core/boxes/box_commandes.php index 86660258cd0..5aeb6179207 100644 --- a/htdocs/core/boxes/box_commandes.php +++ b/htdocs/core/boxes/box_commandes.php @@ -202,6 +202,5 @@ class box_commandes extends ModeleBoxes { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } - } diff --git a/htdocs/core/boxes/box_comptes.php b/htdocs/core/boxes/box_comptes.php index 5e0582fd49c..8606d9b91f7 100644 --- a/htdocs/core/boxes/box_comptes.php +++ b/htdocs/core/boxes/box_comptes.php @@ -188,6 +188,5 @@ class box_comptes extends ModeleBoxes { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } - } diff --git a/htdocs/core/boxes/box_contacts.php b/htdocs/core/boxes/box_contacts.php index 37e32d07198..4feb101c090 100644 --- a/htdocs/core/boxes/box_contacts.php +++ b/htdocs/core/boxes/box_contacts.php @@ -189,6 +189,5 @@ class box_contacts extends ModeleBoxes { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } - } diff --git a/htdocs/core/boxes/box_contracts.php b/htdocs/core/boxes/box_contracts.php index 027fa2cc84a..6f9a62e1063 100644 --- a/htdocs/core/boxes/box_contracts.php +++ b/htdocs/core/boxes/box_contracts.php @@ -185,6 +185,5 @@ class box_contracts extends ModeleBoxes { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } - } diff --git a/htdocs/core/boxes/box_external_rss.php b/htdocs/core/boxes/box_external_rss.php index 4c2ca4236ca..f08c809627d 100644 --- a/htdocs/core/boxes/box_external_rss.php +++ b/htdocs/core/boxes/box_external_rss.php @@ -198,6 +198,5 @@ class box_external_rss extends ModeleBoxes { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } - } diff --git a/htdocs/core/boxes/box_factures.php b/htdocs/core/boxes/box_factures.php index 84f27257889..348bd7b9fe5 100644 --- a/htdocs/core/boxes/box_factures.php +++ b/htdocs/core/boxes/box_factures.php @@ -206,5 +206,4 @@ class box_factures extends ModeleBoxes { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } - } diff --git a/htdocs/core/boxes/box_factures_fourn.php b/htdocs/core/boxes/box_factures_fourn.php index 011942b9cc4..c865cf185c4 100644 --- a/htdocs/core/boxes/box_factures_fourn.php +++ b/htdocs/core/boxes/box_factures_fourn.php @@ -218,6 +218,5 @@ class box_factures_fourn extends ModeleBoxes { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } - } diff --git a/htdocs/core/boxes/box_factures_fourn_imp.php b/htdocs/core/boxes/box_factures_fourn_imp.php index 75561643526..e8dedf59c41 100644 --- a/htdocs/core/boxes/box_factures_fourn_imp.php +++ b/htdocs/core/boxes/box_factures_fourn_imp.php @@ -205,6 +205,5 @@ class box_factures_fourn_imp extends ModeleBoxes { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } - } diff --git a/htdocs/core/boxes/box_factures_imp.php b/htdocs/core/boxes/box_factures_imp.php index 1faeb789337..54d265bf6af 100644 --- a/htdocs/core/boxes/box_factures_imp.php +++ b/htdocs/core/boxes/box_factures_imp.php @@ -209,5 +209,4 @@ class box_factures_imp extends ModeleBoxes { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } - } diff --git a/htdocs/core/boxes/box_ficheinter.php b/htdocs/core/boxes/box_ficheinter.php index a831bc163ce..76d1414f53f 100644 --- a/htdocs/core/boxes/box_ficheinter.php +++ b/htdocs/core/boxes/box_ficheinter.php @@ -170,6 +170,5 @@ class box_ficheinter extends ModeleBoxes { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } - } diff --git a/htdocs/core/boxes/box_fournisseurs.php b/htdocs/core/boxes/box_fournisseurs.php index 6878c1780a5..0ca14fae7f5 100644 --- a/htdocs/core/boxes/box_fournisseurs.php +++ b/htdocs/core/boxes/box_fournisseurs.php @@ -164,6 +164,5 @@ class box_fournisseurs extends ModeleBoxes { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } - } diff --git a/htdocs/core/boxes/box_graph_invoices_permonth.php b/htdocs/core/boxes/box_graph_invoices_permonth.php index 4eb91d36e60..c22163779a8 100644 --- a/htdocs/core/boxes/box_graph_invoices_permonth.php +++ b/htdocs/core/boxes/box_graph_invoices_permonth.php @@ -280,6 +280,5 @@ class box_graph_invoices_permonth extends ModeleBoxes { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } - } diff --git a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php index 337b4283e94..a7f504b2d01 100644 --- a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php +++ b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php @@ -279,6 +279,5 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } - } diff --git a/htdocs/core/boxes/box_graph_orders_permonth.php b/htdocs/core/boxes/box_graph_orders_permonth.php index b05395169fa..329fef77fba 100644 --- a/htdocs/core/boxes/box_graph_orders_permonth.php +++ b/htdocs/core/boxes/box_graph_orders_permonth.php @@ -278,6 +278,5 @@ class box_graph_orders_permonth extends ModeleBoxes { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } - } diff --git a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php index 86a813407a6..de962149cdf 100644 --- a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php +++ b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php @@ -277,6 +277,5 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } - } diff --git a/htdocs/core/boxes/box_graph_product_distribution.php b/htdocs/core/boxes/box_graph_product_distribution.php index 66c3bf1145a..42afa4fbfe0 100644 --- a/htdocs/core/boxes/box_graph_product_distribution.php +++ b/htdocs/core/boxes/box_graph_product_distribution.php @@ -415,6 +415,5 @@ class box_graph_product_distribution extends ModeleBoxes { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } - } diff --git a/htdocs/core/boxes/box_graph_propales_permonth.php b/htdocs/core/boxes/box_graph_propales_permonth.php index d7691e05c30..c19235c2fb2 100644 --- a/htdocs/core/boxes/box_graph_propales_permonth.php +++ b/htdocs/core/boxes/box_graph_propales_permonth.php @@ -281,6 +281,5 @@ class box_graph_propales_permonth extends ModeleBoxes { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } - } diff --git a/htdocs/core/boxes/box_members.php b/htdocs/core/boxes/box_members.php index 3b556e6d5db..6f7e62aa457 100644 --- a/htdocs/core/boxes/box_members.php +++ b/htdocs/core/boxes/box_members.php @@ -182,6 +182,5 @@ class box_members extends ModeleBoxes { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } - } diff --git a/htdocs/core/boxes/box_produits.php b/htdocs/core/boxes/box_produits.php index f6e91169eae..cadda2b8058 100644 --- a/htdocs/core/boxes/box_produits.php +++ b/htdocs/core/boxes/box_produits.php @@ -230,6 +230,5 @@ class box_produits extends ModeleBoxes { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } - } diff --git a/htdocs/core/boxes/box_produits_alerte_stock.php b/htdocs/core/boxes/box_produits_alerte_stock.php index 0bd7a5e2ad7..648da118e09 100644 --- a/htdocs/core/boxes/box_produits_alerte_stock.php +++ b/htdocs/core/boxes/box_produits_alerte_stock.php @@ -242,6 +242,5 @@ class box_produits_alerte_stock extends ModeleBoxes { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } - } diff --git a/htdocs/core/boxes/box_propales.php b/htdocs/core/boxes/box_propales.php index a208671835f..6db4ac11250 100644 --- a/htdocs/core/boxes/box_propales.php +++ b/htdocs/core/boxes/box_propales.php @@ -192,6 +192,5 @@ class box_propales extends ModeleBoxes { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } - } diff --git a/htdocs/core/boxes/box_prospect.php b/htdocs/core/boxes/box_prospect.php index 912d0191e8d..629da790f3c 100644 --- a/htdocs/core/boxes/box_prospect.php +++ b/htdocs/core/boxes/box_prospect.php @@ -180,6 +180,5 @@ class box_prospect extends ModeleBoxes { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } - } diff --git a/htdocs/core/boxes/box_services_contracts.php b/htdocs/core/boxes/box_services_contracts.php index 87cf179daaf..41d287d0c37 100644 --- a/htdocs/core/boxes/box_services_contracts.php +++ b/htdocs/core/boxes/box_services_contracts.php @@ -236,6 +236,5 @@ class box_services_contracts extends ModeleBoxes { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } - } diff --git a/htdocs/core/boxes/box_services_expired.php b/htdocs/core/boxes/box_services_expired.php index ab5ad0c54a7..afc087ad715 100644 --- a/htdocs/core/boxes/box_services_expired.php +++ b/htdocs/core/boxes/box_services_expired.php @@ -184,6 +184,5 @@ class box_services_expired extends ModeleBoxes { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } - - } +} diff --git a/htdocs/core/boxes/box_supplier_orders.php b/htdocs/core/boxes/box_supplier_orders.php index 934be175c15..97b4bf8feec 100644 --- a/htdocs/core/boxes/box_supplier_orders.php +++ b/htdocs/core/boxes/box_supplier_orders.php @@ -188,6 +188,5 @@ class box_supplier_orders extends ModeleBoxes { return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } - } diff --git a/htdocs/core/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php index 61af58a4b8b..4377b90d17a 100644 --- a/htdocs/core/boxes/modules_boxes.php +++ b/htdocs/core/boxes/modules_boxes.php @@ -31,7 +31,7 @@ * * Boxes parent class */ -class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" boxes +class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" boxes { /** * @var DoliDB Database handler @@ -503,8 +503,6 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" } return $widget; } - - } diff --git a/htdocs/core/class/CSMSFile.class.php b/htdocs/core/class/CSMSFile.class.php index 0a149feabf4..1eafa042d4f 100644 --- a/htdocs/core/class/CSMSFile.class.php +++ b/htdocs/core/class/CSMSFile.class.php @@ -244,6 +244,5 @@ class CSMSFile @chmod($outputfile, octdec($conf->global->MAIN_UMASK)); } } - } diff --git a/htdocs/core/class/antivir.class.php b/htdocs/core/class/antivir.class.php index 9d81d3a94ac..34d797ec891 100644 --- a/htdocs/core/class/antivir.class.php +++ b/htdocs/core/class/antivir.class.php @@ -179,6 +179,5 @@ class AntiVir return $ret; } - } diff --git a/htdocs/core/class/canvas.class.php b/htdocs/core/class/canvas.class.php index 8a9b9d2f005..616136e4912 100644 --- a/htdocs/core/class/canvas.class.php +++ b/htdocs/core/class/canvas.class.php @@ -208,5 +208,4 @@ class Canvas return $ret; } } - } diff --git a/htdocs/core/class/ccountry.class.php b/htdocs/core/class/ccountry.class.php index f49d39e8fdd..30f426ec30d 100644 --- a/htdocs/core/class/ccountry.class.php +++ b/htdocs/core/class/ccountry.class.php @@ -333,5 +333,4 @@ class Ccountry // extends CommonObject return 1; } } - } diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 111ae066821..e6e4a129232 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -7240,5 +7240,4 @@ abstract class CommonObject { return count($this->comments); } - } diff --git a/htdocs/core/class/commonorder.class.php b/htdocs/core/class/commonorder.class.php index b3e5033330d..2ea53a345d8 100644 --- a/htdocs/core/class/commonorder.class.php +++ b/htdocs/core/class/commonorder.class.php @@ -144,6 +144,5 @@ abstract class CommonOrderLine extends CommonObjectLine public $info_bits = 0; public $special_code = 0; - } diff --git a/htdocs/core/class/commonstickergenerator.class.php b/htdocs/core/class/commonstickergenerator.class.php index efd0f491162..e20c023eef3 100644 --- a/htdocs/core/class/commonstickergenerator.class.php +++ b/htdocs/core/class/commonstickergenerator.class.php @@ -266,5 +266,4 @@ abstract class CommonStickerGenerator $this->_Height = $this->_Convert_Metric($format['height'], $this->_Metric, $this->_Metric_Doc); $this->Set_Char_Size($pdf, $format['font-size']); } - } diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php index 215ad36ba60..5129ac54ece 100644 --- a/htdocs/core/class/coreobject.class.php +++ b/htdocs/core/class/coreobject.class.php @@ -435,5 +435,4 @@ class CoreObject extends CommonObject return 1; } - } diff --git a/htdocs/core/class/cstate.class.php b/htdocs/core/class/cstate.class.php index bb75a36de96..3b1016aa55f 100644 --- a/htdocs/core/class/cstate.class.php +++ b/htdocs/core/class/cstate.class.php @@ -317,5 +317,4 @@ class Cstate // extends CommonObject return 1; } } - } diff --git a/htdocs/core/class/ctypent.class.php b/htdocs/core/class/ctypent.class.php index 184f5f26a2c..aa3e6620d4f 100644 --- a/htdocs/core/class/ctypent.class.php +++ b/htdocs/core/class/ctypent.class.php @@ -333,5 +333,4 @@ class Ctypent // extends CommonObject return 1; } } - } diff --git a/htdocs/core/class/ctyperesource.class.php b/htdocs/core/class/ctyperesource.class.php index 9e0e5b90377..371f4e4aba7 100644 --- a/htdocs/core/class/ctyperesource.class.php +++ b/htdocs/core/class/ctyperesource.class.php @@ -463,7 +463,6 @@ class Ctyperesource $this->label = ''; $this->active = ''; } - } /** @@ -486,5 +485,4 @@ class CtyperesourceLine /** * @var mixed Sample line property 2 */ - } diff --git a/htdocs/core/class/doleditor.class.php b/htdocs/core/class/doleditor.class.php index 98fed20a691..18461beeca3 100644 --- a/htdocs/core/class/doleditor.class.php +++ b/htdocs/core/class/doleditor.class.php @@ -344,6 +344,5 @@ class DolEditor if ($noprint) return $out; else print $out; } - } diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php index 444f9b3ea53..315649f44a6 100644 --- a/htdocs/core/class/dolgraph.class.php +++ b/htdocs/core/class/dolgraph.class.php @@ -1097,6 +1097,5 @@ class DolGraph } return 0; } - } diff --git a/htdocs/core/class/emailsenderprofile.class.php b/htdocs/core/class/emailsenderprofile.class.php index e0ff56d6736..1ef75596b1f 100644 --- a/htdocs/core/class/emailsenderprofile.class.php +++ b/htdocs/core/class/emailsenderprofile.class.php @@ -423,7 +423,6 @@ class EmailSenderProfile extends CommonObject { $this->initAsSpecimenCommon(); } - } /** diff --git a/htdocs/core/class/events.class.php b/htdocs/core/class/events.class.php index 6a2374a7d3b..b4fa7133bff 100644 --- a/htdocs/core/class/events.class.php +++ b/htdocs/core/class/events.class.php @@ -297,5 +297,4 @@ class Events // extends CommonObject $this->dateevent=time(); $this->description='This is a specimen event'; } - } diff --git a/htdocs/core/class/fiscalyear.class.php b/htdocs/core/class/fiscalyear.class.php index 8e6f389200b..a77b67189c4 100644 --- a/htdocs/core/class/fiscalyear.class.php +++ b/htdocs/core/class/fiscalyear.class.php @@ -335,5 +335,4 @@ class Fiscalyear extends CommonObject dol_print_error($this->db); } } - } diff --git a/htdocs/core/class/genericobject.class.php b/htdocs/core/class/genericobject.class.php index c89b5c31fea..41d57731c34 100644 --- a/htdocs/core/class/genericobject.class.php +++ b/htdocs/core/class/genericobject.class.php @@ -38,6 +38,5 @@ class GenericObject extends CommonObject { $this->db=$db; } - } diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php index 9e2bd344171..b078fdc0405 100644 --- a/htdocs/core/class/hookmanager.class.php +++ b/htdocs/core/class/hookmanager.class.php @@ -283,5 +283,4 @@ class HookManager return ($error?-1:$resaction); } - } diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index ee7f81682ac..17ff8fdb5a1 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -7113,6 +7113,5 @@ class Form return $out; } - } diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php index a0468da2726..e4702c52c8c 100644 --- a/htdocs/core/class/html.formactions.class.php +++ b/htdocs/core/class/html.formactions.class.php @@ -366,5 +366,4 @@ class FormActions else print $out; return ''; } - } diff --git a/htdocs/core/class/html.formbarcode.class.php b/htdocs/core/class/html.formbarcode.class.php index 34d56cee853..206569c192d 100644 --- a/htdocs/core/class/html.formbarcode.class.php +++ b/htdocs/core/class/html.formbarcode.class.php @@ -186,6 +186,5 @@ class FormBarCode print ''; } } - } diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php index d422fa379c4..8c965207b62 100644 --- a/htdocs/core/class/html.formcompany.class.php +++ b/htdocs/core/class/html.formcompany.class.php @@ -867,6 +867,5 @@ class FormCompany } } } - } diff --git a/htdocs/core/class/html.formcontract.class.php b/htdocs/core/class/html.formcontract.class.php index 0434dc1e0a8..c4710e033cc 100644 --- a/htdocs/core/class/html.formcontract.class.php +++ b/htdocs/core/class/html.formcontract.class.php @@ -187,5 +187,4 @@ class FormContract print ''; print ''; } - } diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index 8d550a922b4..bdbc8805218 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -1829,6 +1829,5 @@ class FormFile } return $out; } - } diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php index 0a1e3c26f2f..36e13e9a48d 100644 --- a/htdocs/core/class/html.formmail.class.php +++ b/htdocs/core/class/html.formmail.class.php @@ -1385,7 +1385,6 @@ class FormMail extends Form return $tmparray; } - } diff --git a/htdocs/core/class/html.formmargin.class.php b/htdocs/core/class/html.formmargin.class.php index e891e3dacbe..405e47e19c7 100644 --- a/htdocs/core/class/html.formmargin.class.php +++ b/htdocs/core/class/html.formmargin.class.php @@ -282,6 +282,5 @@ class FormMargin print ''; print ''; } - } diff --git a/htdocs/core/class/html.formorder.class.php b/htdocs/core/class/html.formorder.class.php index 68fa96e03ee..781b3f76e4f 100644 --- a/htdocs/core/class/html.formorder.class.php +++ b/htdocs/core/class/html.formorder.class.php @@ -100,6 +100,5 @@ class FormOrder extends Form return 1; } - } diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php index 6982a8a6971..0c11a378a18 100644 --- a/htdocs/core/class/html.formother.class.php +++ b/htdocs/core/class/html.formother.class.php @@ -1255,6 +1255,5 @@ class FormOther dol_print_error($this->db); } } - } diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php index 7a022c4cf52..700cf3b7135 100644 --- a/htdocs/core/class/html.formprojet.class.php +++ b/htdocs/core/class/html.formprojet.class.php @@ -665,5 +665,4 @@ class FormProjets return -1; } } - } diff --git a/htdocs/core/class/html.formsms.class.php b/htdocs/core/class/html.formsms.class.php index 9db197d41b2..1b7cea185c2 100644 --- a/htdocs/core/class/html.formsms.class.php +++ b/htdocs/core/class/html.formsms.class.php @@ -360,6 +360,5 @@ function limitChars(textarea, limit, infodiv) print "\n"; } - } diff --git a/htdocs/core/class/html.formsocialcontrib.class.php b/htdocs/core/class/html.formsocialcontrib.class.php index 8c940c3898b..fbbf962be77 100644 --- a/htdocs/core/class/html.formsocialcontrib.class.php +++ b/htdocs/core/class/html.formsocialcontrib.class.php @@ -120,6 +120,5 @@ class FormSocialContrib dol_print_error($db,$db->lasterror()); } } - } diff --git a/htdocs/core/class/html.formwebsite.class.php b/htdocs/core/class/html.formwebsite.class.php index 5b883835fd3..e14d8217b55 100644 --- a/htdocs/core/class/html.formwebsite.class.php +++ b/htdocs/core/class/html.formwebsite.class.php @@ -205,5 +205,4 @@ class FormWebsite return $out; } - } diff --git a/htdocs/core/class/infobox.class.php b/htdocs/core/class/infobox.class.php index 4125aa89eb9..1c5c733491c 100644 --- a/htdocs/core/class/infobox.class.php +++ b/htdocs/core/class/infobox.class.php @@ -281,6 +281,5 @@ class InfoBox return -1; } } - } diff --git a/htdocs/core/class/interfaces.class.php b/htdocs/core/class/interfaces.class.php index ceb4d0c657c..b2c80dd94d1 100644 --- a/htdocs/core/class/interfaces.class.php +++ b/htdocs/core/class/interfaces.class.php @@ -368,5 +368,4 @@ class Interfaces } return $triggers; } - } diff --git a/htdocs/core/class/link.class.php b/htdocs/core/class/link.class.php index fd3616a9414..7dc8e810bac 100644 --- a/htdocs/core/class/link.class.php +++ b/htdocs/core/class/link.class.php @@ -386,5 +386,4 @@ class Link extends CommonObject return -1; } } - } diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php index d1276610830..5078d7759ea 100644 --- a/htdocs/core/class/menubase.class.php +++ b/htdocs/core/class/menubase.class.php @@ -694,5 +694,4 @@ class Menubase } } } - } diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php index f5c0020bac1..8087d316cf4 100644 --- a/htdocs/core/class/notify.class.php +++ b/htdocs/core/class/notify.class.php @@ -729,6 +729,5 @@ class Notify if (! $error) return $num; else return -1 * $error; } - } diff --git a/htdocs/core/class/openid.class.php b/htdocs/core/class/openid.class.php index 7d36df58b81..b03bfdf20ab 100644 --- a/htdocs/core/class/openid.class.php +++ b/htdocs/core/class/openid.class.php @@ -524,5 +524,4 @@ class SimpleOpenID return $server; } } - } diff --git a/htdocs/core/class/rssparser.class.php b/htdocs/core/class/rssparser.class.php index 587575ccd49..f4c555e6951 100644 --- a/htdocs/core/class/rssparser.class.php +++ b/htdocs/core/class/rssparser.class.php @@ -729,7 +729,6 @@ class RssParser } } - } diff --git a/htdocs/core/class/smtps.class.php b/htdocs/core/class/smtps.class.php index ea7d5a769fa..093f6db6889 100644 --- a/htdocs/core/class/smtps.class.php +++ b/htdocs/core/class/smtps.class.php @@ -1841,8 +1841,6 @@ class SMTPs return implode("\n", $_errMsg); } - - } diff --git a/htdocs/core/class/vcard.class.php b/htdocs/core/class/vcard.class.php index 81fcb25e2b4..c3dc5547d88 100644 --- a/htdocs/core/class/vcard.class.php +++ b/htdocs/core/class/vcard.class.php @@ -330,5 +330,4 @@ class vCard { return $this->filename; } - } diff --git a/htdocs/core/class/workboardresponse.class.php b/htdocs/core/class/workboardresponse.class.php index 62d84e11186..35449693599 100644 --- a/htdocs/core/class/workboardresponse.class.php +++ b/htdocs/core/class/workboardresponse.class.php @@ -72,5 +72,4 @@ class WorkboardResponse * @var int */ public $total = 0; - } diff --git a/htdocs/core/db/Database.interface.php b/htdocs/core/db/Database.interface.php index b0ad770532b..4e6362786e3 100644 --- a/htdocs/core/db/Database.interface.php +++ b/htdocs/core/db/Database.interface.php @@ -464,5 +464,4 @@ interface Database * @return boolean true if OK, false if KO */ function select_db($database); - } diff --git a/htdocs/core/db/mssql.class.php b/htdocs/core/db/mssql.class.php index be980c306ec..4560ba1e45a 100644 --- a/htdocs/core/db/mssql.class.php +++ b/htdocs/core/db/mssql.class.php @@ -1176,5 +1176,4 @@ class DoliDBMssql extends DoliDB return $result; } - } diff --git a/htdocs/core/db/sqlite3.class.php b/htdocs/core/db/sqlite3.class.php index a08756f786a..bd5f927105f 100644 --- a/htdocs/core/db/sqlite3.class.php +++ b/htdocs/core/db/sqlite3.class.php @@ -1389,5 +1389,4 @@ class DoliDBSqlite3 extends DoliDB } return floor($days/7+1); } - } diff --git a/htdocs/core/menus/standard/eldy_menu.php b/htdocs/core/menus/standard/eldy_menu.php index dd919fd20a3..fa6e1b3084d 100644 --- a/htdocs/core/menus/standard/eldy_menu.php +++ b/htdocs/core/menus/standard/eldy_menu.php @@ -335,6 +335,5 @@ class MenuManager //print 'xx'.$mode; return 0; } - } diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php index c810405d42b..a7f9e9b09b2 100644 --- a/htdocs/core/modules/DolibarrModules.class.php +++ b/htdocs/core/modules/DolibarrModules.class.php @@ -32,7 +32,7 @@ * * Parent class for module descriptor class files */ -class DolibarrModules // Can not be abstract, because we need to instantiate it into unActivateModule to be able to disable a module whose files were removed. +class DolibarrModules // Can not be abstract, because we need to instantiate it into unActivateModule to be able to disable a module whose files were removed. { /** * @var DoliDb Database handler diff --git a/htdocs/core/modules/bank/doc/pdf_ban.modules.php b/htdocs/core/modules/bank/doc/pdf_ban.modules.php index 8b1a9d165ef..3ffbce56575 100644 --- a/htdocs/core/modules/bank/doc/pdf_ban.modules.php +++ b/htdocs/core/modules/bank/doc/pdf_ban.modules.php @@ -383,6 +383,5 @@ class pdf_ban extends ModeleBankAccountDoc $showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS; //return pdf_pagefoot($pdf,$outputlangs,'BANK_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext); } - } diff --git a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php index 5ec25f994df..660c2f80a00 100644 --- a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php +++ b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php @@ -608,6 +608,5 @@ class pdf_sepamandate extends ModeleBankAccountDoc $showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS; return pdf_pagefoot($pdf,$outputlangs,'PAYMENTORDER_FREE_TEXT',null,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext); } - } diff --git a/htdocs/core/modules/barcode/doc/phpbarcode.modules.php b/htdocs/core/modules/barcode/doc/phpbarcode.modules.php index 17a98d9cd77..2cca0e8927d 100644 --- a/htdocs/core/modules/barcode/doc/phpbarcode.modules.php +++ b/htdocs/core/modules/barcode/doc/phpbarcode.modules.php @@ -171,5 +171,4 @@ class modPhpbarcode extends ModeleBarCode return $result; } - } diff --git a/htdocs/core/modules/barcode/mod_barcode_product_standard.php b/htdocs/core/modules/barcode/mod_barcode_product_standard.php index f494219c445..c7580715b87 100644 --- a/htdocs/core/modules/barcode/mod_barcode_product_standard.php +++ b/htdocs/core/modules/barcode/mod_barcode_product_standard.php @@ -299,6 +299,5 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode return $result; } - } diff --git a/htdocs/core/modules/barcode/modules_barcode.class.php b/htdocs/core/modules/barcode/modules_barcode.class.php index 279a5f0abf8..44d7eccbb07 100644 --- a/htdocs/core/modules/barcode/modules_barcode.class.php +++ b/htdocs/core/modules/barcode/modules_barcode.class.php @@ -44,7 +44,6 @@ abstract class ModeleBarCode { return true; } - } @@ -177,6 +176,5 @@ abstract class ModeleNumRefBarCode return $s; } - } diff --git a/htdocs/core/modules/cheque/mod_chequereceipt_mint.php b/htdocs/core/modules/cheque/mod_chequereceipt_mint.php index 8906bdcc14f..6b5386c11a2 100644 --- a/htdocs/core/modules/cheque/mod_chequereceipt_mint.php +++ b/htdocs/core/modules/cheque/mod_chequereceipt_mint.php @@ -149,5 +149,4 @@ class mod_chequereceipt_mint extends ModeleNumRefChequeReceipts { return $this->getNextValue($objsoc,$objforref); } - } diff --git a/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php b/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php index 69ee2ff2b73..1632aa7c74b 100644 --- a/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php +++ b/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php @@ -135,6 +135,5 @@ class mod_chequereceipt_thyme extends ModeleNumRefChequeReceipts { return $this->getNextValue($objsoc,$objforref); } - } diff --git a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php index 4c8b4ba2dc5..6506a1d6c22 100644 --- a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php +++ b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php @@ -494,6 +494,5 @@ class doc_generic_order_odt extends ModelePDFCommandes return -1; } - } diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php index 224688b9982..0bd94a81a2e 100644 --- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php +++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php @@ -1440,6 +1440,5 @@ class pdf_einstein extends ModelePDFCommandes $showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS; return pdf_pagefoot($pdf,$outputlangs,'ORDER_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext); } - } diff --git a/htdocs/core/modules/commande/doc/pdf_proforma.modules.php b/htdocs/core/modules/commande/doc/pdf_proforma.modules.php index 918b338aa12..97ae9fea845 100644 --- a/htdocs/core/modules/commande/doc/pdf_proforma.modules.php +++ b/htdocs/core/modules/commande/doc/pdf_proforma.modules.php @@ -73,6 +73,5 @@ class pdf_proforma extends pdf_einstein parent::_pagehead($pdf, $object, $showaddress, $outputlangs, $titlekey); } - } diff --git a/htdocs/core/modules/commande/mod_commande_marbre.php b/htdocs/core/modules/commande/mod_commande_marbre.php index 69c25f73d68..b2ca7da5393 100644 --- a/htdocs/core/modules/commande/mod_commande_marbre.php +++ b/htdocs/core/modules/commande/mod_commande_marbre.php @@ -149,5 +149,4 @@ class mod_commande_marbre extends ModeleNumRefCommandes { return $this->getNextValue($objsoc,$objforref); } - } diff --git a/htdocs/core/modules/commande/mod_commande_saphir.php b/htdocs/core/modules/commande/mod_commande_saphir.php index 2c8ae2ef3e9..5303028e7f1 100644 --- a/htdocs/core/modules/commande/mod_commande_saphir.php +++ b/htdocs/core/modules/commande/mod_commande_saphir.php @@ -143,6 +143,5 @@ class mod_commande_saphir extends ModeleNumRefCommandes { return $this->getNextValue($objsoc,$objforref); } - } diff --git a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php index cd96e880d27..7fba0dd5211 100644 --- a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php +++ b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php @@ -477,6 +477,5 @@ class doc_generic_contract_odt extends ModelePDFContract return -1; } - } diff --git a/htdocs/core/modules/contract/doc/pdf_strato.modules.php b/htdocs/core/modules/contract/doc/pdf_strato.modules.php index 62fa2c73138..a18782d925e 100644 --- a/htdocs/core/modules/contract/doc/pdf_strato.modules.php +++ b/htdocs/core/modules/contract/doc/pdf_strato.modules.php @@ -719,5 +719,4 @@ class pdf_strato extends ModelePDFContract $showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS; return pdf_pagefoot($pdf,$outputlangs,'CONTRACT_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext); } - } diff --git a/htdocs/core/modules/contract/mod_contract_magre.php b/htdocs/core/modules/contract/mod_contract_magre.php index 54da8fc55c4..6415d6ffd8e 100644 --- a/htdocs/core/modules/contract/mod_contract_magre.php +++ b/htdocs/core/modules/contract/mod_contract_magre.php @@ -128,6 +128,5 @@ class mod_contract_magre extends ModelNumRefContracts { return $this->getNextValue($objsoc,$objforref); } - } diff --git a/htdocs/core/modules/contract/mod_contract_serpis.php b/htdocs/core/modules/contract/mod_contract_serpis.php index 1f85e4d57fc..9df92c21a35 100644 --- a/htdocs/core/modules/contract/mod_contract_serpis.php +++ b/htdocs/core/modules/contract/mod_contract_serpis.php @@ -146,5 +146,4 @@ class mod_contract_serpis extends ModelNumRefContracts { return $this->getNextValue($objsoc,$objforref); } - } diff --git a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php index 9c45c135ac3..2fcb8ea3017 100644 --- a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php +++ b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php @@ -535,6 +535,5 @@ class doc_generic_shipment_odt extends ModelePdfExpedition return -1; } - } diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php index af534ec1571..9386b3aa33f 100644 --- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php +++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php @@ -1097,5 +1097,4 @@ class pdf_rouget extends ModelePdfExpedition $showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS; return pdf_pagefoot($pdf,$outputlangs,'SHIPPING_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext); } - } diff --git a/htdocs/core/modules/expedition/mod_expedition_ribera.php b/htdocs/core/modules/expedition/mod_expedition_ribera.php index c002da1eee2..7a02f130ea6 100644 --- a/htdocs/core/modules/expedition/mod_expedition_ribera.php +++ b/htdocs/core/modules/expedition/mod_expedition_ribera.php @@ -132,6 +132,5 @@ class mod_expedition_ribera extends ModelNumRefExpedition { return $this->getNextValue($objsoc,$objforref); } - } diff --git a/htdocs/core/modules/expedition/mod_expedition_safor.php b/htdocs/core/modules/expedition/mod_expedition_safor.php index e9e0adc7e39..23eb97b4783 100644 --- a/htdocs/core/modules/expedition/mod_expedition_safor.php +++ b/htdocs/core/modules/expedition/mod_expedition_safor.php @@ -144,5 +144,4 @@ class mod_expedition_safor extends ModelNumRefExpedition { return $this->getNextValue($objsoc,$objforref); } - } diff --git a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php index e974f72fabd..d52978a6da3 100644 --- a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php +++ b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php @@ -916,5 +916,4 @@ class pdf_standard extends ModeleExpenseReport $showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS; return pdf_pagefoot($pdf,$outputlangs,'EXPENSEREPORT_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext); } - } diff --git a/htdocs/core/modules/expensereport/modules_expensereport.php b/htdocs/core/modules/expensereport/modules_expensereport.php index f60899eee0a..f0e3b6ca6cf 100644 --- a/htdocs/core/modules/expensereport/modules_expensereport.php +++ b/htdocs/core/modules/expensereport/modules_expensereport.php @@ -48,7 +48,6 @@ abstract class ModeleExpenseReport extends CommonDocGenerator return $liste; } - } /** diff --git a/htdocs/core/modules/export/export_csv.modules.php b/htdocs/core/modules/export/export_csv.modules.php index 77f754a504b..3f16b398f75 100644 --- a/htdocs/core/modules/export/export_csv.modules.php +++ b/htdocs/core/modules/export/export_csv.modules.php @@ -344,6 +344,5 @@ class ExportCsv extends ModeleExports return ($addquote?'"':'').$newvalue.($addquote?'"':''); } - } diff --git a/htdocs/core/modules/export/export_excel2007.modules.php b/htdocs/core/modules/export/export_excel2007.modules.php index 5196561f099..578f2323857 100644 --- a/htdocs/core/modules/export/export_excel2007.modules.php +++ b/htdocs/core/modules/export/export_excel2007.modules.php @@ -121,6 +121,5 @@ class ExportExcel2007 extends ExportExcel } return 1; } - } diff --git a/htdocs/core/modules/export/export_tsv.modules.php b/htdocs/core/modules/export/export_tsv.modules.php index 57a074af550..ff5aa403015 100644 --- a/htdocs/core/modules/export/export_tsv.modules.php +++ b/htdocs/core/modules/export/export_tsv.modules.php @@ -295,6 +295,5 @@ class ExportTsv extends ModeleExports return $newvalue; } - } diff --git a/htdocs/core/modules/export/modules_export.php b/htdocs/core/modules/export/modules_export.php index c154420f554..4222a9b2876 100644 --- a/htdocs/core/modules/export/modules_export.php +++ b/htdocs/core/modules/export/modules_export.php @@ -162,7 +162,6 @@ class ModeleExports extends CommonDocGenerator // This class can't be abstrac { return $this->libversion[$key]; } - } diff --git a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php index 21c25913543..11019604610 100644 --- a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php +++ b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php @@ -502,6 +502,5 @@ class doc_generic_invoice_odt extends ModelePDFFactures return -1; } - } diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php index 3762cfc2d0a..99368305a11 100644 --- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php @@ -1840,5 +1840,4 @@ class pdf_crabe extends ModelePDFFactures $showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS; return pdf_pagefoot($pdf,$outputlangs,'INVOICE_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext); } - } diff --git a/htdocs/core/modules/facture/mod_facture_mars.php b/htdocs/core/modules/facture/mod_facture_mars.php index c6bba0a6232..5a2d1281385 100644 --- a/htdocs/core/modules/facture/mod_facture_mars.php +++ b/htdocs/core/modules/facture/mod_facture_mars.php @@ -219,6 +219,5 @@ class mod_facture_mars extends ModeleNumRefFactures { return $this->getNextValue($objsoc,$objforref,$mode); } - } diff --git a/htdocs/core/modules/facture/mod_facture_mercure.php b/htdocs/core/modules/facture/mod_facture_mercure.php index 86e7eb10521..89c526bc334 100644 --- a/htdocs/core/modules/facture/mod_facture_mercure.php +++ b/htdocs/core/modules/facture/mod_facture_mercure.php @@ -175,5 +175,4 @@ class mod_facture_mercure extends ModeleNumRefFactures { return $this->getNextValue($objsoc,$objforref,$mode); } - } diff --git a/htdocs/core/modules/facture/mod_facture_terre.php b/htdocs/core/modules/facture/mod_facture_terre.php index 53ae127b734..524eeebdd5f 100644 --- a/htdocs/core/modules/facture/mod_facture_terre.php +++ b/htdocs/core/modules/facture/mod_facture_terre.php @@ -235,6 +235,5 @@ class mod_facture_terre extends ModeleNumRefFactures { return $this->getNextValue($objsoc,$objforref,$mode); } - } diff --git a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php index e542c564fd6..f7c97f0a25d 100644 --- a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php +++ b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php @@ -730,5 +730,4 @@ class pdf_soleil extends ModelePDFFicheinter $showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS; return pdf_pagefoot($pdf,$outputlangs,'FICHINTER_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext); } - } diff --git a/htdocs/core/modules/fichinter/mod_arctic.php b/htdocs/core/modules/fichinter/mod_arctic.php index 278e20ae7de..3e6193e0740 100644 --- a/htdocs/core/modules/fichinter/mod_arctic.php +++ b/htdocs/core/modules/fichinter/mod_arctic.php @@ -137,6 +137,5 @@ class mod_arctic extends ModeleNumRefFicheinter { return $this->getNextValue($objsoc,$objforref); } - } diff --git a/htdocs/core/modules/fichinter/mod_pacific.php b/htdocs/core/modules/fichinter/mod_pacific.php index 2461d8a074d..1f002e174ce 100644 --- a/htdocs/core/modules/fichinter/mod_pacific.php +++ b/htdocs/core/modules/fichinter/mod_pacific.php @@ -145,6 +145,5 @@ class mod_pacific extends ModeleNumRefFicheinter { return $this->getNextValue($objsoc,$objforref); } - } diff --git a/htdocs/core/modules/holiday/mod_holiday_madonna.php b/htdocs/core/modules/holiday/mod_holiday_madonna.php index 9031c31036d..e2cb938df4b 100644 --- a/htdocs/core/modules/holiday/mod_holiday_madonna.php +++ b/htdocs/core/modules/holiday/mod_holiday_madonna.php @@ -147,5 +147,4 @@ class mod_holiday_madonna extends ModelNumRefHolidays { return $this->getNextValue($fuser,$objforref); } - } diff --git a/htdocs/core/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php index 5f8776b9cbc..dd9e6622cd8 100644 --- a/htdocs/core/modules/import/import_csv.modules.php +++ b/htdocs/core/modules/import/import_csv.modules.php @@ -758,7 +758,6 @@ class ImportCsv extends ModeleImports return 1; } - } /** diff --git a/htdocs/core/modules/import/import_xlsx.modules.php b/htdocs/core/modules/import/import_xlsx.modules.php index 1c0116d92ad..c95fec3965c 100644 --- a/htdocs/core/modules/import/import_xlsx.modules.php +++ b/htdocs/core/modules/import/import_xlsx.modules.php @@ -782,5 +782,4 @@ class ImportXlsx extends ModeleImports return 1; } - } diff --git a/htdocs/core/modules/import/modules_import.php b/htdocs/core/modules/import/modules_import.php index 7c26fdb68d3..465579bcf7d 100644 --- a/htdocs/core/modules/import/modules_import.php +++ b/htdocs/core/modules/import/modules_import.php @@ -250,6 +250,5 @@ class ModeleImports { return $this->libversion[$key]; } - } diff --git a/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php b/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php index 79cb4c4961c..6dab1808085 100644 --- a/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php +++ b/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php @@ -951,5 +951,4 @@ class pdf_typhon extends ModelePDFDeliveryOrder $showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS; return pdf_pagefoot($pdf,$outputlangs,'DELIVERY_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext); } - } diff --git a/htdocs/core/modules/livraison/mod_livraison_jade.php b/htdocs/core/modules/livraison/mod_livraison_jade.php index 228b73aad8b..1b3e3efa836 100644 --- a/htdocs/core/modules/livraison/mod_livraison_jade.php +++ b/htdocs/core/modules/livraison/mod_livraison_jade.php @@ -153,5 +153,4 @@ class mod_livraison_jade extends ModeleNumRefDeliveryOrder { return $this->getNextValue($objsoc,$object); } - } diff --git a/htdocs/core/modules/livraison/mod_livraison_saphir.php b/htdocs/core/modules/livraison/mod_livraison_saphir.php index 1192656bf8d..880f5eb81e5 100644 --- a/htdocs/core/modules/livraison/mod_livraison_saphir.php +++ b/htdocs/core/modules/livraison/mod_livraison_saphir.php @@ -150,6 +150,5 @@ class mod_livraison_saphir extends ModeleNumRefDeliveryOrder { return $this->getNextValue($objsoc,$object); } - } diff --git a/htdocs/core/modules/mailings/advthirdparties.modules.php b/htdocs/core/modules/mailings/advthirdparties.modules.php index 53ca23a9880..6c8b2ce9a4f 100644 --- a/htdocs/core/modules/mailings/advthirdparties.modules.php +++ b/htdocs/core/modules/mailings/advthirdparties.modules.php @@ -299,5 +299,4 @@ class mailing_advthirdparties extends MailingTargets return $contactstatic->getNomUrl(0, '', 0, '', -1, 1); } } - } diff --git a/htdocs/core/modules/mailings/contacts1.modules.php b/htdocs/core/modules/mailings/contacts1.modules.php index af0d1103e4e..3aa3f4f8386 100644 --- a/htdocs/core/modules/mailings/contacts1.modules.php +++ b/htdocs/core/modules/mailings/contacts1.modules.php @@ -449,6 +449,5 @@ class mailing_contacts1 extends MailingTargets return parent::add_to_target($mailing_id, $cibles); } - } diff --git a/htdocs/core/modules/mailings/example.modules.php b/htdocs/core/modules/mailings/example.modules.php index beeadebeecd..e4afb7e5117 100644 --- a/htdocs/core/modules/mailings/example.modules.php +++ b/htdocs/core/modules/mailings/example.modules.php @@ -146,5 +146,4 @@ class mailing_example extends MailingTargets return ''; } - } diff --git a/htdocs/core/modules/mailings/fraise.modules.php b/htdocs/core/modules/mailings/fraise.modules.php index 9d6e2505f92..8bba238e227 100644 --- a/htdocs/core/modules/mailings/fraise.modules.php +++ b/htdocs/core/modules/mailings/fraise.modules.php @@ -319,5 +319,4 @@ class mailing_fraise extends MailingTargets return parent::add_to_target($mailing_id, $cibles); } - } diff --git a/htdocs/core/modules/mailings/modules_mailings.php b/htdocs/core/modules/mailings/modules_mailings.php index 1035d3bf765..590806a591d 100644 --- a/htdocs/core/modules/mailings/modules_mailings.php +++ b/htdocs/core/modules/mailings/modules_mailings.php @@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php'; /** * Parent class of emailing target selectors modules */ -class MailingTargets // This can't be abstract as it is used for some method +class MailingTargets // This can't be abstract as it is used for some method { /** * @var DoliDB Database handler. @@ -250,6 +250,5 @@ class MailingTargets // This can't be abstract as it is used for some method $this->update_nb($mailing_id); } - } diff --git a/htdocs/core/modules/mailings/pomme.modules.php b/htdocs/core/modules/mailings/pomme.modules.php index 21250bf693d..e1e98323fc9 100644 --- a/htdocs/core/modules/mailings/pomme.modules.php +++ b/htdocs/core/modules/mailings/pomme.modules.php @@ -223,5 +223,4 @@ class mailing_pomme extends MailingTargets return parent::add_to_target($mailing_id, $cibles); } - } diff --git a/htdocs/core/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php index 523f26290b7..a91713c25c4 100644 --- a/htdocs/core/modules/mailings/thirdparties.modules.php +++ b/htdocs/core/modules/mailings/thirdparties.modules.php @@ -322,6 +322,5 @@ class mailing_thirdparties extends MailingTargets { return ''.img_object('',"company").''; } - } diff --git a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php index 0135227b461..ef057aa1837 100644 --- a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php +++ b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php @@ -241,6 +241,5 @@ class mailing_thirdparties_services_expired extends MailingTargets { return ''.img_object('',"company").''; } - } diff --git a/htdocs/core/modules/mailings/xinputfile.modules.php b/htdocs/core/modules/mailings/xinputfile.modules.php index 152322c2899..4c51ad22045 100644 --- a/htdocs/core/modules/mailings/xinputfile.modules.php +++ b/htdocs/core/modules/mailings/xinputfile.modules.php @@ -220,6 +220,5 @@ class mailing_xinputfile extends MailingTargets return parent::add_to_target($mailing_id, $cibles); } - } diff --git a/htdocs/core/modules/mailings/xinputuser.modules.php b/htdocs/core/modules/mailings/xinputuser.modules.php index f733f6de134..24ae911a19c 100644 --- a/htdocs/core/modules/mailings/xinputuser.modules.php +++ b/htdocs/core/modules/mailings/xinputuser.modules.php @@ -158,6 +158,5 @@ class mailing_xinputuser extends MailingTargets return -1; } } - } diff --git a/htdocs/core/modules/member/doc/pdf_standard.class.php b/htdocs/core/modules/member/doc/pdf_standard.class.php index 6a723ce0553..ddabe9846cc 100644 --- a/htdocs/core/modules/member/doc/pdf_standard.class.php +++ b/htdocs/core/modules/member/doc/pdf_standard.class.php @@ -441,5 +441,4 @@ class pdf_standard extends CommonStickerGenerator return 1; } - } diff --git a/htdocs/core/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php index 405e60c0190..525c27488a7 100644 --- a/htdocs/core/modules/modAgenda.class.php +++ b/htdocs/core/modules/modAgenda.class.php @@ -420,5 +420,4 @@ class modAgenda extends DolibarrModules if (empty($user->rights->agenda->allactions->read)) $this->export_sql_end[$r] .=' AND acr.fk_element = '.(empty($user)?0:$user->id); $this->export_sql_end[$r] .=' ORDER BY ac.datep'; } - } diff --git a/htdocs/core/modules/modAsset.class.php b/htdocs/core/modules/modAsset.class.php index d6a50ab9b07..ada71ef0aaf 100644 --- a/htdocs/core/modules/modAsset.class.php +++ b/htdocs/core/modules/modAsset.class.php @@ -335,5 +335,4 @@ class modAsset extends DolibarrModules return $this->_init($sql,$options); } - } diff --git a/htdocs/core/modules/modDav.class.php b/htdocs/core/modules/modDav.class.php index f6c34f030a0..30636e23365 100644 --- a/htdocs/core/modules/modDav.class.php +++ b/htdocs/core/modules/modDav.class.php @@ -324,5 +324,4 @@ class modDav extends DolibarrModules return $this->_remove($sql, $options); } - } diff --git a/htdocs/core/modules/modExternalRss.class.php b/htdocs/core/modules/modExternalRss.class.php index cf02888b9d2..8d1bf055673 100644 --- a/htdocs/core/modules/modExternalRss.class.php +++ b/htdocs/core/modules/modExternalRss.class.php @@ -135,5 +135,4 @@ class modExternalRss extends DolibarrModules return $this->_remove($sql,$options); } - } diff --git a/htdocs/core/modules/modReceiptPrinter.class.php b/htdocs/core/modules/modReceiptPrinter.class.php index 1622b2a8766..df151e63ad3 100644 --- a/htdocs/core/modules/modReceiptPrinter.class.php +++ b/htdocs/core/modules/modReceiptPrinter.class.php @@ -141,5 +141,4 @@ class modReceiptPrinter extends DolibarrModules ); return $this->_init($sql,$options); } - } diff --git a/htdocs/core/modules/modSupplierProposal.class.php b/htdocs/core/modules/modSupplierProposal.class.php index bb3cda6a837..ca8f5960f03 100644 --- a/htdocs/core/modules/modSupplierProposal.class.php +++ b/htdocs/core/modules/modSupplierProposal.class.php @@ -257,5 +257,4 @@ class modSupplierProposal extends DolibarrModules return $this->_remove($sql, $options); } - } \ No newline at end of file diff --git a/htdocs/core/modules/modTicket.class.php b/htdocs/core/modules/modTicket.class.php index bc871d9c0e0..e567ffc8367 100644 --- a/htdocs/core/modules/modTicket.class.php +++ b/htdocs/core/modules/modTicket.class.php @@ -305,5 +305,4 @@ class modTicket extends DolibarrModules return $this->_init($sql, $options); } - } diff --git a/htdocs/core/modules/payment/mod_payment_ant.php b/htdocs/core/modules/payment/mod_payment_ant.php index a09ad2355e4..7fd4e06bd46 100644 --- a/htdocs/core/modules/payment/mod_payment_ant.php +++ b/htdocs/core/modules/payment/mod_payment_ant.php @@ -135,6 +135,5 @@ class mod_payment_ant extends ModeleNumRefPayments { return $this->getNextValue($objsoc,$objforref); } - } diff --git a/htdocs/core/modules/payment/mod_payment_cicada.php b/htdocs/core/modules/payment/mod_payment_cicada.php index 5111d0fc9be..b103a3af50d 100644 --- a/htdocs/core/modules/payment/mod_payment_cicada.php +++ b/htdocs/core/modules/payment/mod_payment_cicada.php @@ -149,5 +149,4 @@ class mod_payment_cicada extends ModeleNumRefPayments { return $this->getNextValue($objsoc,$objforref); } - } diff --git a/htdocs/core/modules/printing/modules_printing.php b/htdocs/core/modules/printing/modules_printing.php index 8205dc5a705..7a58d6af137 100644 --- a/htdocs/core/modules/printing/modules_printing.php +++ b/htdocs/core/modules/printing/modules_printing.php @@ -88,6 +88,5 @@ class PrintingDriver if ($langs->trans($transstring) != $transstring) return $langs->trans($transstring); else return $this->desc; } - } diff --git a/htdocs/core/modules/printing/printgcp.modules.php b/htdocs/core/modules/printing/printgcp.modules.php index b85e4823bba..c7e3bbb33b3 100644 --- a/htdocs/core/modules/printing/printgcp.modules.php +++ b/htdocs/core/modules/printing/printgcp.modules.php @@ -512,5 +512,4 @@ class printing_printgcp extends PrintingDriver return $error; } - } diff --git a/htdocs/core/modules/printing/printipp.modules.php b/htdocs/core/modules/printing/printipp.modules.php index e51aa4e5c63..e4402bcd891 100644 --- a/htdocs/core/modules/printing/printipp.modules.php +++ b/htdocs/core/modules/printing/printipp.modules.php @@ -314,5 +314,4 @@ class printing_printipp extends PrintingDriver $this->resprint = $html; return $error; } - } diff --git a/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php b/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php index c447639cfe1..5d67cca2513 100644 --- a/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php +++ b/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php @@ -499,6 +499,5 @@ class doc_generic_product_odt extends ModelePDFProduct return -1; } - } diff --git a/htdocs/core/modules/product/doc/pdf_standard.modules.php b/htdocs/core/modules/product/doc/pdf_standard.modules.php index 7e53bab7133..7e27a0311b6 100644 --- a/htdocs/core/modules/product/doc/pdf_standard.modules.php +++ b/htdocs/core/modules/product/doc/pdf_standard.modules.php @@ -834,6 +834,5 @@ class pdf_standard extends ModelePDFProduct $showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS; return pdf_pagefoot($pdf,$outputlangs,'PRODUCT_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext); } - } diff --git a/htdocs/core/modules/product/mod_codeproduct_elephant.php b/htdocs/core/modules/product/mod_codeproduct_elephant.php index ec31adfb609..2adcdad19fc 100644 --- a/htdocs/core/modules/product/mod_codeproduct_elephant.php +++ b/htdocs/core/modules/product/mod_codeproduct_elephant.php @@ -304,6 +304,5 @@ class mod_codeproduct_elephant extends ModeleProductCode return -2; } } - } diff --git a/htdocs/core/modules/product/modules_product.class.php b/htdocs/core/modules/product/modules_product.class.php index 3b0324a8460..c467877b900 100644 --- a/htdocs/core/modules/product/modules_product.class.php +++ b/htdocs/core/modules/product/modules_product.class.php @@ -246,6 +246,5 @@ abstract class ModeleProductCode { return 0; } - } diff --git a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php index ce2d0fec7d3..b30b8af4a7c 100644 --- a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php +++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php @@ -1181,5 +1181,4 @@ class doc_generic_project_odt extends ModelePDFProjects return -1; } - } diff --git a/htdocs/core/modules/project/doc/pdf_baleine.modules.php b/htdocs/core/modules/project/doc/pdf_baleine.modules.php index 44683111e5a..826afc67c4d 100644 --- a/htdocs/core/modules/project/doc/pdf_baleine.modules.php +++ b/htdocs/core/modules/project/doc/pdf_baleine.modules.php @@ -671,5 +671,4 @@ class pdf_baleine extends ModelePDFProjects $showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS; return pdf_pagefoot($pdf,$outputlangs,'PROJECT_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext); } - } diff --git a/htdocs/core/modules/project/doc/pdf_beluga.modules.php b/htdocs/core/modules/project/doc/pdf_beluga.modules.php index 330aefd5c67..1d70f8b4f4f 100644 --- a/htdocs/core/modules/project/doc/pdf_beluga.modules.php +++ b/htdocs/core/modules/project/doc/pdf_beluga.modules.php @@ -794,5 +794,4 @@ class pdf_beluga extends ModelePDFProjects $showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS; return pdf_pagefoot($pdf,$outputlangs,'PROJECT_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext); } - } diff --git a/htdocs/core/modules/project/doc/pdf_timespent.modules.php b/htdocs/core/modules/project/doc/pdf_timespent.modules.php index a03b1ee8a57..512ca470cf0 100644 --- a/htdocs/core/modules/project/doc/pdf_timespent.modules.php +++ b/htdocs/core/modules/project/doc/pdf_timespent.modules.php @@ -599,6 +599,5 @@ class pdf_timespent extends ModelePDFProjects $showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS; return pdf_pagefoot($pdf,$outputlangs,'PROJECT_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext); } - } diff --git a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php index 5f7ff754a65..f4a7b0b674e 100644 --- a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php +++ b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php @@ -843,5 +843,4 @@ class doc_generic_task_odt extends ModelePDFTask return -1; } - } diff --git a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php index 24477a67cc5..d7b79f8a42a 100644 --- a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php +++ b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php @@ -523,6 +523,5 @@ class doc_generic_proposal_odt extends ModelePDFPropales return -1; } - } diff --git a/htdocs/core/modules/propale/mod_propale_marbre.php b/htdocs/core/modules/propale/mod_propale_marbre.php index cac76d47b5a..fe63b28f843 100644 --- a/htdocs/core/modules/propale/mod_propale_marbre.php +++ b/htdocs/core/modules/propale/mod_propale_marbre.php @@ -155,5 +155,4 @@ class mod_propale_marbre extends ModeleNumRefPropales { return $this->getNextValue($objsoc,$objforref); } - } diff --git a/htdocs/core/modules/propale/mod_propale_saphir.php b/htdocs/core/modules/propale/mod_propale_saphir.php index 54d894c20b5..52dba1beac5 100644 --- a/htdocs/core/modules/propale/mod_propale_saphir.php +++ b/htdocs/core/modules/propale/mod_propale_saphir.php @@ -139,5 +139,4 @@ class mod_propale_saphir extends ModeleNumRefPropales return $numFinal; } - } diff --git a/htdocs/core/modules/security/generate/modGeneratePassNone.class.php b/htdocs/core/modules/security/generate/modGeneratePassNone.class.php index 384b956e85d..df3071f7b26 100644 --- a/htdocs/core/modules/security/generate/modGeneratePassNone.class.php +++ b/htdocs/core/modules/security/generate/modGeneratePassNone.class.php @@ -108,6 +108,5 @@ class modGeneratePassNone extends ModeleGenPassword { return 1; } - } diff --git a/htdocs/core/modules/security/generate/modules_genpassword.php b/htdocs/core/modules/security/generate/modules_genpassword.php index 60378cf03a4..e1f73b134be 100644 --- a/htdocs/core/modules/security/generate/modules_genpassword.php +++ b/htdocs/core/modules/security/generate/modules_genpassword.php @@ -89,6 +89,5 @@ abstract class ModeleGenPassword { return 1; } - } diff --git a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php index 6aa4267d827..c7af58c4f89 100644 --- a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php +++ b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php @@ -428,6 +428,5 @@ class doc_generic_odt extends ModeleThirdPartyDoc $this->error='UnknownError'; return -1; } - } diff --git a/htdocs/core/modules/societe/mod_codeclient_elephant.php b/htdocs/core/modules/societe/mod_codeclient_elephant.php index c9cc44c8479..a26b146db0d 100644 --- a/htdocs/core/modules/societe/mod_codeclient_elephant.php +++ b/htdocs/core/modules/societe/mod_codeclient_elephant.php @@ -324,6 +324,5 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode return -2; } } - } diff --git a/htdocs/core/modules/societe/mod_codeclient_monkey.php b/htdocs/core/modules/societe/mod_codeclient_monkey.php index f4d9e5b4b33..63e9ed0f7d6 100644 --- a/htdocs/core/modules/societe/mod_codeclient_monkey.php +++ b/htdocs/core/modules/societe/mod_codeclient_monkey.php @@ -269,6 +269,5 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode } return $res; } - } diff --git a/htdocs/core/modules/societe/modules_societe.class.php b/htdocs/core/modules/societe/modules_societe.class.php index c5a1901635b..8ca7173cc6e 100644 --- a/htdocs/core/modules/societe/modules_societe.class.php +++ b/htdocs/core/modules/societe/modules_societe.class.php @@ -57,7 +57,6 @@ abstract class ModeleThirdPartyDoc extends CommonDocGenerator return $liste; } - } /** @@ -251,7 +250,6 @@ abstract class ModeleThirdPartyCode { return 0; } - } diff --git a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php index 4b4a902cb96..6c48747f624 100644 --- a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php +++ b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php @@ -499,6 +499,5 @@ class doc_generic_stock_odt extends ModelePDFStock return -1; } - } diff --git a/htdocs/core/modules/stock/doc/pdf_standard.modules.php b/htdocs/core/modules/stock/doc/pdf_standard.modules.php index 9cc092875bf..9b3767eff03 100644 --- a/htdocs/core/modules/stock/doc/pdf_standard.modules.php +++ b/htdocs/core/modules/stock/doc/pdf_standard.modules.php @@ -1144,5 +1144,4 @@ class pdf_standard extends ModelePDFStock $showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS; return pdf_pagefoot($pdf,$outputlangs,'PRODUCT_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext); } - } diff --git a/htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php b/htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php index 3413a49549a..65a174f3d31 100644 --- a/htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php +++ b/htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php @@ -1146,6 +1146,5 @@ class pdf_stdmovement extends ModelePDFMovement $showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS; return pdf_pagefoot($pdf,$outputlangs,'PRODUCT_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext); } - } diff --git a/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php b/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php index edc3f3c7428..08ccd7f88e8 100644 --- a/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php +++ b/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php @@ -59,7 +59,6 @@ abstract class ModelePDFSuppliersInvoices extends CommonDocGenerator return $liste; } - } /** diff --git a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php index 158aecb8c49..ea51fb7c4f4 100644 --- a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php +++ b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php @@ -1245,5 +1245,4 @@ class pdf_canelle extends ModelePDFSuppliersInvoices $showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS; return pdf_pagefoot($pdf,$outputlangs,'SUPPLIER_INVOICE_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext); } - } diff --git a/htdocs/core/modules/supplier_order/modules_commandefournisseur.php b/htdocs/core/modules/supplier_order/modules_commandefournisseur.php index d20229fd650..c1ab8c8a64b 100644 --- a/htdocs/core/modules/supplier_order/modules_commandefournisseur.php +++ b/htdocs/core/modules/supplier_order/modules_commandefournisseur.php @@ -62,7 +62,6 @@ abstract class ModelePDFSuppliersOrders extends CommonDocGenerator return $liste; } - } diff --git a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php index 0b4e9a89dff..a0c49edd826 100644 --- a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php +++ b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php @@ -1370,6 +1370,5 @@ class pdf_muscadet extends ModelePDFSuppliersOrders $showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS; return pdf_pagefoot($pdf,$outputlangs,'SUPPLIER_ORDER_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext); } - } diff --git a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php index fcbb7094c3a..a7124de681b 100644 --- a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php +++ b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php @@ -810,5 +810,4 @@ class pdf_standard extends ModelePDFSuppliersPayments $showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS; return pdf_pagefoot($pdf,$outputlangs,'SUPPLIER_INVOICE_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext); } - } diff --git a/htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php b/htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php index 97c7b077b22..b73883f67cc 100644 --- a/htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php +++ b/htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php @@ -135,6 +135,5 @@ class mod_supplier_payment_brodator extends ModeleNumRefSupplierPayments { return $this->getNextValue($objsoc,$objforref); } - } diff --git a/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php b/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php index 94521f99c5e..46298845396 100644 --- a/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php +++ b/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php @@ -149,5 +149,4 @@ class mod_supplier_payment_bronan extends ModeleNumRefSupplierPayments { return $this->getNextValue($objsoc,$objforref); } - } diff --git a/htdocs/core/modules/supplier_payment/modules_supplier_payment.php b/htdocs/core/modules/supplier_payment/modules_supplier_payment.php index 7a6e26e770b..d3e43431007 100644 --- a/htdocs/core/modules/supplier_payment/modules_supplier_payment.php +++ b/htdocs/core/modules/supplier_payment/modules_supplier_payment.php @@ -47,7 +47,6 @@ abstract class ModelePDFSuppliersPayments extends CommonDocGenerator return $liste; } - } /** diff --git a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php index a8497416501..6f837ee0778 100644 --- a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php +++ b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php @@ -514,6 +514,5 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal return -1; } - } diff --git a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php index 4a594e71191..e8072558ea1 100644 --- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php +++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php @@ -1493,5 +1493,4 @@ class pdf_aurore extends ModelePDFSupplierProposal $showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS; return pdf_pagefoot($pdf,$outputlangs,'SUPPLIER_PROPOSAL_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext); } - } diff --git a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php index 372b3189292..b821805f1f9 100644 --- a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php +++ b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php @@ -152,5 +152,4 @@ class mod_supplier_proposal_marbre extends ModeleNumRefSupplierProposal { return $this->getNextValue($objsoc,$objforref); } - } diff --git a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php index 8781628917f..1a5995b8fc9 100644 --- a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php +++ b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php @@ -127,5 +127,4 @@ class mod_supplier_proposal_saphir extends ModeleNumRefSupplierProposal return $numFinal; } - } diff --git a/htdocs/core/modules/ticket/mod_ticket_simple.php b/htdocs/core/modules/ticket/mod_ticket_simple.php index b70b9babd05..aa8b4c4e3f5 100644 --- a/htdocs/core/modules/ticket/mod_ticket_simple.php +++ b/htdocs/core/modules/ticket/mod_ticket_simple.php @@ -140,5 +140,4 @@ class mod_ticket_simple extends ModeleNumRefTicket dol_syslog("mod_ticket_simple::getNextValue return " . $this->prefix . $yymm . "-" . $num); return $this->prefix . $yymm . "-" . $num; } - } diff --git a/htdocs/core/modules/ticket/mod_ticket_universal.php b/htdocs/core/modules/ticket/mod_ticket_universal.php index 2d521f18a5b..3371a071c8a 100644 --- a/htdocs/core/modules/ticket/mod_ticket_universal.php +++ b/htdocs/core/modules/ticket/mod_ticket_universal.php @@ -121,5 +121,4 @@ class mod_ticket_universal extends ModeleNumRefTicket return $numFinal; } - } diff --git a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php index 9e05292fb5a..5af00f7790a 100644 --- a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php +++ b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php @@ -432,5 +432,4 @@ class doc_generic_user_odt extends ModelePDFUser } return $array_other; } - } diff --git a/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php b/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php index 443981907e0..cc789d29d00 100644 --- a/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php +++ b/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php @@ -510,6 +510,5 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup return -1; } - } diff --git a/htdocs/core/triggers/dolibarrtriggers.class.php b/htdocs/core/triggers/dolibarrtriggers.class.php index f47daa0d419..a66eb12c78e 100644 --- a/htdocs/core/triggers/dolibarrtriggers.class.php +++ b/htdocs/core/triggers/dolibarrtriggers.class.php @@ -146,5 +146,4 @@ abstract class DolibarrTriggers * @return int <0 if KO, 0 if no triggered ran, >0 if OK */ abstract function runTrigger($action, $object, User $user, Translate $langs, Conf $conf); - } diff --git a/htdocs/core/triggers/interface_20_all_Logevents.class.php b/htdocs/core/triggers/interface_20_all_Logevents.class.php index c2f15bd336d..5bddfe2fd43 100644 --- a/htdocs/core/triggers/interface_20_all_Logevents.class.php +++ b/htdocs/core/triggers/interface_20_all_Logevents.class.php @@ -202,5 +202,4 @@ class InterfaceLogevents extends DolibarrTriggers return -1; } } - } diff --git a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php index 94aaaeaa542..4bd95caeb58 100644 --- a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php +++ b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php @@ -309,5 +309,4 @@ class InterfaceWorkflowManager extends DolibarrTriggers return 0; } - } diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php index 481df585f3a..0c509a1d5b3 100644 --- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php +++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php @@ -927,5 +927,4 @@ class InterfaceActionsAuto extends DolibarrTriggers return -1; } } - } diff --git a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php index 2750834bac6..a4ac9361a29 100644 --- a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php +++ b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php @@ -133,5 +133,4 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers return 1; } } - } diff --git a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php index 7677c1743a8..9ed11f41b97 100644 --- a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php +++ b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php @@ -799,5 +799,4 @@ class InterfaceLdapsynchro extends DolibarrTriggers return $result; } - } diff --git a/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php b/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php index c5f704fdcb1..ea3ae2c67aa 100644 --- a/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php +++ b/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php @@ -148,5 +148,4 @@ class InterfaceMailmanSpipsynchro extends DolibarrTriggers return 0; } - } diff --git a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php index 8698b08a5c3..8b4351499ce 100644 --- a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php +++ b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php @@ -131,5 +131,4 @@ class InterfaceNotification extends DolibarrTriggers return $ret; } - } diff --git a/htdocs/dav/dav.class.php b/htdocs/dav/dav.class.php index 7d6ea446493..3a7d4b84801 100644 --- a/htdocs/dav/dav.class.php +++ b/htdocs/dav/dav.class.php @@ -294,5 +294,4 @@ class CdavLib } return $calevents; } - } diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php index 1c22b27bfc4..de24f60a9c0 100644 --- a/htdocs/don/class/don.class.php +++ b/htdocs/don/class/don.class.php @@ -1045,5 +1045,4 @@ class Don extends CommonObject return 0; } } - } diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php index 93499706614..26b0f7cb7e1 100644 --- a/htdocs/ecm/class/ecmdirectory.class.php +++ b/htdocs/ecm/class/ecmdirectory.class.php @@ -787,6 +787,4 @@ class EcmDirectory // extends CommonObject } return $result; } - - } diff --git a/htdocs/expedition/class/expeditionbatch.class.php b/htdocs/expedition/class/expeditionbatch.class.php index 18a5fdbec6b..3fc821c7b85 100644 --- a/htdocs/expedition/class/expeditionbatch.class.php +++ b/htdocs/expedition/class/expeditionbatch.class.php @@ -236,5 +236,4 @@ class ExpeditionLineBatch extends CommonObject return -1; } } - } diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php index 0fb1ef518fb..9f54687dc8c 100644 --- a/htdocs/expensereport/class/expensereport.class.php +++ b/htdocs/expensereport/class/expensereport.class.php @@ -2374,7 +2374,6 @@ class ExpenseReport extends CommonObject } return 0; } - } diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php index 4725ea758d5..5b39e8cf292 100644 --- a/htdocs/exports/class/export.class.php +++ b/htdocs/exports/class/export.class.php @@ -874,6 +874,5 @@ class Export dol_print_error($this->db); } } - } diff --git a/htdocs/fichinter/class/api_interventions.class.php b/htdocs/fichinter/class/api_interventions.class.php index 7a258c8c864..3f3315b6028 100644 --- a/htdocs/fichinter/class/api_interventions.class.php +++ b/htdocs/fichinter/class/api_interventions.class.php @@ -455,6 +455,4 @@ class Interventions extends DolibarrApi } return $fichinter; } - - } diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php index f34bb56c540..78d67d97f11 100644 --- a/htdocs/fichinter/class/fichinter.class.php +++ b/htdocs/fichinter/class/fichinter.class.php @@ -1661,6 +1661,5 @@ class FichinterLigne extends CommonObjectLine return -2; } } - } diff --git a/htdocs/fichinter/class/fichinterstats.class.php b/htdocs/fichinter/class/fichinterstats.class.php index aa6d85d0c3f..40a1b7eef2f 100644 --- a/htdocs/fichinter/class/fichinterstats.class.php +++ b/htdocs/fichinter/class/fichinterstats.class.php @@ -210,6 +210,5 @@ class FichinterStats extends Stats return $this->_getAllByProduct($sql); } - } diff --git a/htdocs/fourn/class/fournisseur.class.php b/htdocs/fourn/class/fournisseur.class.php index a177fdd26a1..af30b6e2da2 100644 --- a/htdocs/fourn/class/fournisseur.class.php +++ b/htdocs/fourn/class/fournisseur.class.php @@ -206,6 +206,5 @@ class Fournisseur extends Societe } return $arr; } - } diff --git a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php index f81507141fb..9802e50d522 100644 --- a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php +++ b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php @@ -644,5 +644,4 @@ class CommandeFournisseurDispatch extends CommonObject return - 1; } } - } diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php index 098fba679f3..55e5feed730 100644 --- a/htdocs/fourn/class/fournisseur.product.class.php +++ b/htdocs/fourn/class/fournisseur.product.class.php @@ -864,5 +864,4 @@ class ProductFournisseur extends Product return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables); } - } diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php index 55c6a00d251..c0b0575e054 100644 --- a/htdocs/fourn/class/paiementfourn.class.php +++ b/htdocs/fourn/class/paiementfourn.class.php @@ -794,5 +794,4 @@ class PaiementFourn extends Paiement return parent::fetch_thirdparty($force_thirdparty_id); } - } diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php index 0f86476be04..2633969cfd3 100644 --- a/htdocs/holiday/class/holiday.class.php +++ b/htdocs/holiday/class/holiday.class.php @@ -1878,5 +1878,4 @@ class Holiday extends CommonObject $this->halfday=0; $this->fk_type=1; } - } diff --git a/htdocs/imports/class/import.class.php b/htdocs/imports/class/import.class.php index ae7cc240695..fdb0bc9bc45 100644 --- a/htdocs/imports/class/import.class.php +++ b/htdocs/imports/class/import.class.php @@ -356,5 +356,4 @@ class Import return 1; } } - } diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php index 763b28fb445..1d8b7fe761b 100644 --- a/htdocs/livraison/class/livraison.class.php +++ b/htdocs/livraison/class/livraison.class.php @@ -1056,7 +1056,6 @@ class Livraison extends CommonObject return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables); } - } @@ -1118,5 +1117,4 @@ class LivraisonLigne extends CommonObjectLine { $this->db=$db; } - } diff --git a/htdocs/mailmanspip/class/mailmanspip.class.php b/htdocs/mailmanspip/class/mailmanspip.class.php index 683e8c25414..99a834069a4 100644 --- a/htdocs/mailmanspip/class/mailmanspip.class.php +++ b/htdocs/mailmanspip/class/mailmanspip.class.php @@ -443,5 +443,4 @@ class MailmanSpip } } } - } diff --git a/htdocs/modulebuilder/template/class/actions_mymodule.class.php b/htdocs/modulebuilder/template/class/actions_mymodule.class.php index 789e4e469f9..45008aa76f3 100644 --- a/htdocs/modulebuilder/template/class/actions_mymodule.class.php +++ b/htdocs/modulebuilder/template/class/actions_mymodule.class.php @@ -240,5 +240,4 @@ class ActionsMyModule } /* Add here any other hooked methods... */ - } diff --git a/htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php b/htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php index 533f07b3ba2..563192218b8 100644 --- a/htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php +++ b/htdocs/modulebuilder/template/core/modules/mailings/mailinglist_mymodule_myobject.modules.php @@ -199,6 +199,5 @@ class mailing_mailinglist_mymodule_myobject extends MailingTargets if ($a < 0) return -1; return $a; } - } diff --git a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php index 8169cd9961f..5017e571ec1 100644 --- a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php +++ b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php @@ -350,5 +350,4 @@ class modMyModule extends DolibarrModules return $this->_remove($sql, $options); } - } diff --git a/htdocs/multicurrency/class/multicurrency.class.php b/htdocs/multicurrency/class/multicurrency.class.php index ea1f6b56dd5..2e3723ab667 100644 --- a/htdocs/multicurrency/class/multicurrency.class.php +++ b/htdocs/multicurrency/class/multicurrency.class.php @@ -939,5 +939,4 @@ class CurrencyRate extends CommonObjectLine return 1; } } - } diff --git a/htdocs/opensurvey/class/opensurveysondage.class.php b/htdocs/opensurvey/class/opensurveysondage.class.php index 5d3129f1585..e32a82103d4 100644 --- a/htdocs/opensurvey/class/opensurveysondage.class.php +++ b/htdocs/opensurvey/class/opensurveysondage.class.php @@ -671,5 +671,4 @@ class Opensurveysondage extends CommonObject if ($status==self::STATUS_CLOSED) return ''.$langs->trans('Closed').' '.img_picto($langs->trans('Closed'),'statut6'); } } - } diff --git a/htdocs/product/canvas/product/actions_card_product.class.php b/htdocs/product/canvas/product/actions_card_product.class.php index c0722fcd765..f0d9dd14a4d 100644 --- a/htdocs/product/canvas/product/actions_card_product.class.php +++ b/htdocs/product/canvas/product/actions_card_product.class.php @@ -430,6 +430,5 @@ class ActionsCardProduct dol_print_error($this->db); } } - } diff --git a/htdocs/product/canvas/service/actions_card_service.class.php b/htdocs/product/canvas/service/actions_card_service.class.php index afda34aec23..0800eeb6a28 100644 --- a/htdocs/product/canvas/service/actions_card_service.class.php +++ b/htdocs/product/canvas/service/actions_card_service.class.php @@ -362,6 +362,5 @@ class ActionsCardService print $sql; } } - } diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index ee98537a195..08a128403ec 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -4691,5 +4691,4 @@ class Product extends CommonObject dol_print_error($this->db); } } - } diff --git a/htdocs/product/class/productbatch.class.php b/htdocs/product/class/productbatch.class.php index 87815d5b07b..16bbf8b0718 100644 --- a/htdocs/product/class/productbatch.class.php +++ b/htdocs/product/class/productbatch.class.php @@ -541,5 +541,4 @@ class Productbatch extends CommonObject return -1; } } - } diff --git a/htdocs/product/class/propalmergepdfproduct.class.php b/htdocs/product/class/propalmergepdfproduct.class.php index d79e68b9f48..ca2a962c36e 100644 --- a/htdocs/product/class/propalmergepdfproduct.class.php +++ b/htdocs/product/class/propalmergepdfproduct.class.php @@ -633,7 +633,6 @@ class Propalmergepdfproduct extends CommonObject $this->tms=''; $this->import_key=''; } - } /** diff --git a/htdocs/product/inventory/class/inventory.class.php b/htdocs/product/inventory/class/inventory.class.php index 7ba2d5cf5f1..805b825f7fd 100644 --- a/htdocs/product/inventory/class/inventory.class.php +++ b/htdocs/product/inventory/class/inventory.class.php @@ -459,7 +459,6 @@ class Inventory extends CommonObject { $this->initAsSpecimenCommon(); } - } /** diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php index 59e966035d4..899c58b8dc6 100644 --- a/htdocs/product/stock/class/entrepot.class.php +++ b/htdocs/product/stock/class/entrepot.class.php @@ -744,5 +744,4 @@ class Entrepot extends CommonObject return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref); } - } diff --git a/htdocs/product/stock/class/productlot.class.php b/htdocs/product/stock/class/productlot.class.php index 1ed59eb058f..2d19dd19cca 100644 --- a/htdocs/product/stock/class/productlot.class.php +++ b/htdocs/product/stock/class/productlot.class.php @@ -581,5 +581,4 @@ class Productlot extends CommonObject $this->fk_user_modif = ''; $this->import_key = ''; } - } diff --git a/htdocs/product/stock/class/productstockentrepot.class.php b/htdocs/product/stock/class/productstockentrepot.class.php index 5dbaa95f395..3fca32b7273 100644 --- a/htdocs/product/stock/class/productstockentrepot.class.php +++ b/htdocs/product/stock/class/productstockentrepot.class.php @@ -573,5 +573,4 @@ class ProductStockEntrepot extends CommonObject $this->desiredstock = ''; $this->import_key = ''; } - } diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php index 17c36bb5a54..19aa93034c7 100644 --- a/htdocs/projet/class/project.class.php +++ b/htdocs/projet/class/project.class.php @@ -2004,5 +2004,4 @@ class Project extends CommonObject $this->lines = $taskstatic->getTasksArray(0, $user, $this->id, 0, 0); } - } diff --git a/htdocs/resource/class/html.formresource.class.php b/htdocs/resource/class/html.formresource.class.php index 2aa19ac66b5..3624963818c 100644 --- a/htdocs/resource/class/html.formresource.class.php +++ b/htdocs/resource/class/html.formresource.class.php @@ -208,8 +208,5 @@ class FormResource print ''; if ($user->admin && ! $noadmininfo) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1); } - - - } diff --git a/htdocs/societe/canvas/actions_card_common.class.php b/htdocs/societe/canvas/actions_card_common.class.php index 61e0a09f556..47cc420c38d 100644 --- a/htdocs/societe/canvas/actions_card_common.class.php +++ b/htdocs/societe/canvas/actions_card_common.class.php @@ -422,5 +422,4 @@ abstract class ActionsCardCommon $this->object->country_label= $tmparray['label']; } } - } diff --git a/htdocs/societe/canvas/company/actions_card_company.class.php b/htdocs/societe/canvas/company/actions_card_company.class.php index 419a5ecb73e..324356d1f90 100644 --- a/htdocs/societe/canvas/company/actions_card_company.class.php +++ b/htdocs/societe/canvas/company/actions_card_company.class.php @@ -218,6 +218,5 @@ class ActionsCardCompany extends ActionsCardCommon { return restrictedArea($user,$features,$objectid,$dbtablename,$feature2,$dbt_keyfield,$dbt_select); } - } diff --git a/htdocs/societe/canvas/individual/actions_card_individual.class.php b/htdocs/societe/canvas/individual/actions_card_individual.class.php index 78064004e37..df5f5eabb91 100644 --- a/htdocs/societe/canvas/individual/actions_card_individual.class.php +++ b/htdocs/societe/canvas/individual/actions_card_individual.class.php @@ -134,6 +134,5 @@ class ActionsCardIndividual extends ActionsCardCommon { return restrictedArea($user,$features,$objectid,$dbtablename,$feature2,$dbt_keyfield,$dbt_select); } - } diff --git a/htdocs/societe/class/address.class.php b/htdocs/societe/class/address.class.php index 7f89e081e8b..bd3cb742d99 100644 --- a/htdocs/societe/class/address.class.php +++ b/htdocs/societe/class/address.class.php @@ -485,7 +485,6 @@ class Address dol_print_error($this->db); } } - } diff --git a/htdocs/societe/class/client.class.php b/htdocs/societe/class/client.class.php index b0e275dbab8..3187ddb7958 100644 --- a/htdocs/societe/class/client.class.php +++ b/htdocs/societe/class/client.class.php @@ -113,5 +113,4 @@ class Client extends Societe } return 1; } - } diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php index ae7424af1bb..3a3b9126b7b 100644 --- a/htdocs/societe/class/companybankaccount.class.php +++ b/htdocs/societe/class/companybankaccount.class.php @@ -415,6 +415,5 @@ class CompanyBankAccount extends Account $this->socid = 0; } - } diff --git a/htdocs/societe/class/companypaymentmode.class.php b/htdocs/societe/class/companypaymentmode.class.php index 15a254844f0..c5800f5c92b 100644 --- a/htdocs/societe/class/companypaymentmode.class.php +++ b/htdocs/societe/class/companypaymentmode.class.php @@ -565,5 +565,4 @@ class CompanyPaymentMode extends CommonObject { $this->initAsSpecimenCommon(); } - } diff --git a/htdocs/stripe/class/actions_stripe.class.php b/htdocs/stripe/class/actions_stripe.class.php index 4fa83f5fe0e..f3c76be9d35 100644 --- a/htdocs/stripe/class/actions_stripe.class.php +++ b/htdocs/stripe/class/actions_stripe.class.php @@ -236,5 +236,4 @@ class ActionsStripeconnect } return 0; } - } diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php index eda7bca78b9..8d829ba55f5 100644 --- a/htdocs/stripe/class/stripe.class.php +++ b/htdocs/stripe/class/stripe.class.php @@ -500,5 +500,4 @@ class Stripe extends CommonObject } return $return; } - } diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php index 9275cc0decf..ba652a12d42 100644 --- a/htdocs/supplier_proposal/class/supplier_proposal.class.php +++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php @@ -2635,7 +2635,6 @@ class SupplierProposal extends CommonObject return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables); } - } @@ -3207,5 +3206,4 @@ class SupplierProposalLine extends CommonObjectLine return -2; } } - } diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php index c1833e97d59..cba5c435804 100644 --- a/htdocs/ticket/class/ticket.class.php +++ b/htdocs/ticket/class/ticket.class.php @@ -2473,7 +2473,6 @@ class Ticket extends CommonObject } return false; } - } @@ -2593,5 +2592,4 @@ class TicketsLine * Close ticket date */ public $date_close = ''; - } diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index ab4c66f0799..a426607f750 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -3155,5 +3155,4 @@ class User extends CommonObject return -1; } } - } diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php index 103d0ffca39..eb677484078 100644 --- a/htdocs/website/class/website.class.php +++ b/htdocs/website/class/website.class.php @@ -1031,6 +1031,5 @@ class Website extends CommonObject return $object->id; } } - } diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php index 9874b1fa8b0..2ea1ecfeaca 100644 --- a/htdocs/website/class/websitepage.class.php +++ b/htdocs/website/class/websitepage.class.php @@ -538,5 +538,4 @@ class WebsitePage extends CommonObject $this->date_creation = $now - (24 * 30 * 3600); $this->date_modification = $now - (24 * 7 * 3600); } - } diff --git a/test/phpunit/AccountingAccountTest.php b/test/phpunit/AccountingAccountTest.php index b9a3788bd80..5bd472cb6e1 100644 --- a/test/phpunit/AccountingAccountTest.php +++ b/test/phpunit/AccountingAccountTest.php @@ -221,5 +221,4 @@ class AccountingAccountTest extends PHPUnit_Framework_TestCase $this->assertLessThan($result, 0); return $result; } - } diff --git a/test/phpunit/ActionCommTest.php b/test/phpunit/ActionCommTest.php index c3406d28bf7..1da26e53228 100644 --- a/test/phpunit/ActionCommTest.php +++ b/test/phpunit/ActionCommTest.php @@ -242,5 +242,4 @@ class ActionCommTest extends PHPUnit_Framework_TestCase $this->assertLessThan($result, 0); return $result; } - } diff --git a/test/phpunit/AdminLibTest.php b/test/phpunit/AdminLibTest.php index 5cf34e969b1..beb6400cc33 100644 --- a/test/phpunit/AdminLibTest.php +++ b/test/phpunit/AdminLibTest.php @@ -164,5 +164,4 @@ class AdminLibTest extends PHPUnit_Framework_TestCase $moduledescriptor->init(); $conf->setValues($db); } - } diff --git a/test/phpunit/AllTests.php b/test/phpunit/AllTests.php index 66636ad7619..15c3ee3f429 100644 --- a/test/phpunit/AllTests.php +++ b/test/phpunit/AllTests.php @@ -250,4 +250,3 @@ class AllTests return $suite; } } - diff --git a/test/phpunit/BankAccountTest.php b/test/phpunit/BankAccountTest.php index a212ff0317a..e6da5cf9598 100644 --- a/test/phpunit/BankAccountTest.php +++ b/test/phpunit/BankAccountTest.php @@ -220,5 +220,4 @@ class BankAccountTest extends PHPUnit_Framework_TestCase $this->assertLessThan($result, 0); return $result; } - } diff --git a/test/phpunit/BonPrelevementTest.php b/test/phpunit/BonPrelevementTest.php index 0124b25e6c6..b87a902c9d4 100644 --- a/test/phpunit/BonPrelevementTest.php +++ b/test/phpunit/BonPrelevementTest.php @@ -178,5 +178,4 @@ class BonPrelevementTest extends PHPUnit_Framework_TestCase return $result; } */ - } diff --git a/test/phpunit/CMailFileTest.php b/test/phpunit/CMailFileTest.php index 06f24ba45e0..8e1772a475c 100755 --- a/test/phpunit/CMailFileTest.php +++ b/test/phpunit/CMailFileTest.php @@ -103,7 +103,7 @@ class CMailFileTest extends PHPUnit_Framework_TestCase $db=$this->savdb; $conf->global->MAIN_DISABLE_ALL_MAILS=1; // If I comment/remove this lien, unit test still works alone but failed when ran from AllTest. Don't know why. - + print __METHOD__."\n"; } /** @@ -177,23 +177,22 @@ class CMailFileTest extends PHPUnit_Framework_TestCase $result=$localobject->getValidAddress($src,3,1); print __METHOD__." result=".$result."\n"; $this->assertEquals($result,'"=?UTF-8?B?Sm9obiBEb2U=?=" '); - + $src='John Doe '; $result=$localobject->getValidAddress($src,4); print __METHOD__." result=".$result."\n"; $this->assertEquals($result,'John Doe'); - + $src='John Doe , John Doe2 , John Doe3 '; $result=$localobject->getValidAddress($src,4); print __METHOD__." result=".$result."\n"; $this->assertEquals($result,'John Doe,John Doe2,John Doe3'); - + $src='John Doe , John Doe2 , John Doe3 '; $result=$localobject->getValidAddress($src,4,0,2); print __METHOD__." result=".$result."\n"; $this->assertEquals($result,'John Doe,John Doe2...'); - + return $result; } - } diff --git a/test/phpunit/CategorieTest.php b/test/phpunit/CategorieTest.php index 574a8d793f9..b45dd44923e 100644 --- a/test/phpunit/CategorieTest.php +++ b/test/phpunit/CategorieTest.php @@ -335,5 +335,4 @@ class CategorieTest extends PHPUnit_Framework_TestCase $this->assertTrue(is_array($retarray)); return $retarray; } - } diff --git a/test/phpunit/ChargeSocialesTest.php b/test/phpunit/ChargeSocialesTest.php index e1db7d199cf..2ba51bba87b 100644 --- a/test/phpunit/ChargeSocialesTest.php +++ b/test/phpunit/ChargeSocialesTest.php @@ -239,5 +239,4 @@ class ChargeSocialesTest extends PHPUnit_Framework_TestCase $this->assertLessThan($result, 0); return $result; } - } diff --git a/test/phpunit/CodingSqlTest.php b/test/phpunit/CodingSqlTest.php index 460a3e2fbeb..98069d9f415 100644 --- a/test/phpunit/CodingSqlTest.php +++ b/test/phpunit/CodingSqlTest.php @@ -247,5 +247,4 @@ class CodingSqlTest extends PHPUnit_Framework_TestCase return; } - } diff --git a/test/phpunit/CommandeFournisseurTest.php b/test/phpunit/CommandeFournisseurTest.php index 7b2f3f07e2b..5319acdfabc 100644 --- a/test/phpunit/CommandeFournisseurTest.php +++ b/test/phpunit/CommandeFournisseurTest.php @@ -383,5 +383,4 @@ class CommandeFournisseurTest extends PHPUnit_Framework_TestCase $this->assertLessThan($result, 0); return $result; } - } diff --git a/test/phpunit/CommandeTest.php b/test/phpunit/CommandeTest.php index 443bd1d1932..0e907861128 100644 --- a/test/phpunit/CommandeTest.php +++ b/test/phpunit/CommandeTest.php @@ -292,5 +292,4 @@ class CommandeTest extends PHPUnit_Framework_TestCase $this->assertLessThan($result, 0); return $result; } - } diff --git a/test/phpunit/CompanyBankAccountTest.php b/test/phpunit/CompanyBankAccountTest.php index 95ea937a017..98cff57f7fa 100644 --- a/test/phpunit/CompanyBankAccountTest.php +++ b/test/phpunit/CompanyBankAccountTest.php @@ -233,5 +233,4 @@ class CompanyBankAccountTest extends PHPUnit_Framework_TestCase $this->assertLessThan($result, 0); return $localobject->id; } - } diff --git a/test/phpunit/ContratTest.php b/test/phpunit/ContratTest.php index 5adf002c885..4b92a3085f6 100644 --- a/test/phpunit/ContratTest.php +++ b/test/phpunit/ContratTest.php @@ -218,5 +218,4 @@ class ContratTest extends PHPUnit_Framework_TestCase $this->assertLessThan($result, 0); return $result; } - } diff --git a/test/phpunit/DateLibTest.php b/test/phpunit/DateLibTest.php index 645993d8659..4a133396675 100644 --- a/test/phpunit/DateLibTest.php +++ b/test/phpunit/DateLibTest.php @@ -442,5 +442,4 @@ class DateLibTest extends PHPUnit_Framework_TestCase $prev = dol_get_first_day_week($day, $month, $year); $this->assertEquals(1, (int) $prev['first_day']); // sunday for month 2, year 2015 is the 1st } - } diff --git a/test/phpunit/DateLibTzFranceTest.php b/test/phpunit/DateLibTzFranceTest.php index 668af000204..e787edafda8 100644 --- a/test/phpunit/DateLibTzFranceTest.php +++ b/test/phpunit/DateLibTzFranceTest.php @@ -199,5 +199,4 @@ class DateLibTzFranceTest extends PHPUnit_Framework_TestCase return $result; } - } diff --git a/test/phpunit/EntrepotTest.php b/test/phpunit/EntrepotTest.php index e695bff34a3..5477341e2e8 100644 --- a/test/phpunit/EntrepotTest.php +++ b/test/phpunit/EntrepotTest.php @@ -255,7 +255,6 @@ class EntrepotTest extends PHPUnit_Framework_TestCase $localobject=new Entrepot($db); - return; } } diff --git a/test/phpunit/ExpenseReportTest.php b/test/phpunit/ExpenseReportTest.php index b9af3dc1078..f6b5aba11f5 100644 --- a/test/phpunit/ExpenseReportTest.php +++ b/test/phpunit/ExpenseReportTest.php @@ -151,7 +151,7 @@ class ExpenseReportTest extends PHPUnit_Framework_TestCase $localobject2->initAsSpecimen(); // Init a speciment with lines $localobject2->status = 0; $localobject2->fk_statut = 0; - + $result=$localobject2->create($user); print __METHOD__." result=".$result."\n"; $this->assertGreaterThanOrEqual(0, $result); @@ -312,5 +312,4 @@ class ExpenseReportTest extends PHPUnit_Framework_TestCase $this->assertLessThan($result, 0); return $result; } - } diff --git a/test/phpunit/ExportTest.php b/test/phpunit/ExportTest.php index eb9d0b733f1..1507bf02899 100644 --- a/test/phpunit/ExportTest.php +++ b/test/phpunit/ExportTest.php @@ -352,5 +352,4 @@ class ExportTest extends PHPUnit_Framework_TestCase return true; } - } diff --git a/test/phpunit/FactureFournisseurTest.php b/test/phpunit/FactureFournisseurTest.php index 7985e8f0931..c451f62b10c 100644 --- a/test/phpunit/FactureFournisseurTest.php +++ b/test/phpunit/FactureFournisseurTest.php @@ -266,5 +266,4 @@ class FactureFournisseurTest extends PHPUnit_Framework_TestCase $this->assertLessThan($result, 0); return $result; } - } diff --git a/test/phpunit/FactureTestRounding.php b/test/phpunit/FactureTestRounding.php index 5fe0df4e5d0..f5737e5623a 100644 --- a/test/phpunit/FactureTestRounding.php +++ b/test/phpunit/FactureTestRounding.php @@ -333,5 +333,4 @@ class FactureTestRounding extends PHPUnit_Framework_TestCase $this->assertEquals(20.03, $localobject3->total_tva); $this->assertEquals(115.43, $localobject3->total_ttc); } - } diff --git a/test/phpunit/FichinterTest.php b/test/phpunit/FichinterTest.php index baa72b7020a..1a7bca70eb1 100644 --- a/test/phpunit/FichinterTest.php +++ b/test/phpunit/FichinterTest.php @@ -242,5 +242,4 @@ class FichinterTest extends PHPUnit_Framework_TestCase $this->assertLessThan($result, 0); return $result; } - } diff --git a/test/phpunit/FilesLibTest.php b/test/phpunit/FilesLibTest.php index feac8b212ed..2c95ca4c8ed 100644 --- a/test/phpunit/FilesLibTest.php +++ b/test/phpunit/FilesLibTest.php @@ -502,5 +502,4 @@ class FilesLibTest extends PHPUnit_Framework_TestCase $user->rights->facture->lire = $savpermlire; $user->rights->facture->creer = $savpermcreer; } - } diff --git a/test/phpunit/FormAdminTest.php b/test/phpunit/FormAdminTest.php index 30c96600210..744fcfb4061 100644 --- a/test/phpunit/FormAdminTest.php +++ b/test/phpunit/FormAdminTest.php @@ -136,5 +136,4 @@ class FormAdminTest extends PHPUnit_Framework_TestCase print __METHOD__." result=".$result."\n"; return $result; } - } diff --git a/test/phpunit/FunctionsLibTest.php b/test/phpunit/FunctionsLibTest.php index a96e36c3262..012b4f9413d 100644 --- a/test/phpunit/FunctionsLibTest.php +++ b/test/phpunit/FunctionsLibTest.php @@ -1207,5 +1207,4 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase return true; } - } diff --git a/test/phpunit/HolidayTest.php b/test/phpunit/HolidayTest.php index 3204e9f07b1..55589b87f56 100644 --- a/test/phpunit/HolidayTest.php +++ b/test/phpunit/HolidayTest.php @@ -349,5 +349,4 @@ class HolidayTest extends PHPUnit_Framework_TestCase $result=$localobjectc->verifDateHolidayCP($user->id, $date_debut, $date_fin, 2); // start afternoon and end morning $this->assertTrue($result, 'result should be true, there is no overlapping'); } - } diff --git a/test/phpunit/ImagesLibTest.php b/test/phpunit/ImagesLibTest.php index 41c7005e25d..a25d907d4b6 100644 --- a/test/phpunit/ImagesLibTest.php +++ b/test/phpunit/ImagesLibTest.php @@ -143,5 +143,4 @@ class ImagesLibTest extends PHPUnit_Framework_TestCase return 1; } - } diff --git a/test/phpunit/ImportTest.php b/test/phpunit/ImportTest.php index 067b06910c9..39b4207489c 100644 --- a/test/phpunit/ImportTest.php +++ b/test/phpunit/ImportTest.php @@ -134,5 +134,4 @@ class ImportTest extends PHPUnit_Framework_TestCase return true; } - } diff --git a/test/phpunit/MarginsLibTest.php b/test/phpunit/MarginsLibTest.php index e6f130d2e3b..857decc8be7 100644 --- a/test/phpunit/MarginsLibTest.php +++ b/test/phpunit/MarginsLibTest.php @@ -136,7 +136,7 @@ class MarginsLibTest extends PHPUnit_Framework_TestCase $this->assertEquals(25,$result[1]); print __METHOD__." result[2]=".$result[2]."\n"; $this->assertEquals(20,$result[2]); - + $result=getMarginInfos(10, 10, 19.6, 0, 0, 0, 8); print __METHOD__." result[0]=".$result[0]."\n"; $this->assertEquals(8,$result[0]); @@ -144,8 +144,7 @@ class MarginsLibTest extends PHPUnit_Framework_TestCase $this->assertEquals(12.5,$result[1]); print __METHOD__." result[2]=".$result[2]."\n"; $this->assertEquals(1/9*100,$result[2]); - + return 0; } - } diff --git a/test/phpunit/ModulesTest.php b/test/phpunit/ModulesTest.php index 589a9116c78..0021c21391e 100755 --- a/test/phpunit/ModulesTest.php +++ b/test/phpunit/ModulesTest.php @@ -152,5 +152,4 @@ class ModulesTest extends PHPUnit_Framework_TestCase return 0; } - } diff --git a/test/phpunit/MouvementStockTest.php b/test/phpunit/MouvementStockTest.php index 826b55851e2..bf9a427587d 100644 --- a/test/phpunit/MouvementStockTest.php +++ b/test/phpunit/MouvementStockTest.php @@ -250,5 +250,4 @@ class MouvementStockTest extends PHPUnit_Framework_TestCase return $localobject; } - } diff --git a/test/phpunit/NumberingModulesTest.php b/test/phpunit/NumberingModulesTest.php index 4a3dfb7c1c9..8fa5f58e164 100644 --- a/test/phpunit/NumberingModulesTest.php +++ b/test/phpunit/NumberingModulesTest.php @@ -573,5 +573,4 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase return $result; } - } diff --git a/test/phpunit/PaypalTest.php b/test/phpunit/PaypalTest.php index fb48279cd66..5570b32fc69 100644 --- a/test/phpunit/PaypalTest.php +++ b/test/phpunit/PaypalTest.php @@ -135,13 +135,12 @@ class PaypalTest extends PHPUnit_Framework_TestCase $urltotest=getPaypalPaymentUrl(1,'free'); print "urltotest=".$urltotest."\n"; - + $result=getURLContent($urltotest, 'GET'); - + print __METHOD__." result=".$result."\n"; $this->assertLessThanOrEqual($result, 0); return $result; } - } diff --git a/test/phpunit/PricesTest.php b/test/phpunit/PricesTest.php index d3b1efaf072..ecbd10b5490 100755 --- a/test/phpunit/PricesTest.php +++ b/test/phpunit/PricesTest.php @@ -351,5 +351,4 @@ class PricesTest extends PHPUnit_Framework_TestCase //$this->assertEquals(0.25,$newlocalobject->total_tva); //$this->assertEquals(2.73,$newlocalobject->total_ttc); } - } diff --git a/test/phpunit/ProjectTest.php b/test/phpunit/ProjectTest.php index c2f5d5b8161..a5dc9e0f5e2 100644 --- a/test/phpunit/ProjectTest.php +++ b/test/phpunit/ProjectTest.php @@ -237,5 +237,4 @@ class ProjectTest extends PHPUnit_Framework_TestCase $this->assertLessThan($result, 0); return $result; } - } diff --git a/test/phpunit/PropalTest.php b/test/phpunit/PropalTest.php index 3d45673074a..341ea02c5d0 100644 --- a/test/phpunit/PropalTest.php +++ b/test/phpunit/PropalTest.php @@ -291,5 +291,4 @@ class PropalTest extends PHPUnit_Framework_TestCase $this->assertLessThan($result, 0); return $result; } - } diff --git a/test/phpunit/RestAPIUserTest.php b/test/phpunit/RestAPIUserTest.php index 40153f2cffd..ad3eb29be2f 100644 --- a/test/phpunit/RestAPIUserTest.php +++ b/test/phpunit/RestAPIUserTest.php @@ -224,5 +224,4 @@ class RestAPIUserTest extends PHPUnit_Framework_TestCase $this->assertNotNull($object, "Parsing of json result must no be null"); $this->assertEquals(500, $object['error']['code'], $object['error']['code'].' '.$object['error']['message']); } - -} \ No newline at end of file +} diff --git a/test/phpunit/SecurityTest.php b/test/phpunit/SecurityTest.php index 7fe65f101de..1b3b20899ef 100644 --- a/test/phpunit/SecurityTest.php +++ b/test/phpunit/SecurityTest.php @@ -294,5 +294,4 @@ class SecurityTest extends PHPUnit_Framework_TestCase $result=restrictedArea($user,'societe'); $this->assertEquals(1,$result); } - } diff --git a/test/phpunit/SocieteTest.php b/test/phpunit/SocieteTest.php index 31aa98fd082..8baab7e2f1d 100755 --- a/test/phpunit/SocieteTest.php +++ b/test/phpunit/SocieteTest.php @@ -455,5 +455,4 @@ class SocieteTest extends PHPUnit_Framework_TestCase return $localobjectadd->id; } - } diff --git a/test/phpunit/SupplierProposalTest.php b/test/phpunit/SupplierProposalTest.php index 13e715ff8f5..c8f0471e9a9 100644 --- a/test/phpunit/SupplierProposalTest.php +++ b/test/phpunit/SupplierProposalTest.php @@ -276,5 +276,4 @@ class SupplierProposalTest extends PHPUnit_Framework_TestCase $this->assertLessThan($result, 0); return $result; } - } diff --git a/test/phpunit/UserGroupTest.php b/test/phpunit/UserGroupTest.php index 2ec4c16a8d7..fe8b019da20 100644 --- a/test/phpunit/UserGroupTest.php +++ b/test/phpunit/UserGroupTest.php @@ -283,5 +283,4 @@ class UserGroupTest extends PHPUnit_Framework_TestCase $this->assertLessThan($result, 0); return $result; } - } diff --git a/test/phpunit/UtilsTest.php b/test/phpunit/UtilsTest.php index b80ce84f624..511e7d7fd32 100644 --- a/test/phpunit/UtilsTest.php +++ b/test/phpunit/UtilsTest.php @@ -146,7 +146,4 @@ class UtilsTest extends PHPUnit_Framework_TestCase print __METHOD__." result=".$result."\n"; return $result; } - - - } diff --git a/test/phpunit/WebservicesInvoicesTest.php b/test/phpunit/WebservicesInvoicesTest.php index 6f7ca3610cd..b336ef15ff3 100644 --- a/test/phpunit/WebservicesInvoicesTest.php +++ b/test/phpunit/WebservicesInvoicesTest.php @@ -418,5 +418,4 @@ class WebservicesInvoicesTest extends PHPUnit_Framework_TestCase return $result; } - } diff --git a/test/phpunit/WebservicesOrdersTest.php b/test/phpunit/WebservicesOrdersTest.php index 7fb2d101184..79202a9d2eb 100644 --- a/test/phpunit/WebservicesOrdersTest.php +++ b/test/phpunit/WebservicesOrdersTest.php @@ -178,5 +178,4 @@ class WebservicesOrdersTest extends PHPUnit_Framework_TestCase return $result; } - } diff --git a/test/phpunit/WebservicesOtherTest.php b/test/phpunit/WebservicesOtherTest.php index 45b01aa77d3..2b8bfc0aac1 100644 --- a/test/phpunit/WebservicesOtherTest.php +++ b/test/phpunit/WebservicesOtherTest.php @@ -207,5 +207,4 @@ class WebservicesOtherTest extends PHPUnit_Framework_TestCase return $result; } - } diff --git a/test/phpunit/WebservicesProductsTest.php b/test/phpunit/WebservicesProductsTest.php index bcbb37b0419..e8b343c7a89 100644 --- a/test/phpunit/WebservicesProductsTest.php +++ b/test/phpunit/WebservicesProductsTest.php @@ -322,5 +322,4 @@ class WebservicesProductsTest extends PHPUnit_Framework_TestCase return 0; } - } diff --git a/test/phpunit/WebservicesThirdpartyTest.php b/test/phpunit/WebservicesThirdpartyTest.php index e1c2249b62a..b9a04d2f1fa 100644 --- a/test/phpunit/WebservicesThirdpartyTest.php +++ b/test/phpunit/WebservicesThirdpartyTest.php @@ -398,5 +398,4 @@ class WebservicesThirdpartyTest extends PHPUnit_Framework_TestCase return $result; } - } diff --git a/test/phpunit/WebservicesUserTest.php b/test/phpunit/WebservicesUserTest.php index bfcdb400cc6..96e3687df1c 100644 --- a/test/phpunit/WebservicesUserTest.php +++ b/test/phpunit/WebservicesUserTest.php @@ -206,5 +206,4 @@ class WebservicesUserTest extends PHPUnit_Framework_TestCase return $result; } - } diff --git a/test/phpunit/XCalLibTest.php b/test/phpunit/XCalLibTest.php index 3bbf3469b17..055640d4a36 100644 --- a/test/phpunit/XCalLibTest.php +++ b/test/phpunit/XCalLibTest.php @@ -137,5 +137,4 @@ class XCalLibTest extends PHPUnit_Framework_TestCase print __METHOD__." result=".$resultback."\n"; $this->assertEquals($stringtoencode,$resultback); } - } From 76d08ab7f5b72f577a7b1630acf5e923d03bb805 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 29 Aug 2018 23:05:09 +0200 Subject: [PATCH 35/48] Update config --- .tx/config | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.tx/config b/.tx/config index db380163540..27327f033ea 100644 --- a/.tx/config +++ b/.tx/config @@ -38,6 +38,12 @@ source_file = htdocs/langs/en_US/bills.lang source_lang = en_US type = MOZILLAPROPERTIES +[dolibarr.blockedlog] +file_filter = htdocs/langs//blockedlog.lang +source_file = htdocs/langs/en_US/blockedlog.lang +source_lang = en_US +type = MOZILLAPROPERTIES + [dolibarr.bookmarks] file_filter = htdocs/langs//bookmarks.lang source_file = htdocs/langs/en_US/bookmarks.lang From 9cf67c4d5f63a2434238809ac5f6af64cc49cb4a Mon Sep 17 00:00:00 2001 From: ptibogxiv Date: Thu, 30 Aug 2018 01:13:06 +0200 Subject: [PATCH 36/48] fix multicompany in public ticket page --- htdocs/public/ticket/index.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/htdocs/public/ticket/index.php b/htdocs/public/ticket/index.php index bb0499f43e6..0c68302278b 100644 --- a/htdocs/public/ticket/index.php +++ b/htdocs/public/ticket/index.php @@ -25,6 +25,12 @@ if (!defined('NOCSRFCHECK')) define('NOCSRFCHECK', '1'); if (!defined('NOREQUIREMENU')) define('NOREQUIREMENU', '1'); if (!defined("NOLOGIN")) define("NOLOGIN", '1'); // If this page is public (can be called outside logged session) +// For MultiCompany module. +// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php +// TODO This should be useless. Because entity must be retreive from object ref and not from url. +$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1)); +if (is_numeric($entity)) define("DOLENTITY", $entity); + require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/ticket/class/actions_ticket.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formticket.class.php'; From 7a6df60cb0b2c3bc202e01a8035e033b3cd5b598 Mon Sep 17 00:00:00 2001 From: ptibogxiv Date: Thu, 30 Aug 2018 02:38:50 +0200 Subject: [PATCH 37/48] header/footer uniformization in ticket public page --- htdocs/public/ticket/index.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/htdocs/public/ticket/index.php b/htdocs/public/ticket/index.php index bb0499f43e6..68c88459222 100644 --- a/htdocs/public/ticket/index.php +++ b/htdocs/public/ticket/index.php @@ -30,6 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/ticket/class/actions_ticket.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formticket.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/ticket.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/security.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php'; // Load translation files required by the page $langs->loadLangs(array('companies', 'other', 'ticket', 'errors')); @@ -64,5 +65,8 @@ if (!$conf->global->TICKET_ENABLE_PUBLIC_INTERFACE) { } // End of page -llxFooter(); +htmlPrintOnlinePaymentFooter($mysoc,$langs,1,$suffix,$object); + +llxFooter('', 'public'); + $db->close(); From f34455291fa378964830562c9026eed75e647208 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 30 Aug 2018 08:06:46 +0200 Subject: [PATCH 38/48] Create index.html --- htdocs/public/onlinesign/index.html | 1 + 1 file changed, 1 insertion(+) create mode 100644 htdocs/public/onlinesign/index.html diff --git a/htdocs/public/onlinesign/index.html b/htdocs/public/onlinesign/index.html new file mode 100644 index 00000000000..8b137891791 --- /dev/null +++ b/htdocs/public/onlinesign/index.html @@ -0,0 +1 @@ + From 82302e55168cdb14fa55ba4c7dbbe1487a0b7993 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 30 Aug 2018 08:08:01 +0200 Subject: [PATCH 39/48] Create index.html --- htdocs/public/test/index.html | 1 + 1 file changed, 1 insertion(+) create mode 100644 htdocs/public/test/index.html diff --git a/htdocs/public/test/index.html b/htdocs/public/test/index.html new file mode 100644 index 00000000000..8b137891791 --- /dev/null +++ b/htdocs/public/test/index.html @@ -0,0 +1 @@ + From 663745b78716fc1a563de276be527509ed59ef0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 30 Aug 2018 08:09:03 +0200 Subject: [PATCH 40/48] Create index.html --- htdocs/public/ticket/img/index.html | 1 + 1 file changed, 1 insertion(+) create mode 100644 htdocs/public/ticket/img/index.html diff --git a/htdocs/public/ticket/img/index.html b/htdocs/public/ticket/img/index.html new file mode 100644 index 00000000000..8b137891791 --- /dev/null +++ b/htdocs/public/ticket/img/index.html @@ -0,0 +1 @@ + From d14bd829fbf07c364a84b619367eede6a559ba5d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 30 Aug 2018 17:01:22 +0200 Subject: [PATCH 41/48] FIX trans on null object --- htdocs/core/lib/functions2.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php index ea596294bf7..4553fec4641 100644 --- a/htdocs/core/lib/functions2.lib.php +++ b/htdocs/core/lib/functions2.lib.php @@ -1771,7 +1771,7 @@ function getSoapParams() */ function dolGetElementUrl($objectid,$objecttype,$withpicto=0,$option='') { - global $db,$conf; + global $db, $conf, $langs; $ret=''; From 9cc6533d1118d85f81bb1e1deb580806c5d81ad6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 30 Aug 2018 18:57:30 +0200 Subject: [PATCH 42/48] Fix td alignement --- htdocs/fourn/commande/dispatch.php | 33 +++++++++++++++--------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php index 20664b6d679..f1fa3214e12 100644 --- a/htdocs/fourn/commande/dispatch.php +++ b/htdocs/fourn/commande/dispatch.php @@ -511,9 +511,18 @@ if ($id > 0 || ! empty($ref)) { print ''; print '' . $langs->trans("Description") . ''; - print ''; - print ''; - print ''; + if (! empty($conf->productbatch->enabled)) + { + print '' . $langs->trans("batch_number") . ''; + print '' . $langs->trans("EatByDate") . ''; + print '' . $langs->trans("SellByDate") . ''; + } + else + { + print ''; + print ''; + print ''; + } print '' . $langs->trans("SupplierRef") . ''; print '' . $langs->trans("QtyOrdered") . ''; print '' . $langs->trans("QtyDispatchedShort") . ''; @@ -521,16 +530,6 @@ if ($id > 0 || ! empty($ref)) { print ''; print '' . $langs->trans("Warehouse") . ''; print "\n"; - - if (! empty($conf->productbatch->enabled)) { - print ''; - print ''; - print '' . $langs->trans("batch_number") . ''; - print '' . $langs->trans("EatByDate") . ''; - print '' . $langs->trans("SellByDate") . ''; - print ' '; - print "\n"; - } } $nbfreeproduct = 0; // Nb of lins of free products/services @@ -593,7 +592,7 @@ if ($id > 0 || ! empty($ref)) { // Supplier ref print ''.$objp->sref.''; - + // Qty ordered print '' . $objp->qty . ''; @@ -638,7 +637,7 @@ if ($id > 0 || ! empty($ref)) { $dluodatesuffix = dol_mktime(0, 0, 0, GETPOST('dluo' . $suffix . 'month'), GETPOST('dluo' . $suffix . 'day'), GETPOST('dluo' . $suffix . 'year')); $form->select_date($dluodatesuffix, 'dluo' . $suffix, '', '', 1, ""); print ''; - print ' '; // Qty ordered + qty already dispatached + print ' '; // Supplier ref + Qty ordered + qty already dispatched } else { $type = 'dispatch'; print ''; @@ -650,7 +649,7 @@ if ($id > 0 || ! empty($ref)) { print ''; print ''; - print ''; + print ''; print ''; print ''; @@ -672,7 +671,7 @@ if ($id > 0 || ! empty($ref)) { print ''; print ''; - print ''; + print ''; if (! empty($conf->productbatch->enabled) && $objp->tobatch == 1) { $type = 'batch'; //print img_picto($langs->trans('AddDispatchBatchLine'), 'split.png', 'class="splitbutton" onClick="addDispatchLine(' . $i . ',\'' . $type . '\')"'); From e7d4956f5b12335585c7befc40ff885d37127c1a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 31 Aug 2018 11:29:30 +0200 Subject: [PATCH 43/48] Clean not used function --- htdocs/societe/class/societe.class.php | 126 ++----------------------- 1 file changed, 9 insertions(+), 117 deletions(-) diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index 5c3363bc4c8..845a19cba58 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -45,12 +45,12 @@ class Societe extends CommonObject * @var string ID to identify managed object */ public $element='societe'; - + /** * @var string Name of table without prefix where object is stored */ public $table_element = 'societe'; - + public $fk_element='fk_soc'; public $fieldsforcombobox='nom,name_alias'; protected $childtables=array("supplier_proposal"=>'SupplierProposal',"propal"=>'Proposal',"commande"=>'Order',"facture"=>'Invoice',"facture_rec"=>'RecurringInvoiceTemplate',"contrat"=>'Contract',"fichinter"=>'Fichinter',"facture_fourn"=>'SupplierInvoice',"commande_fournisseur"=>'SupplierOrder',"projet"=>'Project',"expedition"=>'Shipment',"prelevement_lignes"=>'DirectDebitRecord'); // To test if we can delete object @@ -1348,114 +1348,6 @@ class Societe extends CommonObject return $result; } - /** - * Search and fetch thirparties by name - * - * @param string $name Name - * @param int $type Type of thirdparties (0=any, 1=customer, 2=prospect, 3=supplier) - * @param array $filters Array of couple field name/value to filter the companies with the same name - * @param boolean $exact Exact string search (true/false) - * @param boolean $case Case sensitive (true/false) - * @param boolean $similar Add test if string inside name into database, or name into database inside string. Do not use this: Not compatible with other database. - * @param string $clause Clause for filters - * @return array|int <0 if KO, array of thirdparties object if OK - */ - function searchByName($name, $type='0', $filters = array(), $exact = false, $case = false, $similar = false, $clause = 'AND') - { - $thirdparties = array(); - - dol_syslog("searchByName name=".$name." type=".$type." exact=".$exact); - - // Check parameter - if (empty($name)) - { - $this->errors[]='ErrorBadValueForParameter'; - return -1; - } - - // Generation requete recherche - $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe"; - $sql.= " WHERE entity IN (".getEntity('category').")"; - if (! empty($type)) - { - if ($type == 1 || $type == 2) - $sql.= " AND client = ".$type; - elseif ($type == 3) - $sql.= " AND fournisseur = 1"; - } - if (! empty($name)) - { - if (! $exact) - { - if (preg_match('/^([\*])?[^*]+([\*])?$/', $name, $regs) && count($regs) > 1) - { - $name = str_replace('*', '%', $name); - } - else - { - $name = '%'.$name.'%'; - } - } - $sql.= " AND "; - if (is_array($filters) && ! empty($filters)) - $sql.= "("; - if ($similar) - { - // For test similitude (string inside name into database, or name into database inside string) - // Do not use this. Not compatible with other database. - $sql.= "(LOCATE('".$this->db->escape($name)."', nom) > 0 OR LOCATE(nom, '".$this->db->escape($name)."') > 0)"; - } - else - { - if (! $case) - $sql.= "nom LIKE '".$this->db->escape($name)."'"; - else - $sql.= "nom LIKE BINARY '".$this->db->escape($name)."'"; - } - } - if (is_array($filters) && ! empty($filters)) - { - foreach($filters as $field => $value) - { - if (! $exact) - { - if (preg_match('/^([\*])?[^*]+([\*])?$/', $value, $regs) && count($regs) > 1) - { - $value = str_replace('*', '%', $value); - } - else - { - $value = '%'.$value.'%'; - } - } - if (! $case) - $sql.= " ".$clause." ".$field." LIKE '".$this->db->escape($value)."'"; - else - $sql.= " ".$clause." ".$field." LIKE BINARY '".$this->db->escape($value)."'"; - } - if (! empty($name)) - $sql.= ")"; - } - - $res = $this->db->query($sql); - if ($res) - { - while ($rec = $this->db->fetch_array($res)) - { - $soc = new Societe($this->db); - $soc->fetch($rec['rowid']); - $thirdparties[] = $soc; - } - - return $thirdparties; - } - else - { - $this->error=$this->db->lasterror(); - return -1; - } - } - /** * Delete a third party from database and all its dependencies (contacts, rib...) * @@ -1921,10 +1813,10 @@ class Societe extends CommonObject function add_commercial(User $user, $commid) { $error=0; - - - - + + + + if ($this->id > 0 && $commid > 0) { $sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_commerciaux"; @@ -1942,7 +1834,7 @@ class Societe extends CommonObject } else { $this->context=array('commercial_modified'=>$commid); - + $result=$this->call_trigger('COMPANY_LINK_SALE_REPRESENTATIVE',$user); if ($result < 0) $error++; } @@ -1960,10 +1852,10 @@ class Societe extends CommonObject { $error=0; $this->context=array('commercial_modified'=>$commid); - + $result=$this->call_trigger('COMPANY_UNLINK_SALE_REPRESENTATIVE',$user); if ($result < 0) $error++; - + if ($this->id > 0 && $commid > 0) { $sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_commerciaux "; From 7b1a705be4e7e4347342b08e1d9fe97311736fb1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 31 Aug 2018 13:50:58 +0200 Subject: [PATCH 44/48] Clean duplicate code --- htdocs/comm/propal/class/propal.class.php | 27 ++++++++++++----------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index cc918b5b9f1..955ee29845e 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -49,22 +49,22 @@ class Propal extends CommonObject * @var string ID to identify managed object */ public $element='propal'; - + /** * @var string Name of table without prefix where object is stored */ public $table_element='propal'; - + public $table_element_line='propaldet'; public $fk_element='fk_propal'; public $picto='propal'; - + /** * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe * @var int */ public $ismultientitymanaged = 1; - + /** * 0=Default, 1=View may be restricted to sales representative only if no permission to see all or to company of external user if external user * @var integer @@ -1574,10 +1574,10 @@ class Propal extends CommonObject $sql = 'SELECT d.rowid, d.fk_propal, d.fk_parent_line, d.label as custom_label, d.description, d.price, d.vat_src_code, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.localtax1_type, d.localtax2_type, d.qty, d.fk_remise_except, d.remise_percent, d.subprice, d.fk_product,'; $sql.= ' d.info_bits, d.total_ht, d.total_tva, d.total_localtax1, d.total_localtax2, d.total_ttc, d.fk_product_fournisseur_price as fk_fournprice, d.buy_price_ht as pa_ht, d.special_code, d.rang, d.product_type,'; $sql.= ' d.fk_unit,'; - $sql.= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label as product_label,'; + $sql.= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label as product_label, p.tobach as product_batch,'; $sql.= ' p.weight, p.weight_units, p.volume, p.volume_units,'; - $sql.= ' d.date_start, d.date_end'; - $sql.= ' ,d.fk_multicurrency, d.multicurrency_code, d.multicurrency_subprice, d.multicurrency_total_ht, d.multicurrency_total_tva, d.multicurrency_total_ttc'; + $sql.= ' d.date_start, d.date_end,'; + $sql.= ' d.fk_multicurrency, d.multicurrency_code, d.multicurrency_subprice, d.multicurrency_total_ht, d.multicurrency_total_tva, d.multicurrency_total_ttc'; $sql.= ' FROM '.MAIN_DB_PREFIX.'propaldet as d'; $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON (d.fk_product = p.rowid)'; $sql.= ' WHERE d.fk_propal = '.$this->id; @@ -1639,7 +1639,8 @@ class Propal extends CommonObject $line->libelle = $objp->product_label; // TODO deprecated $line->product_label = $objp->product_label; $line->product_desc = $objp->product_desc; // Description produit - $line->fk_product_type = $objp->fk_product_type; + $line->product_tobatch = $objp->product_tobatch; + $line->fk_product_type = $objp->fk_product_type; // TODO deprecated $line->fk_unit = $objp->fk_unit; $line->weight = $objp->weight; $line->weight_units = $objp->weight_units; @@ -3201,7 +3202,7 @@ class Propal extends CommonObject { $response->nbtodo++; $response->total+=$obj->total_ht; - + if ($mode == 'opened') { $datelimit = $this->db->jdate($obj->datefin); @@ -3511,8 +3512,8 @@ class Propal extends CommonObject */ function getLinesArray() { - // TODO Duplicate with fetch_lines ? Wich one to keep ? - + return $this->fetch_lines(); + /* $this->lines = array(); $sql = 'SELECT pt.rowid, pt.label as custom_label, pt.description, pt.fk_product, pt.fk_remise_except,'; @@ -3601,7 +3602,7 @@ class Propal extends CommonObject { $this->error=$this->db->error(); return -1; - } + }*/ } /** @@ -3665,7 +3666,7 @@ class PropaleLigne extends CommonObjectLine * @var string ID to identify managed object */ public $element='propaldet'; - + /** * @var string Name of table without prefix where object is stored */ From bb2f5ad588f0c5829299035aac3acd27246a3f3b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 1 Sep 2018 11:30:14 +0200 Subject: [PATCH 45/48] Fix missing migration --- htdocs/install/mysql/migration/8.0.0-9.0.0.sql | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/htdocs/install/mysql/migration/8.0.0-9.0.0.sql b/htdocs/install/mysql/migration/8.0.0-9.0.0.sql index 81df41d55e0..56f98d28449 100644 --- a/htdocs/install/mysql/migration/8.0.0-9.0.0.sql +++ b/htdocs/install/mysql/migration/8.0.0-9.0.0.sql @@ -36,6 +36,15 @@ ALTER TABLE llx_accounting_account ADD CONSTRAINT fk_accounting_account_fk_pcg_v ALTER TABLE llx_accounting_account MODIFY COLUMN account_number varchar(32) NOT NULL; +create table llx_facture_rec_extrafields +( + rowid integer AUTO_INCREMENT PRIMARY KEY, + tms timestamp, + fk_object integer NOT NULL, + import_key varchar(14) +) ENGINE=innodb; + + -- For 9.0 ALTER TABLE llx_accounting_account MODIFY COLUMN account_parent varchar(32) DEFAULT NULL; From 28fe74bf135c1cd2323344e3e3cacf8dbd818839 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 1 Sep 2018 11:57:18 +0200 Subject: [PATCH 46/48] FIX #9371 --- htdocs/user/logout.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/htdocs/user/logout.php b/htdocs/user/logout.php index ceeaf35fddf..0d7cabba4e4 100644 --- a/htdocs/user/logout.php +++ b/htdocs/user/logout.php @@ -70,13 +70,20 @@ if (GETPOST('dol_no_mouse_hover')) $url.=(preg_match('/\?/',$url)?'&':'?') if (GETPOST('dol_use_jmobile')) $url.=(preg_match('/\?/',$url)?'&':'?').'dol_use_jmobile=1'; // Destroy session -$prefix=dol_getprefix(''); +/*$prefix=dol_getprefix(''); $sessionname='DOLSESSID_'.$prefix; $sessiontimeout='DOLSESSTIMEOUT_'.$prefix; if (! empty($_COOKIE[$sessiontimeout])) ini_set('session.gc_maxlifetime',$_COOKIE[$sessiontimeout]); session_name($sessionname); session_destroy(); dol_syslog("End of session ".$sessionname); +*/ +dol_syslog("End of session ".session_id()); +if (session_status() === PHP_SESSION_ACTIVE) +{ + session_destroy(); +} + // Not sure this is required unset($_SESSION['dol_login']); From c791f37da923cec33478c5b0fbdda34449a571d0 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 1 Sep 2018 12:09:40 +0200 Subject: [PATCH 47/48] Doc --- ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index e5a062a9a7e..49b632dff92 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,10 @@ NEW: Dolibarr can provide information in page title when multicompany is enabled Android application like DoliDroid able to provide native features for multicompany module +For developers: +Code changes to be more compatible with PSR2 + + ***** ChangeLog for 8.0.0 compared to 7.0.0 ***** From 3b1cf41823cf1896b66ef9acc848b155b113d2e1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 1 Sep 2018 12:17:52 +0200 Subject: [PATCH 48/48] Fix eol --- htdocs/contrat/class/contrat.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php index c4316141440..52cd41ad531 100644 --- a/htdocs/contrat/class/contrat.class.php +++ b/htdocs/contrat/class/contrat.class.php @@ -793,7 +793,7 @@ class Contrat extends CommonObject $line->ref = $objp->product_ref; // deprecated $line->product_ref = $objp->product_ref; // Product Ref - $line->product_desc = $objp->product_desc; // Product Description + $line->product_desc = $objp->product_desc; // Product Description $line->product_label = $objp->product_label; // Product Label $line->description = $objp->description;