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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2011-11-16 20:23:01 +01:00
commit eaba1c94f3
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/compta/bank/account.php
View File

@ -48,7 +48,7 @@ if ($user->societe_id) $socid=$user->societe_id;
$result=restrictedArea($user,'banque',$id,'bank_account','','',$fieldid);
$req_nb=GETPOST("req_nb",'',3);
$thirdarty=GETPOST("thirdparty",'',3);
$thirdparty=GETPOST("thirdparty",'',3);
$account=GETPOST("account");
$vline=GETPOST("vline");
$action=GETPOST("action");
@ -211,7 +211,7 @@ if ($account || $_GET["ref"])
}
if ($thirdparty)
{
$sql_rech.=" AND s.nom LIKE '%".$db->escape($thirdparty)."%')";
$sql_rech.=" AND s.nom LIKE '%".$db->escape($thirdparty)."%'";
$param.='&thirdparty='.urlencode($thirdparty);
$mode_search = 1;
}

4
htdocs/lib/pdf.lib.php
View File

@ -739,11 +739,11 @@ function pdf_getlinedesc($object,$i,$outputlangs,$hideref=0,$hidedesc=0,$issuppl
{
if ($idprod)
{
if ( empty($hidedesc) ) $libelleproduitservice.=$desc;
if ( empty($hidedesc) ) $libelleproduitservice.=dol_htmlentitiesbr($desc,1);
}
else
{
$libelleproduitservice.=$desc;
$libelleproduitservice.=dol_htmlentitiesbr($desc,1);
}
}
}

3
htdocs/lib/project.lib.php
View File

@ -651,7 +651,8 @@ function print_projecttasks_array($db, $socid, $projectsListId, $mytasks=0)
$sql.= " AND ec.fk_socpeople = ".$user->id;
}
$sql.= " GROUP BY p.rowid, p.ref, p.title, p.fk_user_creat, p.public, p.fk_statut";
$sql.= " ORDER BY p.title, p.ref";
$var=true;
$resql = $db->query($sql);
if ( $resql )