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

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

Browse Source 
Conflicts:
	htdocs/product/list.php
This commit is contained in:
Laurent Destailleur 2019-04-04 17:41:22 +02:00
commit fa95f5575c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/product/list.php
View File

@ -773,7 +773,7 @@ if ($resql)
// Label
if (! empty($arrayfields['p.label']['checked']))
{
print '<td class="tdoverflowmax200">'.dol_trunc($obj->label,40).'</td>';
print '<td class="tdoverflowmax200">'.dol_trunc($obj->label, 40).'</td>';
if (! $i) $totalarray['nbfield']++;
}

4
htdocs/projet/list.php
View File

@ -713,8 +713,8 @@ while ($i < min($num,$limit))
// Title
if (! empty($arrayfields['p.title']['checked']))
{
print '<td class="tdoverflowmax100">';
print dol_trunc($obj->title,80);
print '<td class="tdoverflowmax200">';
print dol_trunc($obj->title, 80);
print '</td>';
if (! $i) $totalarray['nbfield']++;
}