vignesh/dolibarr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Laurent Destailleur 2026-03-23 12:28:11 +01:00
commit 4147fc77cb
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
htdocs/fourn/commande/list.php
View file

@ -493,6 +493,10 @@ if (empty($reshook)) {
for ($i = 0; $i < $num; $i++) {
$desc = ($lines[$i]->desc ? $lines[$i]->desc : $lines[$i]->libelle);
// If we build one invoice for several supplier orders, append the source order reference on the invoice line.
if (!empty($createbills_onebythird)) {
$desc = dol_concatdesc($desc, $langs->trans("SupplierOrder").' '.$cmd->ref.' - '.dol_print_date($cmd->date, 'day'));
}
if ($lines[$i]->subprice < 0) {
require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';

2
htdocs/societe/class/api_thirdparties.class.php
View file

@ -1080,7 +1080,7 @@ class Thirdparties extends DolibarrApi
}
$result = $this->company->fetch($id);
if (!is_array($result)) {
if ($result <= 0) {
throw new RestException(404, 'Thirdparty not found');
}