phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] CVS: property/inc class.bobuilding.inc.php,1.2,1.3 cl


From: Sigurd Nes <address@hidden>
Subject: [Phpgroupware-cvs] CVS: property/inc class.bobuilding.inc.php,1.2,1.3 class.bocommon.inc.php,1.8,1.9 class.sobuilding.inc.php,1.3,1.4 class.socommon.inc.php,1.4,1.5 class.sotts.inc.php,1.4,1.5 class.uibuilding.inc.php,1.3,1.4 class.uiproperty.inc.php,1.4,1.5 class.uitts.inc.php,1.4,1.5 hook_admin.inc.php,1.11,1.12
Date: Fri, 07 Feb 2003 06:18:47 -0500

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

Modified Files:
        class.bobuilding.inc.php class.bocommon.inc.php 
        class.sobuilding.inc.php class.socommon.inc.php 
        class.sotts.inc.php class.uibuilding.inc.php 
        class.uiproperty.inc.php class.uitts.inc.php 
        hook_admin.inc.php 
Log Message:
no message

Index: class.bobuilding.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bobuilding.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.bobuilding.inc.php    26 Jan 2003 12:27:49 -0000      1.2
--- class.bobuilding.inc.php    7 Feb 2003 11:18:44 -0000       1.3
***************
*** 114,118 ****
                }
  
!               function save($building,$action='')
                {
                        if ($building['access'])
--- 114,118 ----
                }
  
!               function save($building,$action='',$err='')
                {
                        if ($building['access'])
***************
*** 125,133 ****
                        }
  
!                       if ($action=='edit')
                        {
!                               if ($building['building_id'] != 0)
                                {
!                                       $message = $this->so->edit($building);
                                }
                        }
--- 125,140 ----
                        }
  
!                       if ($action=='edit' && !$err)
                        {
!                               if ($building['building_id'] != 0 )
                                {
!                                       if 
($this->socommon->check_building($building['property_id'],$building['building_id']))
!                                       {
!                                               $receipt = 
$this->so->edit($building);
!                                       }
!                                       else
!                                       {
!                                               
$receipt['error'][]=array('msg'=>lang('This building_id ID does not exist!'));
!                                       }
                                }
                        }
***************
*** 135,142 ****
                        {
  
!                               
$building['location_code']=$this->bocommon->location_code($building['property_id'],$building['building_id']);
!                               $message = $this->so->add($building);
                        }
!                       return $message;
                }
  
--- 142,161 ----
                        {
  
!                               
if(!$this->socommon->check_property($building['property_id']))
!                               {
!                                       
$receipt['error'][]=array('msg'=>lang('This property ID does not exist!'));
!                               }
!                               
if($this->socommon->check_building($building['property_id'],$building['building_id']))
!                               {
!                                       
$receipt['error'][]=array('msg'=>lang('This building is already registered!'));
!                               }
! 
!                               if(!$receipt['error'])
!                               {
!                                       
$building['location_code']=$this->bocommon->location_code($building['property_id'],$building['building_id']);
!                                       $receipt = $this->so->add($building);
!                               }
                        }
!                       return $receipt;
                }
  

Index: class.bocommon.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bocommon.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** class.bocommon.inc.php      3 Feb 2003 21:50:22 -0000       1.8
--- class.bocommon.inc.php      7 Feb 2003 11:18:44 -0000       1.9
***************
*** 422,430 ****
                                
$menu['sub_invoice_list']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiinvoice.index&sub=invoice');
                                
$menu['sub_invoice_paid']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiinvoice.index&sub=invoice&paid=true');
!                               
$menu['sub_invoice_powermeter']=$GLOBALS['phpgw']->link('/property/list_power_meter.php','sub=invoice');
                                
$menu['sub_invoice_consume']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiinvoice.consume&sub=invoice');
                                $menu['sublang_invoice_list']=lang('Invoice');
                                $menu['sublang_invoice_paid']=lang('Paid');
!                               $menu['sublang_invoice_powermeter']=lang('Power 
meter');
                                
$menu['sublang_invoice_consume']=lang('consume');
                                if ($this->admin_invoice)
--- 422,430 ----
                                
$menu['sub_invoice_list']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiinvoice.index&sub=invoice');
                                
$menu['sub_invoice_paid']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiinvoice.index&sub=invoice&paid=true');
! //                            
$menu['sub_invoice_powermeter']=$GLOBALS['phpgw']->link('/property/list_power_meter.php','sub=invoice');
                                
$menu['sub_invoice_consume']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiinvoice.consume&sub=invoice');
                                $menu['sublang_invoice_list']=lang('Invoice');
                                $menu['sublang_invoice_paid']=lang('Paid');
! //                            $menu['sublang_invoice_powermeter']=lang('Power 
meter');
                                
$menu['sublang_invoice_consume']=lang('consume');
                                if ($this->admin_invoice)

Index: class.sobuilding.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sobuilding.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.sobuilding.inc.php    2 Jan 2003 22:03:57 -0000       1.3
--- class.sobuilding.inc.php    7 Feb 2003 11:18:44 -0000       1.4
***************
*** 159,164 ****
                        $ids['property_id'] = $building['property_id'];
  
!                       $message = lang('Building has been saved');
!                       return $message;
                }
  
--- 159,164 ----
                        $ids['property_id'] = $building['property_id'];
  
!                       $receipt['message'][] = array('msg'=>lang('Building has 
been saved'));
!                       return $receipt;
                }
  
***************
*** 172,177 ****
                                                . "' AND bygg_id=" . 
$building['building_id'],__LINE__,__FILE__);
  
!                       $message = lang('Building has been edited');
!                       return $message;
                }
  
--- 172,177 ----
                                                . "' AND bygg_id=" . 
$building['building_id'],__LINE__,__FILE__);
  
!                       $receipt['message'][] = array('msg'=>lang('Building has 
been edited'));
!                       return $receipt;
                }
  

Index: class.socommon.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.socommon.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.socommon.inc.php      26 Jan 2003 12:27:49 -0000      1.4
--- class.socommon.inc.php      7 Feb 2003 11:18:44 -0000       1.5
***************
*** 30,33 ****
--- 30,80 ----
                }
  
+               function check_property($property_id='')
+               {
+                       $this->db->query("SELECT count(*) FROM boei_objekt 
where objekt_id='$property_id'");
+ 
+                       $this->db->next_record();
+ 
+                       if ( $this->db->f(0))
+                       {
+                               return True;
+                       }
+               }
+ 
+               function check_building($property_id='',$building_id='')
+               {
+                       $this->db->query("SELECT count(*) FROM boei_bygg where 
objekt_id='$property_id' and bygg_id='$building_id'");
+ 
+                       $this->db->next_record();
+ 
+                       if ( $this->db->f(0))
+                       {
+                               return True;
+                       }
+               }
+               function 
check_entrance($property_id='',$building_id='',$entrance_id='')
+               {
+                       $this->db->query("SELECT count(*) FROM boei_seksjon 
where objekt_id='$property_id' and bygg_id='$building_id' and 
seksjons_id='$entrance_id='");
+ 
+                       $this->db->next_record();
+ 
+                       if ( $this->db->f(0))
+                       {
+                               return True;
+                       }
+               }
+ 
+               function check_location_code($location_code='')
+               {
+                       $this->db->query("SELECT count(*) FROM fm_location 
where location_code='$location_code'");
+ 
+                       $this->db->next_record();
+ 
+                       if ( $this->db->f(0))
+                       {
+                               return True;
+                       }
+               }
+ 
                function select_part_of_town($bydel_id='')
                {
***************
*** 35,47 ****
                        $this->db->query("SELECT bydel, bydel_id FROM 
boei_bydel ORDER BY bydel ");
  
!                               $i = 0;
!                               while ($this->db->next_record())
!                               {
!                                               $part_of_town[$i]['id']         
                = $this->db->f('bydel_id');
!                                               $part_of_town[$i]['name']       
                        = stripslashes($this->db->f('bydel'));
                                $i++;
!                               }
  
!                               return $part_of_town;
                }
  
--- 82,94 ----
                        $this->db->query("SELECT bydel, bydel_id FROM 
boei_bydel ORDER BY bydel ");
  
!                       $i = 0;
!                       while ($this->db->next_record())
!                       {
!                               $part_of_town[$i]['id']                         
= $this->db->f('bydel_id');
!                               $part_of_town[$i]['name']                       
        = stripslashes($this->db->f('bydel'));
                                $i++;
!                       }
  
!                       return $part_of_town;
                }
  
***************
*** 51,63 ****
                        $this->db->query("SELECT formaal_id, navnpaaformaal 
FROM boei_formaal where formaal_id >'0' ORDER BY navnpaaformaal ");
  
!                               $i = 0;
!                               while ($this->db->next_record())
!                               {
!                                               $categories[$i]['id']           
                = $this->db->f('formaal_id');
!                                               $categories[$i]['name']         
                = stripslashes($this->db->f('navnpaaformaal'));
                                $i++;
!                               }
! //_debug_array($categories);
!                               return $categories;
                }
  
--- 98,109 ----
                        $this->db->query("SELECT formaal_id, navnpaaformaal 
FROM boei_formaal where formaal_id >'0' ORDER BY navnpaaformaal ");
  
!                       $i = 0;
!                       while ($this->db->next_record())
!                       {
!                               $categories[$i]['id']                           
= $this->db->f('formaal_id');
!                               $categories[$i]['name']                         
= stripslashes($this->db->f('navnpaaformaal'));
                                $i++;
!                       }
!                       return $categories;
                }
  
***************
*** 67,79 ****
                        $this->db->query("SELECT id, num FROM fm_equipment_type 
 ORDER BY num ");
  
!                               $i = 0;
!                               while ($this->db->next_record())
!                               {
!                                               $categories[$i]['id']           
                = $this->db->f('id');
!                                               $categories[$i]['name']         
                = stripslashes($this->db->f('num'));
                                $i++;
!                               }
! //_debug_array($categories);
!                               return $categories;
                }
  
--- 113,124 ----
                        $this->db->query("SELECT id, num FROM fm_equipment_type 
 ORDER BY num ");
  
!                       $i = 0;
!                       while ($this->db->next_record())
!                       {
!                               $categories[$i]['id']                           
= $this->db->f('id');
!                               $categories[$i]['name']                         
= stripslashes($this->db->f('num'));
                                $i++;
!                       }
!                       return $categories;
                }
  
***************
*** 83,95 ****
                        $this->db->query("SELECT omraade_id, omraade FROM 
boei_omraade where omraade_id >'0' ORDER BY omraade_id ");
  
!                               $i = 0;
!                               while ($this->db->next_record())
!                               {
!                                               $district[$i]['id']             
                = $this->db->f('omraade_id');
!                                               $district[$i]['name']           
                = stripslashes($this->db->f('omraade'));
                                $i++;
!                               }
! //_debug_array($district);
!                               return $district;
                }
  
--- 128,139 ----
                        $this->db->query("SELECT omraade_id, omraade FROM 
boei_omraade where omraade_id >'0' ORDER BY omraade_id ");
  
!                       $i = 0;
!                       while ($this->db->next_record())
!                       {
!                               $district[$i]['id']                             
= $this->db->f('omraade_id');
!                               $district[$i]['name']                           
= stripslashes($this->db->f('omraade'));
                                $i++;
!                       }
!                       return $district;
                }
  

Index: class.sotts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sotts.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.sotts.inc.php 6 Feb 2003 14:05:57 -0000       1.4
--- class.sotts.inc.php 7 Feb 2003 11:18:44 -0000       1.5
***************
*** 231,366 ****
                }
  
-               function update_ticket($ticket,$id='')
-               {
-                       // DB Content is fresher than http posted value.
-                       $this->db->query("select * from phpgw_fm_tts_tickets 
where id='$id'",__LINE__,__FILE__);
-                       $this->db->next_record();
- 
-                       $oldassigned            = $this->db->f('assignedto');
-                       $oldpriority            = $this->db->f('priority');
-                       $oldcat_id                      = 
$this->db->f('cat_id');
-                       $old_status             = $this->db->f('status');
-                       $old_billable_hours     = 
$this->db->f('billable_hours');
-                       $old_billable_rate      = $this->db->f('billable_rate');
-                       if($oldcat_id ==0){$oldcat_id ='';}
-                       if($oldassigned ==0){$oldassigned ='';}
- 
-                       // Figure out and last note
- 
-                       $history_values = 
$this->historylog->return_array(array(),array('C'),'history_timestamp','DESC',$id);
-                       $old_note = $history_values[0]['new_value'];
- 
-                       if(!$old_note)
-                       {
-                               $old_note = $this->db->f('details');
-                       }
- 
- 
-                       $this->db->transaction_begin();
- 
-                       /*
-                       ** phpgw_fm_tts_append.append_type - Defs
-                       ** R - Reopen ticket
-                       ** X - Ticket closed
-                       ** O - Ticket opened
-                       ** C - Comment appended
-                       ** A - Ticket assignment
-                       ** P - Priority change
-                       ** T - Category change
-                       ** S - Subject change
-                       ** B - Billing rate
-                       ** H - Billing hours
-                       */
- 
- 
-                       if ($old_status != $ticket['status'])
-                       {
-                               $fields_updated = True;
-                               if($old_status=='X')
-                               {
-                                       
$this->historylog->add('R',$id,$ticket['status'],$old_status);
- 
-                                       $this->db->query("update 
phpgw_fm_tts_tickets set status='O' where id='$id'",__LINE__,__FILE__);
-                               }
-                               else
-                               {
-                                       
$this->historylog->add($ticket['status'],$id,$ticket['status'],$old_status);
- 
-                                       $this->db->query("update 
phpgw_fm_tts_tickets set status='"
-                                       . $ticket['status'] . "' where 
id='$id'",__LINE__,__FILE__);
-                               }
-                       }
- 
-                       if ($oldassigned != $ticket['assignedto'])
-                       {
-                               $fields_updated = True;
-                               $this->db->query("update phpgw_fm_tts_tickets 
set assignedto='" . $ticket['assignedto']
-                                       . "' where id='$id'",__LINE__,__FILE__);
-                               
$this->historylog->add('A',$id,$ticket['assignedto'],$oldassigned);
-                       }
- 
-                       if ($oldpriority != $ticket['priority'])
-                       {
-                               $fields_updated = True;
-                               $this->db->query("update phpgw_fm_tts_tickets 
set priority='" . $ticket['priority']
-                                       . "' where id='$id'",__LINE__,__FILE__);
-                               
$this->historylog->add('P',$id,$ticket['priority'],$oldpriority);
-                       }
- 
-                       if ($oldcat_id != $ticket['cat_id'])
-                       {
-                               $fields_updated = True;
-                               $this->db->query("update phpgw_fm_tts_tickets 
set cat_id='" . $ticket['cat_id']
-                                       . "' where id='$id'",__LINE__,__FILE__);
-                               
$this->historylog->add('T',$id,$ticket['cat_id'],$oldcat_id);
-                       }
- 
-                       if ($old_billable_hours != $ticket['billable_hours'])
-                       {
-                               $fields_updated = True;
-                               $this->db->query("update phpgw_fm_tts_tickets 
set billable_hours='" . $ticket['billable_hours']
-                                       . "' where id='$id'",__LINE__,__FILE__);
-                               
$this->historylog->add('H',$id,$ticket['billable_hours'],$old_billable_hours);
-                       }
- 
-                       if ($old_billable_rate != $ticket['billable_rate'])
-                       {
-                               $fields_updated = True;
-                               $this->db->query("update phpgw_fm_tts_tickets 
set billable_rate='" . $ticket['billable_rate']
-                                       . "' where id='$id'",__LINE__,__FILE__);
-                               
$this->historylog->add('B',$id,$ticket['billable_rate'],$old_billable_rate);
-                       }
- 
-                       if (($old_note != $ticket['note']) && $ticket['note'])
-                       {
-                               $fields_updated = True;
-                               
$this->historylog->add('C',$id,$this->db->db_addslashes($ticket['note']),$old_note);
- 
-                               // Do this before we go into mail_ticket()
-                               $this->db->transaction_commit();
- 
-                               $this->config->read_repository();
- 
-                               if 
($this->config->config_data['mailnotification'])
-                               {
- //                                    
$receipt=$this->mail->mail_ticket($id,$fields_updated,'');
- 
-                               }
-                       }
-                       else
-                       {
-                               // Only do our commit once
-                               $this->db->transaction_commit();
-                       }
- 
-                       if ($fields_updated)
-                       {
-                               $receipt['message'][0]= array('msg' => 
lang('Ticket has been updated'));
-                       }
- 
-                       return $receipt;
-               }
- 
- 
                function edit($ticket)
                {
--- 231,234 ----

Index: class.uibuilding.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uibuilding.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.uibuilding.inc.php    3 Feb 2003 21:50:22 -0000       1.3
--- class.uibuilding.inc.php    7 Feb 2003 11:18:44 -0000       1.4
***************
*** 32,36 ****
                        $this->currentapp                       = 
$GLOBALS['phpgw_info']['flags']['currentapp'];
                        $this->cats                                     = 
CreateObject('phpgwapi.categories');
!                       $this->cats->app_name           = 'building';
                        $this->nextmatchs                       = 
CreateObject('phpgwapi.nextmatchs');
                        $this->account                          = 
$GLOBALS['phpgw_info']['user']['account_id'];
--- 32,36 ----
                        $this->currentapp                       = 
$GLOBALS['phpgw_info']['flags']['currentapp'];
                        $this->cats                                     = 
CreateObject('phpgwapi.categories');
!                       $this->cats->app_name           = 'p_building';
                        $this->nextmatchs                       = 
CreateObject('phpgwapi.nextmatchs');
                        $this->account                          = 
$GLOBALS['phpgw_info']['user']['account_id'];
***************
*** 161,165 ****
                        $property_id = get_var('property_id',array('GET'));
                        $building_id = 
get_var('building_id',array('POST','GET'));
!                       $values         = get_var('values',array('POST'));
  
                        
$GLOBALS['phpgw']->xslttpl->add_file(array('building',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
 . SEP . 'app_header'));
--- 161,167 ----
                        $property_id = get_var('property_id',array('GET'));
                        $building_id = 
get_var('building_id',array('POST','GET'));
!                       $err            = 
get_var('building_id',array('POST','GET'));
!                       $values         = get_var('values',array('POST','GET'));
! 
  
                        
$GLOBALS['phpgw']->xslttpl->add_file(array('building',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
 . SEP . 'app_header'));
***************
*** 169,173 ****
                                if($building_id)
                                {
!                                       $values['property_id']=$property_id;
                                        $values['building_id']=$building_id;
                                        $action='edit';
--- 171,178 ----
                                if($building_id)
                                {
!                                       if(!$err)
!                                       {
!                                               
$values['property_id']=$property_id;
!                                       }
                                        $values['building_id']=$building_id;
                                        $action='edit';
***************
*** 179,190 ****
                                }
  
!                               $message = $this->bo->save($values,$action);
                        }
  
!                       if ($building_id)
                        {
                                $building = 
$this->bo->read_single($property_id,$building_id);
- //print_r($building).'<br>';
- //print_($building).'<br>';
                                $function_msg = lang('edit building');
                        }
--- 184,201 ----
                                }
  
! //_debug_array($values);
! //print_($menu);
!                               $receipt = 
$this->bo->save($values,$action,$err);
!                       }
!                       else
!                       {
!                               $values['property_id']= $property_id;
!                               $values['building_id']= $building_id;
! 
                        }
  
!                       if ($building_id && !$err)
                        {
                                $building = 
$this->bo->read_single($property_id,$building_id);
                                $function_msg = lang('edit building');
                        }
***************
*** 203,211 ****
                        }
  
                        $link_data = array
                        (
                                'menuaction'    => 
$this->currentapp.'.uibuilding.edit',
                                'property_id'   => $property_id,
!                               'building_id'   => $building_id
                        );
  
--- 214,228 ----
                        }
  
+                       if($receipt['error'])
+                       {
+                               $err=true;
+                       }
+ 
                        $link_data = array
                        (
                                'menuaction'    => 
$this->currentapp.'.uibuilding.edit',
                                'property_id'   => $property_id,
!                               'building_id'   => $building_id,
!                               'err'                   => $err
                        );
  
***************
*** 225,235 ****
                                'lang_save'                                     
        => lang('save'),
                                'lang_done'                                     
        => lang('done'),
!                               'value_property_id'                             
=> $property_id,
!                               'value_building_id'                             
=> $building_id,
                                'value_name'                                    
=> $building['name'],
                                'value_generaladdress'                  => 
$building['generaladdress'],
                                'value_access'                                  
=> $building['access'],
                                'value_cat'                                     
        => $building['cat'],
!                               'message'                                       
        => $message,
                                'lang_name_statustext'                  => 
lang('Enter the name of the building'),
                                'lang_property_id_statustext'   => lang('Enter 
Property ID'),
--- 242,253 ----
                                'lang_save'                                     
        => lang('save'),
                                'lang_done'                                     
        => lang('done'),
!                               'value_property_id'                             
=> $values['property_id'],
!                               'value_building_id'                             
=> $values['building_id'],
                                'value_name'                                    
=> $building['name'],
                                'value_generaladdress'                  => 
$building['generaladdress'],
                                'value_access'                                  
=> $building['access'],
                                'value_cat'                                     
        => $building['cat'],
!                               'error'                                         
        => $receipt['error'],
!                               'message'                                       
        => $receipt['message'],
                                'lang_name_statustext'                  => 
lang('Enter the name of the building'),
                                'lang_property_id_statustext'   => lang('Enter 
Property ID'),
***************
*** 257,262 ****
  
                        );
- //print_r($data).'<br>';
- //print_();
  
                        
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('edit' => $data));
--- 275,278 ----

Index: class.uiproperty.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiproperty.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.uiproperty.inc.php    3 Feb 2003 21:50:22 -0000       1.4
--- class.uiproperty.inc.php    7 Feb 2003 11:18:44 -0000       1.5
***************
*** 32,35 ****
--- 32,36 ----
                        $this->currentapp                       = 
$GLOBALS['phpgw_info']['flags']['currentapp'];
                        $this->cats                                     = 
CreateObject('phpgwapi.categories');
+                       $this->cats->app_name           = 'p_property';
                        $this->nextmatchs                       = 
CreateObject('phpgwapi.nextmatchs');
                        $this->account                          = 
$GLOBALS['phpgw_info']['user']['account_id'];
***************
*** 228,232 ****
                                'function_msg'                                  
=> $function_msg,
                                'form_action'                                   
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
!                               'done_action'                                   
=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproperty.index'),
                                'lang_property_id'                              
=> lang('Property ID'),
                                'lang_name'                                     
        => lang('name'),
--- 229,233 ----
                                'function_msg'                                  
=> $function_msg,
                                'form_action'                                   
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
!                               'done_action'                                   
=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproperty.index&sub=property'),
                                'lang_property_id'                              
=> lang('Property ID'),
                                'lang_name'                                     
        => lang('name'),

Index: class.uitts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uitts.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.uitts.inc.php 6 Feb 2003 14:05:58 -0000       1.4
--- class.uitts.inc.php 7 Feb 2003 11:18:44 -0000       1.5
***************
*** 278,282 ****
                                if(!$values['cat_id'])
                                {
!                                       
$receipt['error'][$errorcount++]=array('msg'=>lang('Please select a category 
!'));
                                }
  
--- 278,282 ----
                                if(!$values['cat_id'])
                                {
! //                                    
$receipt['error'][$errorcount++]=array('msg'=>lang('Please select a category 
!'));
                                }
  
***************
*** 288,292 ****
                                if(!$values['property_id'] && 
!$values['equipment_id'])
                                {
!                                       
$receipt['error'][$errorcount++]=array('msg'=>lang('Pleace select a location - 
or an equipment !'));
                                }
  
--- 288,292 ----
                                if(!$values['property_id'] && 
!$values['equipment_id'])
                                {
! //                                    
$receipt['error'][$errorcount++]=array('msg'=>lang('Pleace select a location - 
or an equipment !'));
                                }
  

Index: hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/hook_admin.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** hook_admin.inc.php  21 Dec 2002 12:41:17 -0000      1.11
--- hook_admin.inc.php  7 Feb 2003 11:18:44 -0000       1.12
***************
*** 18,21 ****
--- 18,22 ----
                                'Workorder Categories' => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname=p_workorder'),
                                'Property Categories' => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname=p_property'),
+                               'Building Categories' => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname=p_building'),
        //                      'Equipment Categories' => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname=p_equipment'),
                                'Ticket Categories' => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname=p_ticket'),
***************
*** 23,28 ****
                                'Configuration' => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname=' 
. $appname),
                                'Equipment type'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_entity.index&type=equipment'),
!                               'Property type'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_entity.index&type=property'),
!                               'Property type attributes class'=> 
$GLOBALS['phpgw']->link('/property/list_property_type_attribute_class.php'),
                                'Building Part'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_2.index&type=building_part'),
                                'Workorder template'=> 
$GLOBALS['phpgw']->link('/property/list_wo_template.php'),
--- 24,29 ----
                                'Configuration' => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname=' 
. $appname),
                                'Equipment type'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_entity.index&type=equipment'),
!       //                      'Property type'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_entity.index&type=property'),
!       //                      'Property type attributes class'=> 
$GLOBALS['phpgw']->link('/property/list_property_type_attribute_class.php'),
                                'Building Part'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_2.index&type=building_part'),
                                'Workorder template'=> 
$GLOBALS['phpgw']->link('/property/list_wo_template.php'),





reply via email to

[Prev in Thread] Current Thread [Next in Thread]