lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename const

Browse Source
This commit is contained in:
Laurent Destailleur 2020-04-03 12:54:23 +02:00
parent 7b55deccac
commit 4170580d88
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -24,8 +24,8 @@ Following changes may create regressions for some external modules, but were nec
* Removed hidden constant MAIN_EXTRAFIELDS_IN_ONE_TD that was useless. * Removed hidden constant MAIN_EXTRAFIELDS_IN_ONE_TD that was useless.
* Reference of object including a "/" are no more allowed. It is never used by default but to support setup that introduced it, the "/" will be replaced * Reference of object including a "/" are no more allowed. It is never used by default but to support setup that introduced it, the "/" will be replaced
by a "_" automatically when a reference (with a custom numbering mask that use it) is generated. by a "_" automatically when a reference (with a custom numbering mask that use it) is generated.
* Library jflot (replace with chartjs) and geoip (replaced with geoip2) were removed.
* Hidden constant COMMANDE_VALID_AFTER_CLOSE_PROPAL were renamed into ORDER_VALID_AFTER_CLOSE_PROPAL.
***** ChangeLog for 11.0.3 compared to 11.0.2 ***** ***** ChangeLog for 11.0.3 compared to 11.0.2 *****
FIX: unit price for selected supplier products not set. NaN was used. FIX: unit price for selected supplier products not set. NaN was used.

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

@ -931,7 +931,7 @@ class Commande extends CommonOrder
dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR); dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
return -2; return -2;
} }
if (!empty($conf->global->COMMANDE_REQUIRE_SOURCE) && $this->source < 0) if (!empty($conf->global->ORDER_REQUIRE_SOURCE) && $this->source < 0)
{ {
$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Source")); $this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Source"));
dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR); dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
@ -1412,8 +1412,8 @@ class Commande extends CommonOrder
if (!$error) if (!$error)
{ {
// Ne pas passer par la commande provisoire // Validate immediatly the order
if ($conf->global->COMMANDE_VALID_AFTER_CLOSE_PROPAL == 1) if (! empty($conf->global->ORDER_VALID_AFTER_CLOSE_PROPAL))
{ {
$this->fetch($ret); $this->fetch($ret);
$this->valid($user); $this->valid($user);