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

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

Browse source
This commit is contained in:
Laurent Destailleur 2023-12-21 19:40:56 +01:00
commit cd69c59e6c
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/don/list.php
View file

@ -140,7 +140,7 @@ if ($search_status != '' && $search_status != '-4') {
$sql .= " AND d.fk_statut IN (".$db->sanitize($search_status).")";
}
if (trim($search_ref) != '') {
$sql .= natural_search('d.ref', $search_ref);
$sql .= natural_search(['d.ref', "d.rowid"], $search_ref);
}
if (trim($search_all) != '') {
$sql .= natural_search(array_keys($fieldstosearchall), $search_all);

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

@ -1327,7 +1327,7 @@ class FactureFournisseurRec extends CommonInvoice
}
if (!$error && ($facturerec->auto_validate || $forcevalidation)) {
$result = $new_fac_fourn->validate($user);
$laststep="Validate by user $user";
$laststep="Validate by user {$user->id}";
if ($result <= 0) {
$this->errors = $new_fac_fourn->errors;
$this->error = $new_fac_fourn->error;