lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into trimtrailing2

Browse Source
This commit is contained in:
Frédéric FRANCE 2018-08-29 15:47:55 +02:00
commit 0e512cbc36
No known key found for this signature in database
GPG Key ID: 06809324E4B2ABC1
8 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/accountancy/class/accountingaccount.class.php
View File

@ -81,7 +81,7 @@ class AccountingAccount extends CommonObject
var $account_category; var $account_category;
/** /**
* @var string proper name for given parameter * @var string Label of account
*/ */
public $label; public $label;

4
htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
View File

@ -379,8 +379,8 @@ class FormAdvTargetEmailing extends Form
* Return combo list of categories * Return combo list of categories
* *
* @param string $htmlname Name of categorie * @param string $htmlname Name of categorie
* @param array $selected_array value selected * @param array $selected_array Value selected
* @param int $type type * @param int $type Type
* @return string HTML combo * @return string HTML combo
*/ */
public function multiselectCategories($htmlname='',$selected_array = array(), $type=0) public function multiselectCategories($htmlname='',$selected_array = array(), $type=0)

4
htdocs/projet/class/task.class.php
View File

@ -45,10 +45,10 @@ class Task extends CommonObject
public $picto = 'task'; public $picto = 'task';
protected $childtables=array('projet_task_time'); // To test if we can delete object protected $childtables=array('projet_task_time'); // To test if we can delete object
var $fk_task_parent; public $fk_task_parent;
/** /**
* @var string proper name for given parameter * @var string Label of task
*/ */
public $label; public $label;

1
htdocs/resource/class/dolresource.class.php
View File

@ -19,7 +19,6 @@
* \file resource/class/resource.class.php * \file resource/class/resource.class.php
* \ingroup resource * \ingroup resource
* \brief Class file for resource object * \brief Class file for resource object
*/ */
require_once DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php"; require_once DOL_DOCUMENT_ROOT."/core/class/commonobject.class.php";