admingit/altocompta
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge tag 'rel6722' into HEAD

Browse source
This commit is contained in:
Dany De Bontridder 2014-11-10 22:14:42 +01:00
commit 2247f2c803
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
html/index.php
View file

@ -203,7 +203,7 @@ if ( strlen(domaine) > 0 )
echo '
<span style="background-color:#879ed4;color:white;padding-left:4px;padding-right:4px;">
version 6.7.2.1 - '.$my_domain.'
version 6.7.2.2 - '.$my_domain.'
</span>
<BR>
<BR>

5
include/class_stock.php
View file

@ -328,8 +328,9 @@ class Stock extends Stock_Sql
sg_type='c'
and j_id is null
and r_id in (select r_id from profile_sec_repository where p_id=$1)
and sg_date <= to_date($2,'DD.MM.YYYY')
group by r_id,trim(sg_code),f_id
and sg_date >= ( select min(p_start) from parm_periode where p_exercice=$2)
and sg_date <= ( select max(p_end) from parm_periode where p_exercice=$2)
group by r_id,trim(sg_code),f_id
";
$cn->exec_sql($sql_repo_detail, array($g_user->get_profile(), $periode->p_exercice));
return $tmp_id;

4
include/class_user.php
View file

@ -799,7 +799,7 @@ class User
$r=array();
if ($p_access=='R')
{
$r=$this->db->get_array("select u.r_id,r_name
$r=$this->db->get_array("select distinct u.r_id,r_name
from
profile_sec_repository as u
join stock_repository as s on(u.r_id=s.r_id)
@ -811,7 +811,7 @@ class User
}
if ($p_access == 'W')
{
$r=$this->db->get_array("select u.r_id,r_name
$r=$this->db->get_array("select distinct u.r_id,r_name
from
profile_sec_repository as u
join stock_repository as s on(u.r_id=s.r_id)