Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
Frédéric FRANCE
2018-08-21 20:57:58 +02:00
parent d68f176e7e db3c17668e
commit 6b6daf178f
216 changed files with 1840 additions and 818 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/core/modules/project/task/mod_task_simple.php
View File

@@ -33,7 +33,10 @@ class mod_task_simple extends ModeleNumRefTask
{
var $version='dolibarr'; // 'development', 'experimental', 'dolibarr'
var $prefix='TK';
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
var $nom = "Simple";
var $name = "Simple";

10
htdocs/core/modules/project/task/modules_task.php
View File

@@ -32,7 +32,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
*/
abstract class ModelePDFTask extends CommonDocGenerator
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/**
@@ -64,7 +67,10 @@ abstract class ModelePDFTask extends CommonDocGenerator
*/
abstract class ModeleNumRefTask
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/**
* Return if a module can be used or not