[Phpgroupware-cvs] property/inc class.soinvoice.inc.php, 1.17 class.socommon.inc.php, 1.12

[sigurdne]

Update of property/inc

Modified Files:
     Branch: MAIN
            class.soinvoice.inc.php lines: +2 -2
            class.socommon.inc.php lines: +22 -1

Log Message:
*** empty log message ***

====================================================
Index: property/inc/class.soinvoice.inc.php
diff -u property/inc/class.soinvoice.inc.php:1.16 
property/inc/class.soinvoice.inc.php:1.17
--- property/inc/class.soinvoice.inc.php:1.16   Fri Aug 26 12:03:56 2005
+++ property/inc/class.soinvoice.inc.php        Wed Nov  2 11:55:03 2005
@@ -866,7 +866,7 @@
                function get_invoice_user_list()
                {

-                       $sql = "SELECT * FROM fm_acl2 $this->join 
phpgw_accounts on phpgw_accounts.account_id=fm_acl2.acl_account where 
acl_location ='.invoice' and account_type='u' ";
+                       $sql = "SELECT * FROM fm_acl2 $this->join 
phpgw_accounts on phpgw_accounts.account_id=fm_acl2.acl_account where 
acl_location ='.invoice' and account_type='u' order by account_lastname";
                        $this->db->query($sql,__LINE__,__FILE__);

                        $employees[] = Array(

====================================================
Index: property/inc/class.socommon.inc.php
diff -u property/inc/class.socommon.inc.php:1.11 
property/inc/class.socommon.inc.php:1.12
--- property/inc/class.socommon.inc.php:1.11    Thu Sep 29 11:16:01 2005
+++ property/inc/class.socommon.inc.php Wed Nov  2 11:55:03 2005
@@ -129,6 +129,26 @@
                        $k=count($accounts);
                        for ($i=0;$i<$k;$i++)
                        {
+                               $in_list[] = $accounts[$i];
+                       }
+
+                       $sql = 'SELECT * FROM phpgw_accounts where account_id 
in ('. implode(',',$in_list) . ') order by account_lastname';
+                       $this->db->query($sql,__LINE__,__FILE__);
+                       while ($this->db->next_record())
+                       {
+                               $employees[] = Array(
+                                       'account_id'        => 
$this->db->f('account_id'),
+                                       'account_lid'       => 
$this->db->f('account_lid'),
+                                       'account_type'      => 
$this->db->f('account_type'),
+                                       'account_firstname' => 
$this->db->f('account_firstname'),
+                                       'account_lastname'  => 
$this->db->f('account_lastname'),
+                                       'account_status'    => 
$this->db->f('account_status'),
+                                       'account_expires'   => 
$this->db->f('account_expires')
+                                       );
+
+                       }
+/*                     for ($i=0;$i<$k;$i++)
+                       {
                                $sql = 'SELECT * FROM phpgw_accounts where 
account_id=' . (int)$accounts[$i];
                                $this->db->query($sql,__LINE__,__FILE__);
                                $this->db->next_record();
@@ -142,6 +162,7 @@
                                        'account_expires'   => 
$this->db->f('account_expires')
                                        );
                        }
+*/
                        return $employees;
                }