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

Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0

Browse Source
This commit is contained in:
Laurent Destailleur
2018-10-30 14:28:25 +01:00
parent 7a14a1716d 38396e490a
commit b0ef8680ff
2 changed files with 5 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/commande/class/commande.class.php
View File

@@ -85,6 +85,9 @@ class Commande extends CommonOrder
public $facturee;
public $billed; // billed or not
/**
* @var int Draft Status of the order
*/
public $brouillon;
public $cond_reglement_code;
@@ -233,7 +236,7 @@ class Commande extends CommonOrder
$mybool|=@include_once $dir.$file;
}
if (! $mybool)
if ($mybool === false)
{
dol_print_error('',"Failed to include file ".$file);
return '';
@@ -407,6 +410,7 @@ class Commande extends CommonOrder
{
$this->ref = $num;
$this->statut = self::STATUS_VALIDATED;
$this->brouillon = 0;
}
if (! $error)