Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-09 19:18:22 +01:00
Code Issues Packages Projects Releases Wiki 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/commande/mod_commande_marbre.php
View File

@@ -31,7 +31,10 @@ class mod_commande_marbre extends ModeleNumRefCommandes
{
var $version='dolibarr'; // 'development', 'experimental', 'dolibarr'
var $prefix='CO';
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
var $nom='Marbre';

10
htdocs/core/modules/commande/modules_commande.php
View File

@@ -39,7 +39,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
*/
abstract class ModelePDFCommandes extends CommonDocGenerator
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/**
* Return list of active generation modules
@@ -72,7 +75,10 @@ abstract class ModelePDFCommandes extends CommonDocGenerator
abstract class ModeleNumRefCommandes
{
var $error='';
/**
* @var string Error code (or message)
*/
public $error='';
/**
* Return if a module can be used or not