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

This commit is contained in:
Frédéric FRANCE 2018-08-21 19:59:07 +02:00
commit 0fbccce9a7
No known key found for this signature in database
GPG Key ID: 06809324E4B2ABC1
19 changed files with 40 additions and 40 deletions

View File

@ -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: For Users:
NEW: Stable module: Website NEW: Stable module: Website
NEW: Stable module: WebDAV NEW: Stable module: WebDAV
NEW: Stable module: Module Builder
NEW: Dolibarr can provide information in page title when multicompany is enabled of not, making 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 Android application like DoliDroid able to provide native features for multicompany module

View File

@ -55,11 +55,11 @@ class AccountancyExport
public static $EXPORT_TYPE_AGIRIS = 9; public static $EXPORT_TYPE_AGIRIS = 9;
public static $EXPORT_TYPE_CONFIGURABLE = 10; public static $EXPORT_TYPE_CONFIGURABLE = 10;
/** /**
*
* @var string[] Error codes (or messages) * @var string[] Error codes (or messages)
*/ */
public $errors = array (); public $errors = array();
/** /**
* *

View File

@ -52,11 +52,11 @@ class AccountingAccount extends CommonObject
*/ */
public $error=''; public $error='';
/** /**
*
* @var string[] Error codes (or messages) * @var string[] Error codes (or messages)
*/ */
public $errors = array (); public $errors = array();
var $id; var $id;
var $rowid; var $rowid;

View File

@ -46,11 +46,11 @@ abstract class ActionsAdherentCardCommon
*/ */
public $error=''; public $error='';
/** /**
*
* @var string[] Error codes (or messages) * @var string[] Error codes (or messages)
*/ */
public $errors = array (); public $errors = array();
/** /**

View File

@ -35,11 +35,11 @@ class AdvanceTargetingMailing extends CommonObject
*/ */
public $error=''; public $error='';
/** /**
*
* @var string[] Error codes (or messages) * @var string[] Error codes (or messages)
*/ */
public $errors = array (); public $errors = array();
var $element='advtargetemailing'; //!< Id that identify managed objects var $element='advtargetemailing'; //!< Id that identify managed objects
var $table_element='advtargetemailing'; //!< Name of table without prefix where object is stored var $table_element='advtargetemailing'; //!< Name of table without prefix where object is stored

View File

@ -30,11 +30,11 @@ class PaymentTerm // extends CommonObject
{ {
var $db; //!< To store db handler var $db; //!< To store db handler
var $error; //!< To return error code (or message) var $error; //!< To return error code (or message)
/** /**
*
* @var string[] Error codes (or messages) * @var string[] Error codes (or messages)
*/ */
public $errors = array (); public $errors = array();
//public $element='c_payment_term'; //!< Id that identify managed objects //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 //public $table_element='c_payment_term'; //!< Name of table without prefix where object is stored

View File

@ -40,11 +40,11 @@ abstract class ActionsContactCardCommon
//! Error string //! Error string
var $error; var $error;
/** /**
*
* @var string[] Error codes (or messages) * @var string[] Error codes (or messages)
*/ */
public $errors = array (); public $errors = array();
/** /**

View File

@ -26,17 +26,16 @@
*/ */
/** /**
* \class AntiVir * Class to scan for virus
* \brief Class to scan for virus
*/ */
class AntiVir class AntiVir
{ {
var $error; var $error;
/** /**
*
* @var string[] Error codes (or messages) * @var string[] Error codes (or messages)
*/ */
public $errors = array ();; public $errors = array();
var $output; var $output;
var $db; var $db;

View File

@ -30,11 +30,11 @@ class Canvas
{ {
var $db; var $db;
var $error; var $error;
/** /**
*
* @var string[] Error codes (or messages) * @var string[] Error codes (or messages)
*/ */
public $errors = array (); public $errors = array();
var $actiontype; var $actiontype;

View File

@ -34,11 +34,11 @@ class Ccountry // extends CommonObject
{ {
var $db; //!< To store db handler var $db; //!< To store db handler
var $error; //!< To return error code (or message) var $error; //!< To return error code (or message)
/** /**
*
* @var string[] Error codes (or messages) * @var string[] Error codes (or messages)
*/ */
public $errors = array (); public $errors = array();
//var $element='ccountry'; //!< Id that identify managed objects //var $element='ccountry'; //!< Id that identify managed objects
//var $table_element='ccountry'; //!< Name of table without prefix where object is stored //var $table_element='ccountry'; //!< Name of table without prefix where object is stored

View File

@ -34,11 +34,11 @@ class Cstate // extends CommonObject
{ {
var $db; //!< To store db handler var $db; //!< To store db handler
var $error; //!< To return error code (or message) var $error; //!< To return error code (or message)
/** /**
*
* @var string[] Error codes (or messages) * @var string[] Error codes (or messages)
*/ */
public $errors = array (); public $errors = array();
//var $element='cstate'; //!< Id that identify managed objects //var $element='cstate'; //!< Id that identify managed objects
//var $table_element='cstate'; //!< Name of table without prefix where object is stored //var $table_element='cstate'; //!< Name of table without prefix where object is stored

View File

@ -29,11 +29,11 @@ class Ctypent // extends CommonObject
{ {
var $db; //!< To store db handler var $db; //!< To store db handler
var $error; //!< To return error code (or message) var $error; //!< To return error code (or message)
/** /**
*
* @var string[] Error codes (or messages) * @var string[] Error codes (or messages)
*/ */
public $errors = array (); public $errors = array();
//var $element='ctypent'; //!< Id that identify managed objects //var $element='ctypent'; //!< Id that identify managed objects
//var $table_element='ctypent'; //!< Name of table without prefix where object is stored //var $table_element='ctypent'; //!< Name of table without prefix where object is stored

View File

@ -31,11 +31,11 @@ class HookManager
{ {
var $db; var $db;
var $error; var $error;
/** /**
*
* @var string[] Error codes (or messages) * @var string[] Error codes (or messages)
*/ */
public $errors = array (); public $errors = array();
// Context hookmanager was created for ('thirdpartycard', 'thirdpartydao', ...) // Context hookmanager was created for ('thirdpartycard', 'thirdpartydao', ...)
var $contextarray=array(); var $contextarray=array();

View File

@ -33,11 +33,11 @@ class Notify
var $id; var $id;
var $db; var $db;
var $error; var $error;
/** /**
*
* @var string[] Error codes (or messages) * @var string[] Error codes (or messages)
*/ */
public $errors = array (); public $errors = array();
var $author; var $author;
var $ref; var $ref;

View File

@ -49,7 +49,7 @@ class modModuleBuilder extends DolibarrModules
$this->name = preg_replace('/^mod/i','',get_class($this)); $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."; $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 // 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) // 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); $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
// Name of image file used for this module. // Name of image file used for this module.

View File

@ -44,11 +44,11 @@ class Import
var $array_import_run_sql_after; var $array_import_run_sql_after;
var $error; var $error;
/** /**
*
* @var string[] Error codes (or messages) * @var string[] Error codes (or messages)
*/ */
public $errors = array (); public $errors = array();
/** /**

View File

@ -31,11 +31,11 @@ class PriceExpression
{ {
var $db; //!< To store db handler var $db; //!< To store db handler
var $error; //!< To return error code (or message) var $error; //!< To return error code (or message)
/** /**
*
* @var string[] Error codes (or messages) * @var string[] Error codes (or messages)
*/ */
public $errors = array (); public $errors = array();
var $id; var $id;
var $title; var $title;

View File

@ -43,11 +43,11 @@ abstract class ActionsCardCommon
*/ */
public $error=''; public $error='';
/** /**
*
* @var string[] Error codes (or messages) * @var string[] Error codes (or messages)
*/ */
public $errors = array (); public $errors = array();
/** /**

View File

@ -125,9 +125,9 @@ class WebsitePage extends CommonObject
/** /**
* Load object in memory from the database * Load object in memory from the database
* *
* @param int $id Id object. * @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 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. * 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 $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 $page Page name (website id must also be filled if this parameter is used)
* @param string $aliasalt Alternative alias to search page (slow) * @param string $aliasalt Alternative alias to search page (slow)