[Phpgroupware-cvs] property/inc class.sotts.inc.php, 1.36, 1.37 class.uiadmin_entity.inc.php, 1.13, 1.14 class.soadmin_entity.inc.php, 1.16, 1.17

[Sigurd Nes <address@hidden>]

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

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

Index: class.sotts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sotts.inc.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** class.sotts.inc.php 16 Nov 2003 13:21:52 -0000      1.36
--- class.sotts.inc.php 16 Nov 2003 17:51:44 -0000      1.37
***************
*** 202,206 ****
                        . " FROM fm_entity_origin $this->join 
fm_entity_category on fm_entity_origin.entity_id=fm_entity_category.entity_id"
                        . " AND fm_entity_origin.cat_id=fm_entity_category.id "
!                       . " WHERE origin ='tts' group by 
fm_entity_origin.entity_id, fm_entity_origin.cat_id,name";
  
                        $this->db->query($sql,__LINE__,__FILE__);
--- 202,206 ----
                        . " FROM fm_entity_origin $this->join 
fm_entity_category on fm_entity_origin.entity_id=fm_entity_category.entity_id"
                        . " AND fm_entity_origin.cat_id=fm_entity_category.id "
!                       . " WHERE origin ='tts' and tracking=1 group by 
fm_entity_origin.entity_id, fm_entity_origin.cat_id,name";
  
                        $this->db->query($sql,__LINE__,__FILE__);

Index: class.soadmin_entity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soadmin_entity.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** class.soadmin_entity.inc.php        12 Nov 2003 18:00:51 -0000      1.16
--- class.soadmin_entity.inc.php        16 Nov 2003 17:51:44 -0000      1.17
***************
*** 280,283 ****
--- 280,284 ----
                                $category['prefix']             = 
$this->db->f('prefix');
                                $category['lookup_tenant']      = 
$this->db->f('lookup_tenant');
+                               $category['tracking']   = 
$this->db->f('tracking');
                                $category['location_level']     = 
$this->db->f('location_level');
  
***************
*** 410,413 ****
--- 411,415 ----
                                $values['prefix'],
                                $values['lookup_tenant'],
+                               $values['tracking'],
                                $values['location_level']
                                );
***************
*** 418,422 ****
                        $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__);
  
--- 420,424 ----
                        $this->db->transaction_begin();
  
!                       $this->db->query("INSERT INTO fm_entity_category 
(entity_id,id,name, descr,prefix,lookup_tenant,tracking,location_level) "
                                . "VALUES ($values_insert)",__LINE__,__FILE__);
  
***************
*** 620,623 ****
--- 622,626 ----
                                        'prefix'                => 
$entity['prefix'],
                                        'lookup_tenant' => 
$entity['lookup_tenant'],
+                                       'tracking'              => 
$entity['tracking'],
                                        'location_level'=> 
$entity['location_level']
                                        );

Index: class.uiadmin_entity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiadmin_entity.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** class.uiadmin_entity.inc.php        12 Nov 2003 18:00:51 -0000      1.13
--- class.uiadmin_entity.inc.php        16 Nov 2003 17:51:44 -0000      1.14
***************
*** 748,751 ****
--- 748,754 ----
                                'lang_location_level_statustext'        => 
lang('select location level'),
                                'lang_no_location_level'                => 
lang('None'),
+                               'lang_tracking'                                 
=> lang('tracking'),
+                               'value_tracking'                        => 
$values['tracking'],
+                               'lang_tracking_statustext'      => lang('If 
this entity type is to be tracket in ticket list')
                        );