From 689289acd036056a9e70857122e5315f7557a999 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 27 May 2020 23:20:26 +0200 Subject: [PATCH 1/7] Doc --- htdocs/core/class/html.formaccounting.class.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php index 19fa3f6fb26..7aa7d5585d8 100644 --- a/htdocs/core/class/html.formaccounting.class.php +++ b/htdocs/core/class/html.formaccounting.class.php @@ -444,11 +444,11 @@ class FormAccounting extends Form /** * Return HTML combo list of years existing into book keepping * - * @param string $selected Preselected value - * @param string $htmlname Name of HTML select object - * @param int $useempty Affiche valeur vide dans liste - * @param string $output_format (html/opton (for option html only)/array (to return options arrays - * @return string/array + * @param string $selected Preselected value + * @param string $htmlname Name of HTML select object + * @param int $useempty Affiche valeur vide dans liste + * @param string $output_format (html/opton (for option html only)/array (to return options arrays + * @return string|array HTML select component or array of select options */ public function selectyear_accountancy_bookkepping($selected = '', $htmlname = 'yearid', $useempty = 0, $output_format = 'html') { From 6881610892e9851a8d79899d2155785cf5ccc34f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 27 May 2020 23:23:01 +0200 Subject: [PATCH 2/7] Doxygen --- htdocs/compta/bank/class/account.class.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php index 3fcbffba3b2..80e52110d8c 100644 --- a/htdocs/compta/bank/class/account.class.php +++ b/htdocs/compta/bank/class/account.class.php @@ -1810,11 +1810,13 @@ class AccountLine extends CommonObject */ public $fk_account; - public $bank_account_label; // Label of bank account + /** + * @var string Label of bank account + */ + public $bank_account_label; /** - * Issuer - * @var Societe + * @var string Name of check issuer */ public $emetteur; From 2bababb73e773720026e3e71e47fb2a53f160f98 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 27 May 2020 23:30:52 +0200 Subject: [PATCH 3/7] Fix doc --- htdocs/product/stock/class/mouvementstock.class.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php index 5ef50f798d0..55270e0cd10 100644 --- a/htdocs/product/stock/class/mouvementstock.class.php +++ b/htdocs/product/stock/class/mouvementstock.class.php @@ -73,9 +73,14 @@ class MouvementStock extends CommonObject public $fk_origin; public $origintype; + public $inventorycode; public $batch; + /** + * @var Object Object set as origin before calling livraison() or reception() + */ + public $origin; public $fields = array( 'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10, 'showoncombobox'=>1), @@ -378,6 +383,7 @@ class MouvementStock extends CommonObject if ($movestock && $entrepot_id > 0) // Change stock for current product, change for subproduct is done after { + // Set $origintype, fk_origin, fk_project $fk_project = 0; if (!empty($this->origin)) { // This is set by caller for tracking reason $origintype = empty($this->origin->origin_type) ? $this->origin->element : $this->origin->origin_type; From 029596bc40cf66bf34c7eead676d20b64fa1a40f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 27 May 2020 23:32:24 +0200 Subject: [PATCH 4/7] Fix error assignement --- htdocs/ticket/class/ticket.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php index 4545497be62..5dce2bf9842 100644 --- a/htdocs/ticket/class/ticket.class.php +++ b/htdocs/ticket/class/ticket.class.php @@ -2453,7 +2453,7 @@ class Ticket extends CommonObject $id = $object->createTicketMessage($user, 0, $listofpaths, $listofmimes, $listofnames); if ($id <= 0) { $error++; - $this->errors = $object->error; + $this->error = $object->error; $this->errors = $object->errors; $action = 'add_message'; } From 57a753c3038f193244bbecbc25a1399513a81b4a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 27 May 2020 23:33:23 +0200 Subject: [PATCH 5/7] Doxygen --- htdocs/user/class/usergroup.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php index bc5396e9f51..4d858ffbaf9 100644 --- a/htdocs/user/class/usergroup.class.php +++ b/htdocs/user/class/usergroup.class.php @@ -636,7 +636,7 @@ class UserGroup extends CommonObject * Delete a group * * @param User $user User that delete - * @return <0 if KO, > 0 if OK + * @return int <0 if KO, > 0 if OK */ public function delete(User $user) { From 57c503091ffa083dfe1e0562ab1c4b702275d740 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 27 May 2020 23:35:17 +0200 Subject: [PATCH 6/7] Doxygen --- htdocs/opensurvey/class/opensurveysondage.class.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/htdocs/opensurvey/class/opensurveysondage.class.php b/htdocs/opensurvey/class/opensurveysondage.class.php index d9af22ed78e..c971b69b208 100644 --- a/htdocs/opensurvey/class/opensurveysondage.class.php +++ b/htdocs/opensurvey/class/opensurveysondage.class.php @@ -83,14 +83,12 @@ class Opensurveysondage extends CommonObject public $sujet; /** - * Allow comments on this poll - * @var bool + * @var int Allow comments on this poll */ public $allow_comments; /** - * Allow users see others vote - * @var bool + * @var int Allow users see others vote */ public $allow_spy; From 622b5c4ac9069c0ab45756325fee466c371c9ed1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 27 May 2020 23:37:22 +0200 Subject: [PATCH 7/7] Doxygen --- htdocs/debugbar/class/TraceableDB.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/debugbar/class/TraceableDB.php b/htdocs/debugbar/class/TraceableDB.php index ea7eec235ef..8b94959a43c 100644 --- a/htdocs/debugbar/class/TraceableDB.php +++ b/htdocs/debugbar/class/TraceableDB.php @@ -26,7 +26,7 @@ class TraceableDB extends DoliDB */ protected $startMemory; /** - * @var Database type + * @var string type */ public $type; /**