[Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php,1.48,1.49 class.botenant.inc.php,1.1,1.2class.sostandard_entity.inc.php,1.9,1.10 class.sotenant.inc.php,1.1,1.2 class.uiowner.inc.php,1.6,1.7 hook_admin.inc.php,1.33,1.34

[Sigurd Nes <address@hidden>]

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

Modified Files:
        class.bocommon.inc.php class.botenant.inc.php 
        class.sostandard_entity.inc.php class.sotenant.inc.php 
        class.uiowner.inc.php hook_admin.inc.php 
Log Message:
no message

Index: class.bocommon.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bocommon.inc.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -r1.48 -r1.49
*** class.bocommon.inc.php      23 May 2003 08:40:19 -0000      1.48
--- class.bocommon.inc.php      29 May 2003 07:42:24 -0000      1.49
***************
*** 666,670 ****
                                
$menu['sub_workorder_list']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiworkorder.index');
                                
$menu['sub_workorder_request']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uirequest.index');
-               //              
$menu['sub_workorder_archive']=$GLOBALS['phpgw']->link('/property/list_workorder.php','sub=workorder&status=Avsluttet');
                                
$menu['sub_workorder_template']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uitemplate.index');
                                
$menu['sub_workorder_project']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiproject.index');
--- 666,669 ----
***************
*** 672,676 ****
                                
$menu['sublang_workorder_list']=lang('Workorder');
                                
$menu['sublang_workorder_request']=lang('Request');
-               //              
$menu['sublang_workorder_archive']=lang('Archive');
                                
$menu['sublang_workorder_template']=lang('Workorder template');
                                if($this->acl2->check('.project',16))
--- 671,674 ----
***************
*** 699,702 ****
--- 697,714 ----
                                $menu['sub_workorder_event']='';
                                $menu['sublang_workorder_event']='';
+                       }
+                       if ($sub == admin_location && 
$this->acl2->check('.property',16))
+                       {
+                               
$menu['sub_location_type_list']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiadmin_location.index');
+                               
$menu['sublang_location_type_list']=lang('Location type');
+                               
$menu['sub_location_config']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiadmin_location.config');
+                               $menu['sublang_location_config']=lang('Config');
+                       }
+                       else
+                       {
+                               $menu['sub_location_type_list']='';
+                               $menu['sublang_location_type_list']='';
+                               $menu['sub_location_config']='';
+                               $menu['sublang_location_config']='';
                        }
  

Index: class.botenant.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.botenant.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.botenant.inc.php      22 May 2003 20:09:22 -0000      1.1
--- class.botenant.inc.php      29 May 2003 07:42:24 -0000      1.2
***************
*** 185,189 ****
                function read_category_name($cat_id='')
                {
!                       return $this->so->read_category_name($cat_id);
                }
  
--- 185,189 ----
                function read_category_name($cat_id='')
                {
! //                    return $this->so->read_category_name($cat_id);
                }
  
***************
*** 201,204 ****
--- 201,210 ----
  
                        $categories= $this->so->select_category_list();
+ 
+                       $categories[0]['id']    = 1;
+                       $categories[0]['name']  = lang('male');
+                       $categories[1]['id']    = 2;
+                       $categories[1]['name']  = lang('female');
+ 
  
                        while (is_array($categories) && list(,$category) = 
each($categories))

Index: class.sostandard_entity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sostandard_entity.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** class.sostandard_entity.inc.php     21 May 2003 12:46:39 -0000      1.9
--- class.sostandard_entity.inc.php     29 May 2003 07:42:24 -0000      1.10
***************
*** 168,171 ****
--- 168,172 ----
                                        . "VALUES ('" . $standard['id'] . "','" 
. $standard['name'] . "','" . $standard['descr'] . "','" . $standard['prefix']. 
"')",__LINE__,__FILE__);
  
+                               $receipt['id']=$standard['id'];
                                $receipt['message'][] = array('msg'     => 
lang('standard has been saved'));
                        }
***************
*** 341,346 ****
                                        . "VALUES ('" . $attrib['id'] . "','" . 
$attrib['type_id'] . "','" . $attrib['name'] . "','" . $attrib['descr'] . "','" 
. $attrib['datatype']. "')",__LINE__,__FILE__);
  
                                $receipt['message'][] = array('msg'     => 
lang('Attribute has been saved')     );
- 
  
                        }
--- 342,347 ----
                                        . "VALUES ('" . $attrib['id'] . "','" . 
$attrib['type_id'] . "','" . $attrib['name'] . "','" . $attrib['descr'] . "','" 
. $attrib['datatype']. "')",__LINE__,__FILE__);
  
+                               $receipt['id']=$attrib['id'];
                                $receipt['message'][] = array('msg'     => 
lang('Attribute has been saved')     );
  
                        }

Index: class.sotenant.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sotenant.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.sotenant.inc.php      22 May 2003 20:09:22 -0000      1.1
--- class.sotenant.inc.php      29 May 2003 07:42:24 -0000      1.2
***************
*** 75,79 ****
                        if ($cat_id > 0)
                        {
!                               $filtermethod .= " $where category='$cat_id' ";
                                $where = 'AND';
  
--- 75,79 ----
                        if ($cat_id > 0)
                        {
!                               $filtermethod .= " $where sex_id='$cat_id' ";
                                $where = 'AND';
  
***************
*** 88,92 ****
                        }
  
!                       $sql = "SELECT fm_tenant.*, descr as category FROM 
fm_tenant $this->join fm_tenant_sex on fm_tenant.sex_id=fm_tenant_sex.id 
$filtermethod $querymethod";
  
                        $this->db2->query($sql,__LINE__,__FILE__);
--- 88,92 ----
                        }
  
!                       $sql = "SELECT * FROM fm_tenant  $filtermethod 
$querymethod";
  
                        $this->db2->query($sql,__LINE__,__FILE__);

Index: class.uiowner.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiowner.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** class.uiowner.inc.php       23 May 2003 10:11:48 -0000      1.6
--- class.uiowner.inc.php       29 May 2003 07:42:24 -0000      1.7
***************
*** 248,251 ****
--- 248,256 ----
                        $values['org_name']             = 
get_var('vendor_name',array('POST'));
  
+ /*                    if($GLOBALS['phpgw']->is_repost())
+                       {
+                               $receipt['error'][]=array('msg'=>lang('Repost 
!'));
+                       }
+ */
                        $GLOBALS['phpgw']->xslttpl->add_file(array('owner'));
  

Index: hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/hook_admin.inc.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** hook_admin.inc.php  22 May 2003 20:04:16 -0000      1.33
--- hook_admin.inc.php  29 May 2003 07:42:24 -0000      1.34
***************
*** 18,23 ****
                                'Report type'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_entity.index&type=report'),
                                'Location type'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_entity.index&type=location'),
                                'Update the not active category for 
locations'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uiproperty.update_cat'),
!                               'Request Categories'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=request'),
                                'Workorder Categories' => 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=wo'),
                                'Ticket Categories'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=ticket'),
--- 18,24 ----
                                'Report type'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_entity.index&type=report'),
                                'Location type'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_entity.index&type=location'),
+                               'Location type_2'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uiadmin_location.index'),
                                'Update the not active category for 
locations'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uiproperty.update_cat'),
! //                            'Request Categories'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=request'),
                                'Workorder Categories' => 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=wo'),
                                'Ticket Categories'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=ticket'),