[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc hook_admin.inc.php, 1.15 class.uitts.inc
|
From: |
sigurdne |
|
Subject: |
[Phpgroupware-cvs] property/inc hook_admin.inc.php, 1.15 class.uitts.inc.php, 1.16 class.boadmin_entity.inc.php, 1.7 class.historylog.inc.php, 1.6 class.menu.inc.php, 1.14 class.socategory.inc.php, 1.8 class.sostandard_2.inc.php, 1.6 class.bodrawing.inc.php, 1.6 class.sodrawing.inc.php, 1.6 class.uidrawing.inc.php, 1.9 |
|
Date: |
Fri, 13 May 2005 14:17:00 +0200 |
Update of property/inc
Modified Files:
Branch: MAIN
hook_admin.inc.php lines: +1 -4
class.uitts.inc.php lines: +33 -14
class.boadmin_entity.inc.php lines: +7 -11
class.historylog.inc.php lines: +1 -4
class.menu.inc.php lines: +1 -9
class.socategory.inc.php lines: +1 -4
class.sostandard_2.inc.php lines: +1 -4
Removed Files:
Branch: MAIN
class.bodrawing.inc.php
class.sodrawing.inc.php
class.uidrawing.inc.php
Log Message:
no message
====================================================
Index: property/inc/hook_admin.inc.php
diff -u property/inc/hook_admin.inc.php:1.14
property/inc/hook_admin.inc.php:1.15
--- property/inc/hook_admin.inc.php:1.14 Thu May 12 21:26:28 2005
+++ property/inc/hook_admin.inc.php Fri May 13 12:17:25 2005
@@ -35,9 +35,7 @@
'Vendor Categories'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=vendor'),
'Vendor Global Categories'=>
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicategories.index&appname=fm_vendor&global_cats=True'),
'Vendor Attributes'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uiactor.list_attribute&role=vendor'),
- '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'),
@@ -51,7 +49,6 @@
'service agreement Attributes'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uis_agreement.list_attribute'),
'service agreement item Attributes'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uis_agreement.list_attribute&role=detail'),
'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'),
====================================================
Index: property/inc/class.uitts.inc.php
diff -u property/inc/class.uitts.inc.php:1.15
property/inc/class.uitts.inc.php:1.16
--- property/inc/class.uitts.inc.php:1.15 Thu May 12 21:26:28 2005
+++ property/inc/class.uitts.inc.php Fri May 13 12:17:25 2005
@@ -764,18 +764,35 @@
'origin_id' => $id
);
- $order_link_data = array
- (
- 'menuaction' =>
$this->currentapp.'.uiproject.edit',
- 'bypass' => true,
- 'location_code' =>
$ticket['location_code'],
- 'p_num' =>
$ticket['p_num'],
- 'p_entity_id' =>
$ticket['p_entity_id'],
- 'p_cat_id' =>
$ticket['p_cat_id'],
- 'tenant_id' =>
$ticket['tenant_id'],
- 'origin' => 'tts',
- 'origin_id' => $id
- );
+ for ($i=0;$i<count($ticket['origin']);$i++)
+ {
+ if($ticket['origin'][$i]['type'] ==
'project')
+ {
+ $order_link_data = array
+ (
+ 'menuaction'
=> $this->currentapp.'.uiproject.edit',
+ 'id'
=> $ticket['origin'][$i]['data'][0]['id']
+ );
+ break;
+ }
+ }
+
+
+ if(!$order_link_data)
+ {
+ $order_link_data = array
+ (
+ 'menuaction' =>
$this->currentapp.'.uiproject.edit',
+ 'bypass' => true,
+ 'location_code' =>
$ticket['location_code'],
+ 'p_num' =>
$ticket['p_num'],
+ 'p_entity_id' =>
$ticket['p_entity_id'],
+ 'p_cat_id' =>
$ticket['p_cat_id'],
+ 'tenant_id' =>
$ticket['tenant_id'],
+ 'origin' =>
'tts',
+ 'origin_id' => $id
+ );
+ }
$form_link = array
(
@@ -829,6 +846,8 @@
$this->cat_id = $ticket['cat_id'];
}
+
+/*
if($ticket['request_id'])
{
$request_lookup_data = array
@@ -844,7 +863,7 @@
);
}
-
+*/
$start_entity =
$this->bocommon->get_start_entity('ticket');
//_debug_array($start_entity);
====================================================
Index: property/inc/class.boadmin_entity.inc.php
diff -u property/inc/class.boadmin_entity.inc.php:1.6
property/inc/class.boadmin_entity.inc.php:1.7
--- property/inc/class.boadmin_entity.inc.php:1.6 Thu May 12 21:26:28 2005
+++ property/inc/class.boadmin_entity.inc.php Fri May 13 12:17:24 2005
@@ -175,16 +175,12 @@
$list[1]['name']='ticket';
$list[2]['id']='document';
$list[2]['name']='document';
- $list[3]['id']='drawing';
- $list[3]['name']='drawing';
- $list[4]['id']='meter';
- $list[4]['name']='meter';
- $list[5]['id']='request';
- $list[5]['name']='request';
- $list[6]['id']='investment';
- $list[6]['name']='investment';
- $list[6]['id']='s_agreement';
- $list[6]['name']='service agreement';
+ $list[3]['id']='request';
+ $list[3]['name']='request';
+ $list[4]['id']='investment';
+ $list[4]['name']='investment';
+ $list[5]['id']='s_agreement';
+ $list[5]['name']='service agreement';
return
$this->bocommon->select_multi_list($selected,$list);
}
====================================================
Index: property/inc/class.historylog.inc.php
diff -u property/inc/class.historylog.inc.php:1.5
property/inc/class.historylog.inc.php:1.6
--- property/inc/class.historylog.inc.php:1.5 Thu May 12 21:26:28 2005
+++ property/inc/class.historylog.inc.php Fri May 13 12:17:25 2005
@@ -49,9 +49,6 @@
case 'tts':
$this->table='fm_tts_history';
break;
- case 'drawing':
- $this->table='fm_drawing_history';
- break;
case 'document':
$this->table='fm_document_history';
break;
====================================================
Index: property/inc/class.menu.inc.php
diff -u property/inc/class.menu.inc.php:1.13
property/inc/class.menu.inc.php:1.14
--- property/inc/class.menu.inc.php:1.13 Thu May 12 21:26:28 2005
+++ property/inc/class.menu.inc.php Fri May 13 12:17:25 2005
@@ -160,14 +160,6 @@
$menu['sub_menu'][$i]['statustext']
= lang('Tenant');
$i++;
- if($page=='drawing')
- {
-
$menu['sub_menu'][$i]['this']=True;
- }
- $menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uidrawing.index');
- $menu['sub_menu'][$i]['name']
= lang('Drawing');
- $menu['sub_menu'][$i]['statustext']
= lang('Drawing');
- $i++;
if($page=='gab')
{
$menu['sub_menu'][$i]['this']=True;
====================================================
Index: property/inc/class.socategory.inc.php
diff -u property/inc/class.socategory.inc.php:1.7
property/inc/class.socategory.inc.php:1.8
--- property/inc/class.socategory.inc.php:1.7 Thu May 12 21:26:28 2005
+++ property/inc/class.socategory.inc.php Fri May 13 12:17:25 2005
@@ -125,9 +125,6 @@
case 'location':
$table='fm_location' . $type_id .
'_category';
break;
- case 'drawing':
- $table='fm_drawing_category';
- break;
case 'meter':
$table='fm_meter_category';
break;
====================================================
Index: property/inc/class.sostandard_2.inc.php
diff -u property/inc/class.sostandard_2.inc.php:1.5
property/inc/class.sostandard_2.inc.php:1.6
--- property/inc/class.sostandard_2.inc.php:1.5 Thu May 12 21:26:28 2005
+++ property/inc/class.sostandard_2.inc.php Fri May 13 12:17:25 2005
@@ -113,9 +113,6 @@
case 'building_part':
$table='fm_building_part';
break;
- case 'drawing_status':
- $table='fm_drawing_status';
- break;
case 'document_status':
$table='fm_document_status';
break;
- [Phpgroupware-cvs] property/inc hook_admin.inc.php, 1.15 class.uitts.inc.php, 1.16 class.boadmin_entity.inc.php, 1.7 class.historylog.inc.php, 1.6 class.menu.inc.php, 1.14 class.socategory.inc.php, 1.8 class.sostandard_2.inc.php, 1.6 class.bodrawing.inc.php, 1.6 class.sodrawing.inc.php, 1.6 class.uidrawing.inc.php, 1.9, sigurdne, 2005/05/16
- [Phpgroupware-cvs] property/inc hook_admin.inc.php, 1.15 class.uitts.inc.php, 1.16 class.boadmin_entity.inc.php, 1.7 class.historylog.inc.php, 1.6 class.menu.inc.php, 1.14 class.socategory.inc.php, 1.8 class.sostandard_2.inc.php, 1.6 class.bodrawing.inc.php, 1.6 class.sodrawing.inc.php, 1.6 class.uidrawing.inc.php, 1.9, sigurdne, 2005/05/16
- [Phpgroupware-cvs] property/inc hook_admin.inc.php, 1.15 class.uitts.inc.php, 1.16 class.boadmin_entity.inc.php, 1.7 class.historylog.inc.php, 1.6 class.menu.inc.php, 1.14 class.socategory.inc.php, 1.8 class.sostandard_2.inc.php, 1.6 class.bodrawing.inc.php, 1.6 class.sodrawing.inc.php, 1.6 class.uidrawing.inc.php, 1.9,
sigurdne <=
- [Phpgroupware-cvs] property/inc hook_admin.inc.php, 1.15 class.uitts.inc.php, 1.16 class.boadmin_entity.inc.php, 1.7 class.historylog.inc.php, 1.6 class.menu.inc.php, 1.14 class.socategory.inc.php, 1.8 class.sostandard_2.inc.php, 1.6 class.bodrawing.inc.php, 1.6 class.sodrawing.inc.php, 1.6 class.uidrawing.inc.php, 1.9, sigurdne, 2005/05/17
- Prev by Date:
[Phpgroupware-cvs] property/inc class.soadmin_location.inc.php,1.9
- Next by Date:
[Phpgroupware-cvs] todo/setup tables_current.inc.php, 1.11 setup.inc.php, 1.26 tables_baseline.inc.php, 1.4 tables_update.inc.php, 1.18
- Previous by thread:
[Phpgroupware-cvs] property/inc hook_admin.inc.php, 1.15 class.uitts.inc.php, 1.16 class.boadmin_entity.inc.php, 1.7 class.historylog.inc.php, 1.6 class.menu.inc.php, 1.14 class.socategory.inc.php, 1.8 class.sostandard_2.inc.php, 1.6 class.bodrawing.inc.php, 1.6 class.sodrawing.inc.php, 1.6 class.uidrawing.inc.php, 1.9
- Next by thread:
[Phpgroupware-cvs] property/inc hook_admin.inc.php, 1.15 class.uitts.inc.php, 1.16 class.boadmin_entity.inc.php, 1.7 class.historylog.inc.php, 1.6 class.menu.inc.php, 1.14 class.socategory.inc.php, 1.8 class.sostandard_2.inc.php, 1.6 class.bodrawing.inc.php, 1.6 class.sodrawing.inc.php, 1.6 class.uidrawing.inc.php, 1.9
- Index(es):