[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/inc class.uidocument.inc.php,1.3,1.4 cl
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.uidocument.inc.php,1.3,1.4 class.uidrawing.inc.php,1.14,1.15 class.uiinvoice.inc.php,1.21,1.22 class.uiwo_hour.inc.php,1.20,1.21 class.uiXport.inc.php,1.22,1.23 hook_admin.inc.php,1.29,1.30 |
|
Date: |
Thu, 08 May 2003 09:56:32 -0400 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv17713/inc
Modified Files:
class.uidocument.inc.php class.uidrawing.inc.php
class.uiinvoice.inc.php class.uiwo_hour.inc.php
class.uiXport.inc.php hook_admin.inc.php
Log Message:
no message
Index: class.uidocument.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uidocument.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.uidocument.inc.php 29 Apr 2003 12:41:31 -0000 1.3
--- class.uidocument.inc.php 8 May 2003 13:56:29 -0000 1.4
***************
*** 54,58 ****
$this->equipment_type =
$this->bo->equipment_type;
!
$GLOBALS['phpgw']->session->appsession('sub',$this->currentapp,'property');
}
--- 54,58 ----
$this->equipment_type =
$this->bo->equipment_type;
!
$GLOBALS['phpgw']->session->appsession('sub',$this->currentapp,'documentation');
}
***************
*** 409,414 ****
function view_file($file_array='')
{
! // define('PHPGW_FINAL',True);
! $GLOBALS['phpgw_info']['flags']['noframework'] = True;
$document_id =
get_var('document_id',array('POST','GET'));
$values = $this->bo->read_single($document_id);
--- 409,413 ----
function view_file($file_array='')
{
! $GLOBALS['phpgw_info']['flags']['noframework'] = True;
$document_id =
get_var('document_id',array('POST','GET'));
$values = $this->bo->read_single($document_id);
Index: class.uidrawing.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uidrawing.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** class.uidrawing.inc.php 8 May 2003 09:53:16 -0000 1.14
--- class.uidrawing.inc.php 8 May 2003 13:56:29 -0000 1.15
***************
*** 258,263 ****
function view_file($file_array='')
{
! // define('PHPGW_FINAL',True);
! $GLOBALS['phpgw_info']['flags']['noframework'] = True;
$drawing_id =
get_var('drawing_id',array('POST','GET'));
$values = $this->bo->read_single($drawing_id);
--- 258,262 ----
function view_file($file_array='')
{
! $GLOBALS['phpgw_info']['flags']['noframework'] = True;
$drawing_id =
get_var('drawing_id',array('POST','GET'));
$values = $this->bo->read_single($drawing_id);
Index: class.uiinvoice.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiinvoice.inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** class.uiinvoice.inc.php 3 May 2003 06:02:17 -0000 1.21
--- class.uiinvoice.inc.php 8 May 2003 13:56:29 -0000 1.22
***************
*** 57,61 ****
/* if(!$this->acl2->check('.invoice',1) &&
!$this->acl2->check('.invoice',2) && !$this->acl2->check('.invoice',4) &&
!$this->acl2->check('.invoice',8) && !$this->acl2->check('.invoice',16) )
{
! define('PHPGW_FINAL',True);
echo '<br>You lack sufficient rights to enter
this section<br>';
--- 57,61 ----
/* if(!$this->acl2->check('.invoice',1) &&
!$this->acl2->check('.invoice',2) && !$this->acl2->check('.invoice',4) &&
!$this->acl2->check('.invoice',8) && !$this->acl2->check('.invoice',16) )
{
! $GLOBALS['phpgw_info']['flags']['noframework']
= True;
echo '<br>You lack sufficient rights to enter
this section<br>';
Index: class.uiwo_hour.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiwo_hour.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** class.uiwo_hour.inc.php 3 May 2003 06:02:17 -0000 1.20
--- class.uiwo_hour.inc.php 8 May 2003 13:56:29 -0000 1.21
***************
*** 614,627 ****
function tender()
{
! define('PHPGW_FINAL',True);
!
! $workorder_id =
get_var('workorder_id',array('POST','GET'));
$show_cost = get_var('show_cost',array('POST','GET'));
$mark_draft = get_var('mark_draft',array('POST','GET'));
$common_data =
$this->common_data($workorder_id);
$values_hour = $common_data['content'];
$project =
$this->boproject->read_single($common_data['workorder']['project_id']);
- //_debug_array($project);
$grouping_descr_old = '';
--- 614,625 ----
function tender()
{
! $GLOBALS['phpgw_info']['flags']['noframework'] = True;
$show_cost = get_var('show_cost',array('POST','GET'));
$mark_draft = get_var('mark_draft',array('POST','GET'));
+ $workorder_id =
get_var('workorder_id',array('POST','GET'));
$common_data =
$this->common_data($workorder_id);
$values_hour = $common_data['content'];
$project =
$this->boproject->read_single($common_data['workorder']['project_id']);
$grouping_descr_old = '';
Index: class.uiXport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiXport.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** class.uiXport.inc.php 28 Apr 2003 10:26:44 -0000 1.22
--- class.uiXport.inc.php 8 May 2003 13:56:29 -0000 1.23
***************
*** 499,503 ****
if(!$values['download'])
{
! define('PHPGW_FINAL',True);
echo '<pre>' .
$message[0]['msg'] . '</pre>';
echo ' <a
href="'.$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiXport.export')
. '">' . lang('Back') . '</a>';
--- 499,503 ----
if(!$values['download'])
{
!
$GLOBALS['phpgw_info']['flags']['noframework'] = True;
echo '<pre>' .
$message[0]['msg'] . '</pre>';
echo ' <a
href="'.$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiXport.export')
. '">' . lang('Back') . '</a>';
Index: hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/hook_admin.inc.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** hook_admin.inc.php 8 May 2003 09:53:16 -0000 1.29
--- hook_admin.inc.php 8 May 2003 13:56:29 -0000 1.30
***************
*** 27,44 ****
'Drawing Categories'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=drawing'),
'Document Categories'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.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'),
! // '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'),
'Tender chapter'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=tender_chapter'),
'ID Controle'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uiadmin.edit_id'),
'Permissions'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uiadmin.list_acl2'),
'Workorders status'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_2.index&type=workorder_status'),
'Equipment status'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_2.index&type=equipment_status'),
'Agreement status'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_2.index&type=agreement_status'),
'Unit'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_2.index&type=unit'),
- 'Request status'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_2.index&type=request_status'),
'Key location'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_3.index&type=key_location'),
'Branch'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_3.index&type=branch'),
--- 27,42 ----
'Drawing Categories'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=drawing'),
'Document Categories'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=document'),
! 'Meter Categories'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=meter'),
'Building Part'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_2.index&type=building_part'),
'Tender chapter'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=tender_chapter'),
'ID Controle'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uiadmin.edit_id'),
'Permissions'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uiadmin.list_acl2'),
+ 'Request status'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_2.index&type=request_status'),
'Workorders status'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_2.index&type=workorder_status'),
'Equipment status'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_2.index&type=equipment_status'),
'Agreement status'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_2.index&type=agreement_status'),
+ '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'),
'Unit'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_2.index&type=unit'),
'Key location'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_3.index&type=key_location'),
'Branch'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_3.index&type=branch'),
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.uidocument.inc.php,1.3,1.4 class.uidrawing.inc.php,1.14,1.15 class.uiinvoice.inc.php,1.21,1.22 class.uiwo_hour.inc.php,1.20,1.21 class.uiXport.inc.php,1.22,1.23 hook_admin.inc.php,1.29,1.30,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: property/setup default_records.inc.php,1.17,1.18 setup.inc.php,1.46,1.47 tables_current.inc.php,1.71,1.72
- Next by Date:
[Phpgroupware-cvs] CVS: phpgwapi/templates/idots/source navbar32.xcf,1.1.2.5,1.1.2.6
- Previous by thread:
[Phpgroupware-cvs] CVS: property/setup default_records.inc.php,1.17,1.18 setup.inc.php,1.46,1.47 tables_current.inc.php,1.71,1.72
- Next by thread:
[Phpgroupware-cvs] CVS: phpgwapi/templates/idots/source navbar32.xcf,1.1.2.5,1.1.2.6
- Index(es):