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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2023-01-11 21:05:19 +01:00
commit a0e723a05b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
View File

@ -832,7 +832,7 @@ class pdf_espadon extends ModelePdfExpedition
$totalToShip = $tmparray['toship']; $totalToShip = $tmparray['toship'];
// Set trueVolume and volume_units not currently stored into database // Set trueVolume and volume_units not currently stored into database
if ($object->trueWidth && $object->trueHeight && $object->trueDepth) { if ($object->trueWidth && $object->trueHeight && $object->trueDepth) {
$object->trueVolume = price(($object->trueWidth * $object->trueHeight * $object->trueDepth), 0, $outputlangs, 0, 0); $object->trueVolume = $object->trueWidth * $object->trueHeight * $object->trueDepth;
$object->volume_units = $object->size_units * 3; $object->volume_units = $object->size_units * 3;
} }

2
htdocs/fourn/class/fournisseur.facture-rec.class.php
View File

@ -1331,7 +1331,7 @@ class FactureFournisseurRec extends CommonInvoice
// We refresh the object in order to have all necessary data (like date_lim_reglement) // We refresh the object in order to have all necessary data (like date_lim_reglement)
$new_fac_fourn->fetch($new_fac_fourn->id); $new_fac_fourn->fetch($new_fac_fourn->id);
$result = $new_fac_fourn->generateDocument($facturerec->model_pdf, $langs); $result = $new_fac_fourn->generateDocument($facturerec->model_pdf, $langs);
if ($result <= 0) { if ($result < 0) {
$this->errors = $new_fac_fourn->errors; $this->errors = $new_fac_fourn->errors;
$this->error = $new_fac_fourn->error; $this->error = $new_fac_fourn->error;
$error++; $error++;