[Phpgroupware-cvs] property/inc class.uilookup.inc.php class.uiloc...

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    property
Branch:         
Changes by:     Sigurd Nes <address@hidden>     06/03/09 13:07:12

Modified files:
        inc            : class.uilookup.inc.php class.uilocation.inc.php 
                         class.solocation.inc.php 

Log message:
        

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/class.uilookup.inc.php.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/class.uilocation.inc.php.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/class.solocation.inc.php.diff?tr1=1.27&tr2=1.28&r1=text&r2=text

Patches:
Index: property/inc/class.solocation.inc.php
diff -u property/inc/class.solocation.inc.php:1.27 
property/inc/class.solocation.inc.php:1.28
--- property/inc/class.solocation.inc.php:1.27  Tue Mar  7 13:58:15 2006
+++ property/inc/class.solocation.inc.php       Thu Mar  9 13:07:12 2006
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage location
-       * @version $Id: class.solocation.inc.php,v 1.27 2006/03/07 13:58:15 
sigurdne Exp $
+       * @version $Id: class.solocation.inc.php,v 1.28 2006/03/09 13:07:12 
sigurdne Exp $
        */
 
        /**
@@ -1187,6 +1187,7 @@
                        $this->uicols = array();
                        $location_array = split('-',$location_code);
                        $type_id= count($location_array);
+                       $contacts                       = 
CreateObject('phpgwapi.contacts');
 
                        if (!$type_id)
                        {
Index: property/inc/class.uilocation.inc.php
diff -u property/inc/class.uilocation.inc.php:1.22 
property/inc/class.uilocation.inc.php:1.23
--- property/inc/class.uilocation.inc.php:1.22  Tue Mar  7 13:58:15 2006
+++ property/inc/class.uilocation.inc.php       Thu Mar  9 13:07:12 2006
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage location
-       * @version $Id: class.uilocation.inc.php,v 1.22 2006/03/07 13:58:15 
sigurdne Exp $
+       * @version $Id: class.uilocation.inc.php,v 1.23 2006/03/09 13:07:12 
sigurdne Exp $
        */
 
        /**
@@ -373,7 +373,7 @@
 
                        $data = array
                        (
-                               'colspan'                               => 
$uicols_count,
+                               'colspan'                               => 
$uicols_count+1,
                                'lang_excel'                            => 
'excel',
                                'link_excel'                            => 
$GLOBALS['phpgw']->link('/index.php',$link_excel),
                                'lang_excel_help'                       => 
lang('Download table to MS Excel'),
Index: property/inc/class.uilookup.inc.php
diff -u property/inc/class.uilookup.inc.php:1.13 
property/inc/class.uilookup.inc.php:1.14
--- property/inc/class.uilookup.inc.php:1.13    Fri Feb  3 12:05:49 2006
+++ property/inc/class.uilookup.inc.php Thu Mar  9 13:07:12 2006
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage core
-       * @version $Id: class.uilookup.inc.php,v 1.13 2006/02/03 12:05:49 
sigurdne Exp $
+       * @version $Id: class.uilookup.inc.php,v 1.14 2006/03/09 13:07:12 
sigurdne Exp $
        */
 
        /**
@@ -448,7 +448,7 @@
                                'sort_name'     => 
$this->nextmatchs->show_sort_order(array
                                                                                
(
                                                                                
        'sort'  => $this->sort,
-                                                                               
        'var'   =>      'street_name',
+                                                                               
        'var'   =>      'descr',
                                                                                
        'order' =>      $this->order,
                                                                                
        'extra'         => array('menuaction'   => 
$this->currentapp.'.uilookup.street',
                                                                                
                                                        'cat_id'        
=>$this->cat_id)