From 65af8f902f9c82d5824318e126a4914731affb1b Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 28 Aug 2018 09:44:54 +0200 Subject: [PATCH 01/32] 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/32] 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/32] 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/32] 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/32] 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/32] 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/32] 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/32] 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/32] 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/32] 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/32] 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/32] 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/32] 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/32] 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/32] 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/32] 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/32] 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/32] 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/32] 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/32] 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/32] 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/32] 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/32] 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/32] 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/32] 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/32] 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/32] 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/32] 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/32] 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/32] 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/32] 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/32] 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