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

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

Browse Source 
Conflicts:
	htdocs/fichinter/list.php
This commit is contained in:
Laurent Destailleur 2020-05-31 00:28:40 +02:00
commit 6123596ec9
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/facture/card.php
View File

@ -1253,7 +1253,7 @@ if (empty($reshook))
} }
// Add link between credit note and origin // Add link between credit note and origin
if (!empty($object->fk_facture_source)) { if (!empty($object->fk_facture_source) && $id > 0) {
$facture_source->fetch($object->fk_facture_source); $facture_source->fetch($object->fk_facture_source);
$facture_source->fetchObjectLinked(); $facture_source->fetchObjectLinked();

4
htdocs/fichinter/list.php
View File

@ -75,8 +75,6 @@ $pagenext = $page + 1;
if (!$sortorder) $sortorder = "DESC"; if (!$sortorder) $sortorder = "DESC";
if (!$sortfield) if (!$sortfield)
{ {
//if (empty($conf->global->FICHINTER_DISABLE_DETAILS)) $sortfield="fd.date";
//else
$sortfield = "f.ref"; $sortfield = "f.ref";
} }
@ -245,7 +243,7 @@ if ($search_contrat_ref) {
$sql .= natural_search('c.ref', $search_contrat_ref); $sql .= natural_search('c.ref', $search_contrat_ref);
} }
if ($search_desc) { if ($search_desc) {
if (empty($conf->global->FICHINTER_DISABLE_DETAILS)) $sql .= natural_search(array('f.description', 'fd.description'), $search_desc); if (empty($conf->global->FICHINTER_DISABLE_DETAILS) && $atleastonefieldinlines) $sql .= natural_search(array('f.description', 'fd.description'), $search_desc);
else $sql .= natural_search(array('f.description'), $search_desc); else $sql .= natural_search(array('f.description'), $search_desc);
} }
if ($search_status != '' && $search_status >= 0) { if ($search_status != '' && $search_status >= 0) {