Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-07 16:41:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Laurent Destailleur (aka Eldy)
2025-01-05 12:31:33 +01:00
parent dee9f20f0c 41cfaf8a61
commit 6a492eaf4e
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1582,7 +1582,7 @@ class Commande extends CommonOrder
$pu_ht = price2num($pu_ht);
$pu_ht_devise = price2num($pu_ht_devise);
$pu_ttc = price2num($pu_ttc);
$pa_ht = (float) price2num($pa_ht);
$pa_ht = price2num($pa_ht); // do not convert to float here, it breaks the functioning of $pa_ht_isemptystring
if (!preg_match('/\((.*)\)/', (string) $txtva)) {
$txtva = price2num($txtva); // $txtva can have format '5,1' or '5.1' or '5.1(XXX)', we must clean only if '5,1'
}
@@ -1717,7 +1717,7 @@ class Commande extends CommonOrder
$this->line->date_end = $date_end;
$this->line->fk_fournprice = $fk_fournprice;
$this->line->pa_ht = $pa_ht;
$this->line->pa_ht = $pa_ht; // Can be '' when not defined or 0 if defined to 0 or a price value
// Multicurrency
$this->line->fk_multicurrency = $this->fk_multicurrency;
@@ -1727,7 +1727,7 @@ class Commande extends CommonOrder
$this->line->multicurrency_total_tva = (float) $multicurrency_total_tva;
$this->line->multicurrency_total_ttc = (float) $multicurrency_total_ttc;
// TODO Ne plus utiliser
// TODO Do not use anymore
$this->line->price = $price;
if (is_array($array_options) && count($array_options) > 0) {