From 5f6c165fb601770cba5247f809fcba5f5cb5db89 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 21 Aug 2018 14:14:27 +0200 Subject: [PATCH 1/6] Module builder is stable --- htdocs/core/modules/modModuleBuilder.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/modules/modModuleBuilder.class.php b/htdocs/core/modules/modModuleBuilder.class.php index 60afb99afc5..3f106de6c78 100644 --- a/htdocs/core/modules/modModuleBuilder.class.php +++ b/htdocs/core/modules/modModuleBuilder.class.php @@ -49,7 +49,7 @@ class modModuleBuilder extends DolibarrModules $this->name = preg_replace('/^mod/i','',get_class($this)); $this->description = "A RAD (Rapid Application Development) tool to help developers to build their own module."; // Possible values for version are: 'development', 'experimental', 'dolibarr' or version - $this->version = 'experimental'; + $this->version = 'dolibarr'; // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase) $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name); // Name of image file used for this module. From 4379d6b49d06c08005dfe116c0ccb4a8285f22fc Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 21 Aug 2018 14:15:01 +0200 Subject: [PATCH 2/6] Prepare 9.0 --- ChangeLog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f257c8a3c7c..e5a062a9a7e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,11 +3,12 @@ English Dolibarr ChangeLog -------------------------------------------------------------- -***** ChangeLog for 8.0.0 compared to 8.0.0 ***** +***** ChangeLog for 9.0.0 compared to 8.0.0 ***** For Users: NEW: Stable module: Website NEW: Stable module: WebDAV +NEW: Stable module: Module Builder NEW: Dolibarr can provide information in page title when multicompany is enabled of not, making Android application like DoliDroid able to provide native features for multicompany module From 4d8e5ab0e6ce8e77e2286f59319b901b9e8d0460 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 21 Aug 2018 14:58:20 +0200 Subject: [PATCH 3/6] Fix PHPCS --- htdocs/website/class/websitepage.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php index d816d1564bb..17ad6e31c87 100644 --- a/htdocs/website/class/websitepage.class.php +++ b/htdocs/website/class/websitepage.class.php @@ -125,9 +125,9 @@ class WebsitePage extends CommonObject /** * Load object in memory from the database * - * @param int $id Id object. - * If this is 0, the value into $page will be used. If not found of $page not defined, the default page of website_id will be used or the first page found if not set. - * If value is < 0, we must exclude this ID. + * @param int $id Id object. + * If this is 0, the value into $page will be used. If not found of $page not defined, the default page of website_id will be used or the first page found if not set. + * If value is < 0, we must exclude this ID. * @param string $website_id Web site id (page name must also be filled if this parameter is used) * @param string $page Page name (website id must also be filled if this parameter is used) * @param string $aliasalt Alternative alias to search page (slow) From f8b3ec7b87c8aa345b89c0e946b717749fc2f088 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 21 Aug 2018 18:57:34 +0200 Subject: [PATCH 4/6] Fix PHPCS --- htdocs/core/class/antivir.class.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/htdocs/core/class/antivir.class.php b/htdocs/core/class/antivir.class.php index ad31c60e664..fe3f163189e 100644 --- a/htdocs/core/class/antivir.class.php +++ b/htdocs/core/class/antivir.class.php @@ -26,8 +26,7 @@ */ /** - * \class AntiVir - * \brief Class to scan for virus + * Class to scan for virus */ class AntiVir { @@ -36,8 +35,8 @@ class AntiVir * * @var string[] Error codes (or messages) */ - public $errors = array ();; - + public $errors = array (); + var $output; var $db; From 3f4714416ddaaa3459ad21d5afb84a661a4a9e87 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 21 Aug 2018 18:58:10 +0200 Subject: [PATCH 5/6] Clean comment --- htdocs/core/class/antivir.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/class/antivir.class.php b/htdocs/core/class/antivir.class.php index fe3f163189e..27b23a1f463 100644 --- a/htdocs/core/class/antivir.class.php +++ b/htdocs/core/class/antivir.class.php @@ -31,8 +31,8 @@ class AntiVir { var $error; + /** - * * @var string[] Error codes (or messages) */ public $errors = array (); From db3c17668e4c72dec0221f7355ac49554d0ecbd5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 21 Aug 2018 19:08:11 +0200 Subject: [PATCH 6/6] Fix coding style --- htdocs/accountancy/class/accountancyexport.class.php | 4 ++-- htdocs/accountancy/class/accountingaccount.class.php | 4 ++-- htdocs/adherents/canvas/actions_adherentcard_common.class.php | 4 ++-- htdocs/comm/mailing/class/advtargetemailing.class.php | 4 ++-- htdocs/compta/facture/class/paymentterm.class.php | 4 ++-- htdocs/contact/canvas/actions_contactcard_common.class.php | 4 ++-- htdocs/core/class/antivir.class.php | 2 +- htdocs/core/class/canvas.class.php | 4 ++-- htdocs/core/class/ccountry.class.php | 4 ++-- htdocs/core/class/cstate.class.php | 4 ++-- htdocs/core/class/ctypent.class.php | 4 ++-- htdocs/core/class/hookmanager.class.php | 4 ++-- htdocs/core/class/notify.class.php | 4 ++-- htdocs/imports/class/import.class.php | 4 ++-- htdocs/product/dynamic_price/class/price_expression.class.php | 4 ++-- htdocs/societe/canvas/actions_card_common.class.php | 4 ++-- 16 files changed, 31 insertions(+), 31 deletions(-) diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php index b55eccef0ef..40427d68034 100644 --- a/htdocs/accountancy/class/accountancyexport.class.php +++ b/htdocs/accountancy/class/accountancyexport.class.php @@ -55,11 +55,11 @@ class AccountancyExport public static $EXPORT_TYPE_AGIRIS = 9; public static $EXPORT_TYPE_CONFIGURABLE = 10; + /** - * * @var string[] Error codes (or messages) */ - public $errors = array (); + public $errors = array(); /** * diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php index 0acd6c06973..4eac5546d1d 100644 --- a/htdocs/accountancy/class/accountingaccount.class.php +++ b/htdocs/accountancy/class/accountingaccount.class.php @@ -52,11 +52,11 @@ class AccountingAccount extends CommonObject */ public $error=''; + /** - * * @var string[] Error codes (or messages) */ - public $errors = array (); + public $errors = array(); var $id; var $rowid; diff --git a/htdocs/adherents/canvas/actions_adherentcard_common.class.php b/htdocs/adherents/canvas/actions_adherentcard_common.class.php index d23334ecef5..e746a4a45c3 100644 --- a/htdocs/adherents/canvas/actions_adherentcard_common.class.php +++ b/htdocs/adherents/canvas/actions_adherentcard_common.class.php @@ -46,11 +46,11 @@ abstract class ActionsAdherentCardCommon */ public $error=''; + /** - * * @var string[] Error codes (or messages) */ - public $errors = array (); + public $errors = array(); /** diff --git a/htdocs/comm/mailing/class/advtargetemailing.class.php b/htdocs/comm/mailing/class/advtargetemailing.class.php index 1fe8d4efd96..9ef7ba75a9f 100644 --- a/htdocs/comm/mailing/class/advtargetemailing.class.php +++ b/htdocs/comm/mailing/class/advtargetemailing.class.php @@ -35,11 +35,11 @@ class AdvanceTargetingMailing extends CommonObject */ public $error=''; + /** - * * @var string[] Error codes (or messages) */ - public $errors = array (); + public $errors = array(); var $element='advtargetemailing'; //!< Id that identify managed objects var $table_element='advtargetemailing'; //!< Name of table without prefix where object is stored diff --git a/htdocs/compta/facture/class/paymentterm.class.php b/htdocs/compta/facture/class/paymentterm.class.php index 7e9524ad9af..61d477522dc 100644 --- a/htdocs/compta/facture/class/paymentterm.class.php +++ b/htdocs/compta/facture/class/paymentterm.class.php @@ -30,11 +30,11 @@ class PaymentTerm // extends CommonObject { var $db; //!< To store db handler var $error; //!< To return error code (or message) + /** - * * @var string[] Error codes (or messages) */ - public $errors = array (); + public $errors = array(); //public $element='c_payment_term'; //!< Id that identify managed objects //public $table_element='c_payment_term'; //!< Name of table without prefix where object is stored diff --git a/htdocs/contact/canvas/actions_contactcard_common.class.php b/htdocs/contact/canvas/actions_contactcard_common.class.php index c8ef79bc72e..921c9e60580 100644 --- a/htdocs/contact/canvas/actions_contactcard_common.class.php +++ b/htdocs/contact/canvas/actions_contactcard_common.class.php @@ -40,11 +40,11 @@ abstract class ActionsContactCardCommon //! Error string var $error; + /** - * * @var string[] Error codes (or messages) */ - public $errors = array (); + public $errors = array(); /** diff --git a/htdocs/core/class/antivir.class.php b/htdocs/core/class/antivir.class.php index 27b23a1f463..a530da66e3d 100644 --- a/htdocs/core/class/antivir.class.php +++ b/htdocs/core/class/antivir.class.php @@ -35,7 +35,7 @@ class AntiVir /** * @var string[] Error codes (or messages) */ - public $errors = array (); + public $errors = array(); var $output; var $db; diff --git a/htdocs/core/class/canvas.class.php b/htdocs/core/class/canvas.class.php index e5b984a255d..3fed7cb722e 100644 --- a/htdocs/core/class/canvas.class.php +++ b/htdocs/core/class/canvas.class.php @@ -30,11 +30,11 @@ class Canvas { var $db; var $error; + /** - * * @var string[] Error codes (or messages) */ - public $errors = array (); + public $errors = array(); var $actiontype; diff --git a/htdocs/core/class/ccountry.class.php b/htdocs/core/class/ccountry.class.php index 96d8ab69826..43d63ebb1d9 100644 --- a/htdocs/core/class/ccountry.class.php +++ b/htdocs/core/class/ccountry.class.php @@ -34,11 +34,11 @@ class Ccountry // extends CommonObject { var $db; //!< To store db handler var $error; //!< To return error code (or message) + /** - * * @var string[] Error codes (or messages) */ - public $errors = array (); + public $errors = array(); //var $element='ccountry'; //!< Id that identify managed objects //var $table_element='ccountry'; //!< Name of table without prefix where object is stored diff --git a/htdocs/core/class/cstate.class.php b/htdocs/core/class/cstate.class.php index 592962edf65..7a853cdf18a 100644 --- a/htdocs/core/class/cstate.class.php +++ b/htdocs/core/class/cstate.class.php @@ -34,11 +34,11 @@ class Cstate // extends CommonObject { var $db; //!< To store db handler var $error; //!< To return error code (or message) + /** - * * @var string[] Error codes (or messages) */ - public $errors = array (); + public $errors = array(); //var $element='cstate'; //!< Id that identify managed objects //var $table_element='cstate'; //!< Name of table without prefix where object is stored diff --git a/htdocs/core/class/ctypent.class.php b/htdocs/core/class/ctypent.class.php index 9b36ec470b4..c69b70c7c35 100644 --- a/htdocs/core/class/ctypent.class.php +++ b/htdocs/core/class/ctypent.class.php @@ -29,11 +29,11 @@ class Ctypent // extends CommonObject { var $db; //!< To store db handler var $error; //!< To return error code (or message) + /** - * * @var string[] Error codes (or messages) */ - public $errors = array (); + public $errors = array(); //var $element='ctypent'; //!< Id that identify managed objects //var $table_element='ctypent'; //!< Name of table without prefix where object is stored diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php index 11d29b7a7ad..2ba7f966712 100644 --- a/htdocs/core/class/hookmanager.class.php +++ b/htdocs/core/class/hookmanager.class.php @@ -31,11 +31,11 @@ class HookManager { var $db; var $error; + /** - * * @var string[] Error codes (or messages) */ - public $errors = array (); + public $errors = array(); // Context hookmanager was created for ('thirdpartycard', 'thirdpartydao', ...) var $contextarray=array(); diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php index c9d04b93dde..f3beece9794 100644 --- a/htdocs/core/class/notify.class.php +++ b/htdocs/core/class/notify.class.php @@ -33,11 +33,11 @@ class Notify var $id; var $db; var $error; + /** - * * @var string[] Error codes (or messages) */ - public $errors = array (); + public $errors = array(); var $author; var $ref; diff --git a/htdocs/imports/class/import.class.php b/htdocs/imports/class/import.class.php index bc4873770fd..875efc27410 100644 --- a/htdocs/imports/class/import.class.php +++ b/htdocs/imports/class/import.class.php @@ -44,11 +44,11 @@ class Import var $array_import_run_sql_after; var $error; + /** - * * @var string[] Error codes (or messages) */ - public $errors = array (); + public $errors = array(); /** diff --git a/htdocs/product/dynamic_price/class/price_expression.class.php b/htdocs/product/dynamic_price/class/price_expression.class.php index c5bf6808fac..039f74302e8 100644 --- a/htdocs/product/dynamic_price/class/price_expression.class.php +++ b/htdocs/product/dynamic_price/class/price_expression.class.php @@ -31,11 +31,11 @@ class PriceExpression { var $db; //!< To store db handler var $error; //!< To return error code (or message) + /** - * * @var string[] Error codes (or messages) */ - public $errors = array (); + public $errors = array(); var $id; var $title; diff --git a/htdocs/societe/canvas/actions_card_common.class.php b/htdocs/societe/canvas/actions_card_common.class.php index 15383883e97..0243bc7d719 100644 --- a/htdocs/societe/canvas/actions_card_common.class.php +++ b/htdocs/societe/canvas/actions_card_common.class.php @@ -43,11 +43,11 @@ abstract class ActionsCardCommon */ public $error=''; + /** - * * @var string[] Error codes (or messages) */ - public $errors = array (); + public $errors = array(); /**