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

Merge remote-tracking branch 'origin/3.9' into develop

Browse Source 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/core/class/html.formprojet.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/accountancy.lang
This commit is contained in:
Laurent Destailleur
2016-02-09 14:40:25 +01:00
parent f640bf7c61 223195538a
commit 5ea9c6dd83
30 changed files with 147 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3418,14 +3418,14 @@ class Commande extends CommonOrder
/**
* Is the customer order delayed?
*
* @return bool
* @return bool true if late, false if not
*/
public function hasDelay()
{
global $conf;
if (!($this->statut > Commande::STATUS_DRAFT) && ($this->statut < Commande::STATUS_CLOSED)) {
return false;
if (! ($this->statut > Commande::STATUS_DRAFT && $this->statut < Commande::STATUS_CLOSED)) {
return false; // Never late if not inside this status range
}
$now = dol_now();