[Fmsystem-commits] [11589] Check for expired rights

[Sigurd Nes]

Revision: 11589
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11589
Author:   sigurdne
Date:     2014-01-09 09:22:13 +0000 (Thu, 09 Jan 2014)
Log Message:
-----------
Check for expired rights

Modified Paths:
--------------
    trunk/property/inc/class.soinvoice.inc.php

Modified: trunk/property/inc/class.soinvoice.inc.php
===================================================================
--- trunk/property/inc/class.soinvoice.inc.php  2014-01-08 14:28:53 UTC (rev 
11588)
+++ trunk/property/inc/class.soinvoice.inc.php  2014-01-09 09:22:13 UTC (rev 
11589)
@@ -1363,7 +1363,9 @@
                        if(isset($this->config->config_data['invoice_acl']) && 
$this->config->config_data['invoice_acl'] == 'dimb')
                        {
                                $sql = "SELECT DISTINCT fm_ecodimb.* FROM 
fm_ecodimb {$this->db->join} fm_ecodimb_role_user ON fm_ecodimb.id = 
fm_ecodimb_role_user.ecodimb"
-                               . ' WHERE fm_ecodimb_role_user.user_id = ' . 
(int) $this->account_id . ' ORDER BY descr ASC';
+                               . ' WHERE fm_ecodimb_role_user.user_id = ' . 
(int) $this->account_id
+                               . ' AND expired_on IS NULL'
+                               . ' ORDER BY descr ASC';
                                $include_selected = true;
                        }
                        else