From 137b715868f7dbec2c5cd237a46aeb6e26e266c6 Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Wed, 22 Aug 2018 22:28:33 +0200 Subject: [PATCH 01/14] Update deplacementstats.class.php --- htdocs/compta/deplacement/class/deplacementstats.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/compta/deplacement/class/deplacementstats.class.php b/htdocs/compta/deplacement/class/deplacementstats.class.php index 9d99063e726..e490c90f1ed 100644 --- a/htdocs/compta/deplacement/class/deplacementstats.class.php +++ b/htdocs/compta/deplacement/class/deplacementstats.class.php @@ -31,9 +31,9 @@ include_once DOL_DOCUMENT_ROOT . '/compta/deplacement/class/deplacement.class.ph class DeplacementStats extends Stats { /** - * @var string Name of table without prefix where object is stored - */ - public $table_element; + * @var string Name of table without prefix where object is stored + */ + public $table_element; var $socid; var $userid; From 25b1b08d922964f2844495e0f44292defc30808f Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Wed, 22 Aug 2018 22:30:09 +0200 Subject: [PATCH 02/14] Update accountancysystem.class.php --- htdocs/accountancy/class/accountancysystem.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/accountancy/class/accountancysystem.class.php b/htdocs/accountancy/class/accountancysystem.class.php index a755c3c0602..8b30070317a 100644 --- a/htdocs/accountancy/class/accountancysystem.class.php +++ b/htdocs/accountancy/class/accountancysystem.class.php @@ -28,7 +28,7 @@ */ class AccountancySystem { - /** + /** * @var DoliDB Database handler. */ public $db; @@ -43,7 +43,7 @@ class AccountancySystem var $pcg_type; var $pcg_subtype; - /** + /** * @var string proper name for given parameter */ public $label; From ec8422af73ac7f7251631a41e80678bb21000ca5 Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Wed, 22 Aug 2018 22:31:54 +0200 Subject: [PATCH 03/14] Update accountingaccount.class.php --- htdocs/accountancy/class/accountingaccount.class.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php index fb2d1d477ed..ad55862e6a2 100644 --- a/htdocs/accountancy/class/accountingaccount.class.php +++ b/htdocs/accountancy/class/accountingaccount.class.php @@ -51,9 +51,9 @@ class AccountingAccount extends CommonObject public $restrictiononfksoc = 1; /** - * @var DoliDB Database handler. - */ - public $db; + * @var DoliDB Database handler. + */ + public $db; /** * @var string Error code (or message) @@ -80,9 +80,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 92cb9c42047b4205e8e7391dfa0394c19e1daed1 Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Wed, 22 Aug 2018 22:35:04 +0200 Subject: [PATCH 04/14] Update adherentstats.class.php --- htdocs/adherents/class/adherentstats.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/adherents/class/adherentstats.class.php b/htdocs/adherents/class/adherentstats.class.php index aef2f275c89..bfa990a04c0 100644 --- a/htdocs/adherents/class/adherentstats.class.php +++ b/htdocs/adherents/class/adherentstats.class.php @@ -33,9 +33,9 @@ include_once DOL_DOCUMENT_ROOT . '/adherents/class/subscription.class.php'; class AdherentStats extends Stats { /** - * @var string Name of table without prefix where object is stored - */ - public $table_element; + * @var string Name of table without prefix where object is stored + */ + public $table_element; var $socid; var $userid; From d03900c6f8e00dec8239bf8a1417a12c4ad6a51a Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Wed, 22 Aug 2018 22:36:07 +0200 Subject: [PATCH 05/14] Update bookmark.class.php --- htdocs/bookmarks/class/bookmark.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/bookmarks/class/bookmark.class.php b/htdocs/bookmarks/class/bookmark.class.php index a78c75a43db..da76cac7a0a 100644 --- a/htdocs/bookmarks/class/bookmark.class.php +++ b/htdocs/bookmarks/class/bookmark.class.php @@ -31,9 +31,9 @@ class Bookmark extends CommonObject public $element='bookmark'; /** - * @var string Name of table without prefix where object is stored - */ - public $table_element='bookmark'; + * @var string Name of table without prefix where object is stored + */ + public $table_element='bookmark'; public $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe public $picto = 'bookmark'; From 4066af99e06576ee68ddf3014dae1d1986a9ecac Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Wed, 22 Aug 2018 22:37:02 +0200 Subject: [PATCH 06/14] Update bookmark.class.php --- htdocs/bookmarks/class/bookmark.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/bookmarks/class/bookmark.class.php b/htdocs/bookmarks/class/bookmark.class.php index da76cac7a0a..3bbdf293f37 100644 --- a/htdocs/bookmarks/class/bookmark.class.php +++ b/htdocs/bookmarks/class/bookmark.class.php @@ -44,9 +44,9 @@ class Bookmark extends CommonObject public $db; /** - * @var int ID - */ - public $id; + * @var int ID + */ + public $id; var $fk_user; var $datec; From c626dcb7107811250692a37f8bd4bf2efc5043ed Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Wed, 22 Aug 2018 22:38:00 +0200 Subject: [PATCH 07/14] Update actioncomm.class.php --- htdocs/comm/action/class/actioncomm.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 34478c0b6b2..32a442885f8 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -37,9 +37,9 @@ class ActionComm extends CommonObject public $element='action'; /** - * @var string Name of table without prefix where object is stored - */ - public $table_element = 'actioncomm'; + * @var string Name of table without prefix where object is stored + */ + public $table_element = 'actioncomm'; public $table_rowid = 'id'; public $picto='action'; From eeaa257f1118879d8b1a337f0d2a40ad6771f88f Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Wed, 22 Aug 2018 22:39:51 +0200 Subject: [PATCH 08/14] Update cactioncomm.class.php --- htdocs/comm/action/class/cactioncomm.class.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/comm/action/class/cactioncomm.class.php b/htdocs/comm/action/class/cactioncomm.class.php index a0403c0a0a4..cdccca9968b 100644 --- a/htdocs/comm/action/class/cactioncomm.class.php +++ b/htdocs/comm/action/class/cactioncomm.class.php @@ -29,9 +29,9 @@ class CActionComm { /** - * @var string Error code (or message) - */ - public $error=''; + * @var string Error code (or message) + */ + public $error=''; /** * @var DoliDB Database handler. @@ -39,9 +39,9 @@ class CActionComm public $db; /** - * @var int ID - */ - public $id; + * @var int ID + */ + public $id; var $code; var $type; From 9b2e754b466790eaaab4bf585503dd6693a88332 Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Wed, 22 Aug 2018 22:41:22 +0200 Subject: [PATCH 09/14] Update advtargetemailing.class.php --- htdocs/comm/mailing/class/advtargetemailing.class.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/comm/mailing/class/advtargetemailing.class.php b/htdocs/comm/mailing/class/advtargetemailing.class.php index 396c020b7b6..1f4968ef6b2 100644 --- a/htdocs/comm/mailing/class/advtargetemailing.class.php +++ b/htdocs/comm/mailing/class/advtargetemailing.class.php @@ -29,9 +29,9 @@ class AdvanceTargetingMailing extends CommonObject { /** - * @var DoliDB Database handler. - */ - public $db; + * @var DoliDB Database handler. + */ + public $db; /** * @var string Error code (or message) @@ -972,4 +972,4 @@ class AdvanceTargetingMailing extends CommonObject } -} \ No newline at end of file +} From 3309badd8ddedc747e5ac396d2de138bd7a2313b Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Wed, 22 Aug 2018 22:43:17 +0200 Subject: [PATCH 10/14] Update accountingaccount.class.php --- htdocs/accountancy/class/accountingaccount.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php index ad55862e6a2..6a72b881aab 100644 --- a/htdocs/accountancy/class/accountingaccount.class.php +++ b/htdocs/accountancy/class/accountingaccount.class.php @@ -44,6 +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 From e09f7bedd026085b0b81858aca0146bd5a23ac39 Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Thu, 23 Aug 2018 09:57:19 +0200 Subject: [PATCH 11/14] Update commonobject.class.php --- htdocs/core/class/commonobject.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 9d8462274cb..97ba1f814d0 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -71,7 +71,7 @@ abstract class CommonObject /** * @var string Name of table without prefix where object is stored */ - public $table_element + public $table_element; /** * @var From 0e3c9ffd512dd90f4ceb9f32b4080a5a74fed505 Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Thu, 23 Aug 2018 10:05:02 +0200 Subject: [PATCH 12/14] Update fournisseur.facture.class.php --- htdocs/fourn/class/fournisseur.facture.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php index 813b2a468c4..b3d62a4f6b8 100644 --- a/htdocs/fourn/class/fournisseur.facture.class.php +++ b/htdocs/fourn/class/fournisseur.facture.class.php @@ -44,9 +44,9 @@ class FactureFournisseur extends CommonInvoice public $element='invoice_supplier'; /** - * @var string Name of table without prefix where object is stored - */ - public $table_element='facture_fourn'; + * @var string Name of table without prefix where object is stored + */ + public $table_element='facture_fourn'; public $table_element_line='facture_fourn_det'; public $fk_element='fk_facture_fourn'; From b81751799732aa217e6c9c7a43d096ba49fa4f74 Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Thu, 23 Aug 2018 10:08:17 +0200 Subject: [PATCH 13/14] Update fournisseur.product.class.php --- .../fourn/class/fournisseur.product.class.php | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php index b109a5e6c71..8f77d152036 100644 --- a/htdocs/fourn/class/fournisseur.product.class.php +++ b/htdocs/fourn/class/fournisseur.product.class.php @@ -43,21 +43,21 @@ class ProductFournisseur extends Product public $db; /** - * @var string Error code (or message) - */ - public $error=''; + * @var string Error code (or message) + */ + public $error=''; var $product_fourn_price_id; // id of ligne product-supplier /** - * @var int ID - */ - public $id; + * @var int ID + */ + public $id; - /** - * @deprecated - * @see ref_supplier - */ + /** + * @deprecated + * @see ref_supplier + */ var $fourn_ref; var $delivery_time_days; var $ref_supplier; // ref supplier (can be set by get_buyprice) @@ -89,9 +89,9 @@ class ProductFournisseur extends Product var $fourn_multicurrency_unitprice; /** - * Constructor - * - * @param DoliDB $db Database handler + * Constructor + * + * @param DoliDB $db Database handler */ function __construct($db) { From 20e7fc09696c3f502e35dee7ffa5a3689ae65c40 Mon Sep 17 00:00:00 2001 From: Philippe Grand Date: Thu, 23 Aug 2018 10:11:40 +0200 Subject: [PATCH 14/14] Update livraison.class.php --- htdocs/livraison/class/livraison.class.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php index dcb560653ea..f61c8eabb2a 100644 --- a/htdocs/livraison/class/livraison.class.php +++ b/htdocs/livraison/class/livraison.class.php @@ -3,8 +3,8 @@ * Copyright (C) 2005-2014 Regis Houssin * Copyright (C) 2006-2007 Laurent Destailleur * Copyright (C) 2007 Franky Van Liedekerke - * Copyright (C) 2011-2012 Philippe Grand - * Copyright (C) 2013 Florian Henry + * Copyright (C) 2011-2018 Philippe Grand + * Copyright (C) 2013 Florian Henry * Copyright (C) 2014-2015 Marcos García * * This program is free software; you can redistribute it and/or modify @@ -1062,7 +1062,7 @@ class Livraison extends CommonObject */ class LivraisonLigne extends CommonObjectLine { - /** + /** * @var DoliDB Database handler. */ public $db; @@ -1075,7 +1075,7 @@ class LivraisonLigne extends CommonObjectLine var $fk_product; var $origin_id; - /** + /** * @var string proper name for given parameter */ public $label;