phpgroupware-cvs
[Top][All Lists]
Advanced

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

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


From: Sigurd Nes <address@hidden>
Subject: [Phpgroupware-cvs] CVS: property/inc class.bodocument.inc.php,1.2,1.3 class.sodocument.inc.php,1.2,1.3class.sostandard_2.inc.php,1.12,1.13 class.uiapartment.inc.php,1.7,1.8 class.uibuilding.inc.php,1.15,1.16 class.uidocument.inc.php,1.2,1.3 class.uidrawing.inc.php,1.12,1.13 class.uientrance.inc.php,1.8,1.9 class.uiequipment.inc.php,1.16,1.17 class.uiinvestment.inc.php,1.13,1.14 class.uimeter.inc.php,1.5,1.6 class.uipricebook.inc.php,1.9,1.10class.uiproject.inc.php,1.15,1.16 class.uiproperty.inc.php,1.19,1.20 class.uirequest.inc.php,1.9,1.10 class.uistandard_2.inc.php,1.9,1.10class.uistandard_3.inc.php,1.8,1.9 class.uistandard_entity.inc.php,1.11,1.12 class.uitemplate.inc.php,1.5,1.6 class.uitts.inc.php,1.21,1.22 class.uiwo_hour.inc.php,1.18,1.19 class.uiworkorder.inc.php,1.16,1.17 hook_admin.inc.php,1.27,1.28
Date: Tue, 29 Apr 2003 08:41:34 -0400

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

Modified Files:
        class.bodocument.inc.php class.sodocument.inc.php 
        class.sostandard_2.inc.php class.uiapartment.inc.php 
        class.uibuilding.inc.php class.uidocument.inc.php 
        class.uidrawing.inc.php class.uientrance.inc.php 
        class.uiequipment.inc.php class.uiinvestment.inc.php 
        class.uimeter.inc.php class.uipricebook.inc.php 
        class.uiproject.inc.php class.uiproperty.inc.php 
        class.uirequest.inc.php class.uistandard_2.inc.php 
        class.uistandard_3.inc.php class.uistandard_entity.inc.php 
        class.uitemplate.inc.php class.uitts.inc.php 
        class.uiwo_hour.inc.php class.uiworkorder.inc.php 
        hook_admin.inc.php 
Log Message:
no message

Index: class.bodocument.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bodocument.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.bodocument.inc.php    29 Apr 2003 12:20:06 -0000      1.2
--- class.bodocument.inc.php    29 Apr 2003 12:41:31 -0000      1.3
***************
*** 97,101 ****
                        }
  
! //                    $status_entries= $this->so->select_status_list();
  
                        while (is_array($status_entries) && list(,$status) = 
each($status_entries))
--- 97,101 ----
                        }
  
!                       $status_entries= $this->so->select_status_list();
  
                        while (is_array($status_entries) && list(,$status) = 
each($status_entries))

Index: class.sodocument.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sodocument.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.sodocument.inc.php    29 Apr 2003 12:20:06 -0000      1.2
--- class.sodocument.inc.php    29 Apr 2003 12:41:31 -0000      1.3
***************
*** 434,439 ****
  
  
! echo $file;
! /*                    if($this->vfs->file_exists(array(
                                        'string' => $this->fakebase. SEP . 
'document'. SEP . $document_name,
                                        'relatives' => Array(RELATIVE_NONE)
--- 434,439 ----
  
  
! //echo $file;
!                       if($this->vfs->file_exists(array(
                                        'string' => $this->fakebase. SEP . 
'document'. SEP . $document_name,
                                        'relatives' => Array(RELATIVE_NONE)
***************
*** 457,463 ****
                                $this->vfs->override_acl = 0;
                        }
! */
! //                    $this->db->query("DELETE FROM fm_document WHERE 
id='$document_id'",__LINE__,__FILE__);
! //                    $this->db->query("DELETE FROM fm_document_history  
WHERE  history_record_id='$document_id'",__LINE__,__FILE__);
                }
        }
--- 457,463 ----
                                $this->vfs->override_acl = 0;
                        }
! 
!                       $this->db->query("DELETE FROM fm_document WHERE 
id='$document_id'",__LINE__,__FILE__);
!                       $this->db->query("DELETE FROM fm_document_history  
WHERE  history_record_id='$document_id'",__LINE__,__FILE__);
                }
        }

Index: class.sostandard_2.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sostandard_2.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** class.sostandard_2.inc.php  28 Apr 2003 10:26:44 -0000      1.12
--- class.sostandard_2.inc.php  29 Apr 2003 12:41:31 -0000      1.13
***************
*** 149,152 ****
--- 149,155 ----
                                        $table='fm_drawing_status';
                                        break;
+                               case 'document_status':
+                                       $table='fm_document_status';
+                                       break;
                                case 'unit':
                                        $table='fm_standard_unit';

Index: class.uiapartment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiapartment.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** class.uiapartment.inc.php   28 Apr 2003 10:26:44 -0000      1.7
--- class.uiapartment.inc.php   29 Apr 2003 12:41:31 -0000      1.8
***************
*** 415,419 ****
                        }
  
!                       
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
 . SEP . 'app_delete'));
  
                        $data = array
--- 415,419 ----
                        }
  
!                       
$GLOBALS['phpgw']->xslttpl->add_file(array('app_delete'));
  
                        $data = array

Index: class.uibuilding.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uibuilding.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** class.uibuilding.inc.php    28 Apr 2003 10:26:44 -0000      1.15
--- class.uibuilding.inc.php    29 Apr 2003 12:41:31 -0000      1.16
***************
*** 370,374 ****
                        }
  
!                       
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
 . SEP . 'app_delete'));
  
                        $data = array
--- 370,374 ----
                        }
  
!                       
$GLOBALS['phpgw']->xslttpl->add_file(array('app_delete'));
  
                        $data = array

Index: class.uidocument.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uidocument.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.uidocument.inc.php    29 Apr 2003 12:20:06 -0000      1.2
--- class.uidocument.inc.php    29 Apr 2003 12:41:31 -0000      1.3
***************
*** 573,578 ****
                                                'location_type' => 'form',
                                                'equipment'             => true,
!                                               'entrance'              => true,
!                                               'address'               => true,
                                                'equipment_id'  => 
$values['equipment_id'],
                                                'property_id'   => 
$values['property_id'],
--- 573,577 ----
                                                'location_type' => 'form',
                                                'equipment'             => true,
!                                               'apartment'             => true,
                                                'equipment_id'  => 
$values['equipment_id'],
                                                'property_id'   => 
$values['property_id'],
***************
*** 711,715 ****
                        }
  
!                       
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
 . SEP . 'app_delete'));
  
                        $data = array
--- 710,714 ----
                        }
  
!                       
$GLOBALS['phpgw']->xslttpl->add_file(array('app_delete'));
  
                        $data = array
***************
*** 789,794 ****
                                                'location_type' => 'view',
                                                'equipment'             => true,
!                                               'entrance'              => true,
!                                               'address'               => true,
                                                'equipment_id'  => 
$values['equipment_id'],
                                                'property_id'   => 
$values['property_id'],
--- 788,792 ----
                                                'location_type' => 'view',
                                                'equipment'             => true,
!                                               'apartment'             => true,
                                                'equipment_id'  => 
$values['equipment_id'],
                                                'property_id'   => 
$values['property_id'],

Index: class.uidrawing.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uidrawing.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** class.uidrawing.inc.php     28 Apr 2003 10:26:44 -0000      1.12
--- class.uidrawing.inc.php     29 Apr 2003 12:41:31 -0000      1.13
***************
*** 533,537 ****
                        }
  
!                       
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
 . SEP . 'app_delete'));
  
                        $data = array
--- 533,537 ----
                        }
  
!                       
$GLOBALS['phpgw']->xslttpl->add_file(array('app_delete'));
  
                        $data = array

Index: class.uientrance.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uientrance.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** class.uientrance.inc.php    28 Apr 2003 10:26:44 -0000      1.8
--- class.uientrance.inc.php    29 Apr 2003 12:41:31 -0000      1.9
***************
*** 383,387 ****
                        }
  
!                       
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
 . SEP . 'app_delete'));
  
                        $data = array
--- 383,387 ----
                        }
  
!                       
$GLOBALS['phpgw']->xslttpl->add_file(array('app_delete'));
  
                        $data = array

Index: class.uiequipment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiequipment.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** class.uiequipment.inc.php   28 Apr 2003 10:26:44 -0000      1.16
--- class.uiequipment.inc.php   29 Apr 2003 12:41:31 -0000      1.17
***************
*** 445,449 ****
                        }
  
!                       
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
 . SEP . 'app_delete'));
  
                        $data = array
--- 445,449 ----
                        }
  
!                       
$GLOBALS['phpgw']->xslttpl->add_file(array('app_delete'));
  
                        $data = array

Index: class.uiinvestment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiinvestment.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** class.uiinvestment.inc.php  24 Apr 2003 07:41:01 -0000      1.13
--- class.uiinvestment.inc.php  29 Apr 2003 12:41:31 -0000      1.14
***************
*** 607,611 ****
                        }
  
!                       
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
 . SEP . 'app_delete'));
  
                        $data = array
--- 607,611 ----
                        }
  
!                       
$GLOBALS['phpgw']->xslttpl->add_file(array('app_delete'));
  
                        $data = array

Index: class.uimeter.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uimeter.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.uimeter.inc.php       28 Apr 2003 10:26:44 -0000      1.5
--- class.uimeter.inc.php       29 Apr 2003 12:41:31 -0000      1.6
***************
*** 334,338 ****
                        }
  
!                       
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
 . SEP . 'app_delete'));
  
                        $data = array
--- 334,338 ----
                        }
  
!                       
$GLOBALS['phpgw']->xslttpl->add_file(array('app_delete'));
  
                        $data = array

Index: class.uipricebook.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uipricebook.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** class.uipricebook.inc.php   28 Apr 2003 10:26:44 -0000      1.9
--- class.uipricebook.inc.php   29 Apr 2003 12:41:31 -0000      1.10
***************
*** 1180,1184 ****
                        }
  
!                       
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
 . SEP . 'app_delete'));
  
                        $data = array
--- 1180,1184 ----
                        }
  
!                       
$GLOBALS['phpgw']->xslttpl->add_file(array('app_delete'));
  
                        $data = array

Index: class.uiproject.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiproject.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** class.uiproject.inc.php     28 Apr 2003 10:26:44 -0000      1.15
--- class.uiproject.inc.php     29 Apr 2003 12:41:31 -0000      1.16
***************
*** 583,587 ****
                        }
  
!                       
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
 . SEP . 'app_delete'));
  
                        $data = array
--- 583,587 ----
                        }
  
!                       
$GLOBALS['phpgw']->xslttpl->add_file(array('app_delete'));
  
                        $data = array

Index: class.uiproperty.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiproperty.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** class.uiproperty.inc.php    28 Apr 2003 10:26:44 -0000      1.19
--- class.uiproperty.inc.php    29 Apr 2003 12:41:31 -0000      1.20
***************
*** 327,331 ****
                        }
  
!                       
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
 . SEP . 'app_delete'));
  
                        $data = array
--- 327,331 ----
                        }
  
!                       
$GLOBALS['phpgw']->xslttpl->add_file(array('app_delete'));
  
                        $data = array

Index: class.uirequest.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uirequest.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** class.uirequest.inc.php     28 Apr 2003 10:26:44 -0000      1.9
--- class.uirequest.inc.php     29 Apr 2003 12:41:31 -0000      1.10
***************
*** 672,676 ****
                        }
  
!                       
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
 . SEP . 'app_delete'));
  
                        $data = array
--- 672,676 ----
                        }
  
!                       
$GLOBALS['phpgw']->xslttpl->add_file(array('app_delete'));
  
                        $data = array

Index: class.uistandard_2.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uistandard_2.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** class.uistandard_2.inc.php  28 Apr 2003 10:26:44 -0000      1.9
--- class.uistandard_2.inc.php  29 Apr 2003 12:41:31 -0000      1.10
***************
*** 244,248 ****
                        }
  
!                       
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
 . SEP . 'app_delete'));
  
                        $data = array
--- 244,248 ----
                        }
  
!                       
$GLOBALS['phpgw']->xslttpl->add_file(array('app_delete'));
  
                        $data = array

Index: class.uistandard_3.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uistandard_3.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** class.uistandard_3.inc.php  28 Apr 2003 10:26:44 -0000      1.8
--- class.uistandard_3.inc.php  29 Apr 2003 12:41:31 -0000      1.9
***************
*** 242,246 ****
                        }
  
!                       
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
 . SEP . 'app_delete'));
  
                        $data = array
--- 242,246 ----
                        }
  
!                       
$GLOBALS['phpgw']->xslttpl->add_file(array('app_delete'));
  
                        $data = array

Index: class.uistandard_entity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uistandard_entity.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** class.uistandard_entity.inc.php     28 Apr 2003 10:26:44 -0000      1.11
--- class.uistandard_entity.inc.php     29 Apr 2003 12:41:31 -0000      1.12
***************
*** 277,281 ****
                        }
  
!                       
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
 . SEP . 'app_delete'));
  
                        $data = array
--- 277,281 ----
                        }
  
!                       
$GLOBALS['phpgw']->xslttpl->add_file(array('app_delete'));
  
                        $data = array

Index: class.uitemplate.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uitemplate.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.uitemplate.inc.php    28 Apr 2003 10:26:44 -0000      1.5
--- class.uitemplate.inc.php    29 Apr 2003 12:41:31 -0000      1.6
***************
*** 696,700 ****
                        }
  
!                       
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
 . SEP . 'app_delete'));
  
                        $data = array
--- 696,700 ----
                        }
  
!                       
$GLOBALS['phpgw']->xslttpl->add_file(array('app_delete'));
  
                        $data = array

Index: class.uitts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uitts.inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** class.uitts.inc.php 28 Apr 2003 10:26:44 -0000      1.21
--- class.uitts.inc.php 29 Apr 2003 12:41:31 -0000      1.22
***************
*** 380,384 ****
                        }
  
!                       
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
 . SEP . 'app_delete'));
  
                        $data = array
--- 380,384 ----
                        }
  
!                       
$GLOBALS['phpgw']->xslttpl->add_file(array('app_delete'));
  
                        $data = array

Index: class.uiwo_hour.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiwo_hour.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** class.uiwo_hour.inc.php     28 Apr 2003 10:26:44 -0000      1.18
--- class.uiwo_hour.inc.php     29 Apr 2003 12:41:31 -0000      1.19
***************
*** 1325,1329 ****
                        }
  
!                       
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
 . SEP . 'app_delete'));
  
                        $data = array
--- 1325,1329 ----
                        }
  
!                       
$GLOBALS['phpgw']->xslttpl->add_file(array('app_delete'));
  
                        $data = array

Index: class.uiworkorder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiworkorder.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** class.uiworkorder.inc.php   28 Apr 2003 10:26:44 -0000      1.16
--- class.uiworkorder.inc.php   29 Apr 2003 12:41:31 -0000      1.17
***************
*** 641,645 ****
                        }
  
!                       
$GLOBALS['phpgw']->xslttpl->add_file(array($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
 . SEP . 'app_delete'));
  
                        $data = array
--- 641,645 ----
                        }
  
!                       
$GLOBALS['phpgw']->xslttpl->add_file(array('app_delete'));
  
                        $data = array

Index: hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/hook_admin.inc.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** hook_admin.inc.php  28 Apr 2003 10:26:44 -0000      1.27
--- hook_admin.inc.php  29 Apr 2003 12:41:31 -0000      1.28
***************
*** 28,31 ****
--- 28,32 ----
                                'Drawing Categories'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_2.index&type=drawing'),
                                'Document Categories'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_2.index&type=document'),
+                               'Document Status'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_2.index&type=document_status'),
                                'Drawing Status'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_2.index&type=drawing_status'),
                                'Meter Categories'=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_2.index&type=meter'),





reply via email to

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