Fix calculation of total amount of multicurrency
This commit is contained in:
Günter Lukas 2023-11-16 14:59:07 +01:00 committed by GitHub
parent 966e26e450
commit 06915267a7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1616,6 +1616,10 @@ class Expedition extends CommonObject
$this->total_localtax1 = 0;
$this->total_localtax2 = 0;
$this->multicurrency_total_ht = 0;
$this->multicurrency_total_tva = 0;
$this->multicurrency_total_ttc = 0;
$shipmentlinebatch = new ExpeditionLineBatch($this->db);
while ($i < $num) {
@ -1704,10 +1708,14 @@ class Expedition extends CommonObject
// Multicurrency
$this->fk_multicurrency = $obj->fk_multicurrency;
$this->multicurrency_code = $obj->multicurrency_code;
$this->multicurrency_subprice = $obj->multicurrency_subprice;
$this->multicurrency_total_ht = $obj->multicurrency_total_ht;
$this->multicurrency_total_tva = $obj->multicurrency_total_tva;
$this->multicurrency_total_ttc = $obj->multicurrency_total_ttc;
$line->multicurrency_subprice = $obj->multicurrency_subprice;
$line->multicurrency_total_ht = $obj->multicurrency_total_ht;
$line->multicurrency_total_tva = $obj->multicurrency_total_tva;
$line->multicurrency_total_ttc = $obj->multicurrency_total_ttc;
$this->multicurrency_total_ht += $obj->multicurrency_total_ht;
$this->multicurrency_total_tva += $obj->multicurrency_total_tva;
$this->multicurrency_total_ttc += $obj->multicurrency_total_ttc;
if ($originline != $obj->fk_origin_line) {
$line->detail_batch = array();