[Phpgroupware-cvs] property/inc class.soadmin_entity.inc.php, 1.14, 1.15 class.uientity.inc.php, 1.13, 1.14 class.uiadmin_entity.inc.php, 1.11, 1.12

[Sigurd Nes <address@hidden>]

Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv22005/inc

Modified Files:
        class.soadmin_entity.inc.php class.uientity.inc.php 
        class.uiadmin_entity.inc.php 
Log Message:
no message

Index: class.soadmin_entity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soadmin_entity.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** class.soadmin_entity.inc.php        10 Nov 2003 17:24:02 -0000      1.14
--- class.soadmin_entity.inc.php        10 Nov 2003 17:53:01 -0000      1.15
***************
*** 274,278 ****
                                $category['descr']              = 
$this->db->f('descr');
                                $category['prefix']             = 
$this->db->f('prefix');
!                               $category['lookup_vendor']      = 
$this->db->f('lookup_vendor');
                                $category['location_level']     = 
$this->db->f('location_level');
  
--- 274,278 ----
                                $category['descr']              = 
$this->db->f('descr');
                                $category['prefix']             = 
$this->db->f('prefix');
!                               $category['lookup_tenant']      = 
$this->db->f('lookup_tenant');
                                $category['location_level']     = 
$this->db->f('location_level');
  
***************
*** 396,400 ****
                                $values['descr'],
                                $values['prefix'],
!                               $values['lookup_vendor'],
                                $values['location_level']
                                );
--- 396,400 ----
                                $values['descr'],
                                $values['prefix'],
!                               $values['lookup_tenant'],
                                $values['location_level']
                                );
***************
*** 405,409 ****
                        $this->db->transaction_begin();
  
!                       $this->db->query("INSERT INTO fm_entity_category 
(entity_id,id,name, descr,prefix,lookup_vendor,location_level) "
                                . "VALUES ($values_insert)",__LINE__,__FILE__);
  
--- 405,409 ----
                        $this->db->transaction_begin();
  
!                       $this->db->query("INSERT INTO fm_entity_category 
(entity_id,id,name, descr,prefix,lookup_tenant,location_level) "
                                . "VALUES ($values_insert)",__LINE__,__FILE__);
  
***************
*** 606,610 ****
                                        'name'                  => 
$entity['name'],
                                        'prefix'                => 
$entity['prefix'],
!                                       'lookup_vendor' => 
$entity['lookup_vendor'],
                                        'location_level'=> 
$entity['location_level']
                                        );
--- 606,610 ----
                                        'name'                  => 
$entity['name'],
                                        'prefix'                => 
$entity['prefix'],
!                                       'lookup_tenant' => 
$entity['lookup_tenant'],
                                        'location_level'=> 
$entity['location_level']
                                        );

Index: class.uientity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uientity.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** class.uientity.inc.php      10 Nov 2003 17:24:00 -0000      1.13
--- class.uientity.inc.php      10 Nov 2003 17:53:01 -0000      1.14
***************
*** 441,444 ****
--- 441,445 ----
                        $values_attribute       = 
get_var('values_attribute',array('POST','GET'));
                        $bypass                         = 
get_var('bypass',array('POST','GET'));
+                       $lookup_tenant          = 
get_var('lookup_tenant',array('POST','GET'));
  
                        $insert_record          = 
$GLOBALS['phpgw']->session->appsession('insert_record',$this->currentapp);
***************
*** 519,522 ****
--- 520,527 ----
                        }
  
+                       if($tenant_id)
+                       {
+                               $lookup_tenant=True;
+                       }
  //_debug_array($values);
                        if ($values['save'])
***************
*** 623,626 ****
--- 628,636 ----
                        }
  
+                       if($category['lookup_tenant'])
+                       {
+                               $lookup_tenant=True;
+                       }
+ 
                        if($entity['location_form'])
                        {
***************
*** 630,633 ****
--- 640,644 ----
                                                'no_link'               => 
False, // disable lookup links for location type less than type_id
                                                'lookup_type'   => $lookup_type,
+                                               'tenant'                => 
$lookup_tenant,
                                                'lookup_entity' => 
$lookup_entity,
                                                'entity_data'   => $values['p']
***************
*** 714,717 ****
--- 725,729 ----
                                'cat_list'                                      
        => $cat_list,
                                'location_code'                                 
=> $location_code,
+                               'lookup_tenant'                                 
=> $lookup_tenant,
  
                                'lang_entity'                                   
=> lang('entity'),
***************
*** 841,844 ****
--- 853,857 ----
                                                'no_link'               => 
False, // disable lookup links for location type less than type_id
                                                'lookup_type'   => $lookup_type,
+                                               'tenant'                => 
$category['lookup_tenant'],
                                                'lookup_entity' => 
$lookup_entity,
                                                'entity_data'   => $values['p']

Index: class.uiadmin_entity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiadmin_entity.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** class.uiadmin_entity.inc.php        9 Nov 2003 20:25:11 -0000       1.11
--- class.uiadmin_entity.inc.php        10 Nov 2003 17:53:01 -0000      1.12
***************
*** 737,743 ****
                                'type_id'                                       
        => $values['type_id'],
                                'value_descr'                                   
=> $values['descr'],
!                               'lang_lookup_vendor'                    => 
lang('lookup vendor'),
!                               'value_lookup_vendor'                   => 
$values['lookup_vendor'],
!                               'lang_lookup_vendor_statustext' => lang('If 
this entity type is to look up vendors'),
                                'lang_location_level'                   => 
lang('location level'),
                                'location_level_list'                   => 
$this->bo->get_location_level_list($values['location_level']),
--- 737,743 ----
                                'type_id'                                       
        => $values['type_id'],
                                'value_descr'                                   
=> $values['descr'],
!                               'lang_lookup_tenant'                    => 
lang('lookup tenant'),
!                               'value_lookup_tenant'                   => 
$values['lookup_tenant'],
!                               'lang_lookup_tenant_statustext' => lang('If 
this entity type is to look up tenants'),
                                'lang_location_level'                   => 
lang('location level'),
                                'location_level_list'                   => 
$this->bo->get_location_level_list($values['location_level']),