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

Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur (aka Eldy)
2025-01-24 15:25:51 +01:00
parent bd46a19c3f 34feedbb03
commit fbe4ccd0e2
84 changed files with 646 additions and 457 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1813,7 +1813,7 @@ class Commande extends CommonOrder
$localtax2_tx = get_localtax($tva_tx, 2, $this->thirdparty, $mysoc, $tva_npr);
// multiprix
if ($conf->global->PRODUIT_MULTIPRICES && $this->thirdparty->price_level) {
if (getDolGlobalString('PRODUIT_MULTIPRICES') && $this->thirdparty->price_level) {
$price = $prod->multiprices[$this->thirdparty->price_level];
} else {
$price = $prod->price;