[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc class.menu.inc.php, 1.9 class.uiagreemen
|
From: |
sigurdne |
|
Subject: |
[Phpgroupware-cvs] property/inc class.menu.inc.php, 1.9 class.uiagreement.inc.php, 1.7 class.uipricebook.inc.php, 1.8 class.uis_agreement.inc.php, 1.15 |
|
Date: |
Wed, 16 Mar 2005 13:11:00 +0100 |
Update of property/inc
Modified Files:
Branch: MAIN
class.menu.inc.php lines: +72 -15
class.uiagreement.inc.php lines: +3 -3
class.uipricebook.inc.php lines: +5 -5
class.uis_agreement.inc.php lines: +2 -2
Log Message:
no message
====================================================
Index: property/inc/class.menu.inc.php
diff -u property/inc/class.menu.inc.php:1.8 property/inc/class.menu.inc.php:1.9
--- property/inc/class.menu.inc.php:1.8 Sat Jan 29 13:23:25 2005
+++ property/inc/class.menu.inc.php Wed Mar 16 12:11:00 2005
@@ -40,7 +40,7 @@
$this->currentapp =
$GLOBALS['phpgw_info']['flags']['currentapp'];
}
- function links($page='')
+ function links($page='',$page_2='')
{
$currentapp=$this->currentapp;
$sub = $this->sub;
@@ -59,16 +59,7 @@
$menu['module'][$i]['name'] =
lang('Property');
$menu['module'][$i]['statustext'] =
lang('Property');
$i++;
-/*
- if($sub=='meter')
- {
- $menu['module'][$i]['this']=True;
- }
- $menu['module'][$i]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uimeter.index');
- $menu['module'][$i]['name'] =
lang('Meter');
- $menu['module'][$i]['statustext'] =
lang('Meter');
- $i++;
-*/
+
if($sub=='ticket')
{
$menu['module'][$i]['this']=True;
@@ -92,7 +83,8 @@
$menu['module'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiinvoice.index');
$menu['module'][$i]['name']
= lang('Invoice');
$menu['module'][$i]['statustext'] =
lang('Invoice');
- $i++;
+
+/* $i++;
if($sub=='pricebook')
{
$menu['module'][$i]['this']=True;
@@ -100,6 +92,17 @@
$menu['module'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiagreement.index');
$menu['module'][$i]['name']
= lang('Pricebook');
$menu['module'][$i]['statustext'] =
lang('Pricebook');
+*/
+//--------------------
+ $i++;
+ if($sub=='agreement')
+ {
+ $menu['module'][$i]['this']=True;
+ }
+ $menu['module'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiagreement.index');
+ $menu['module'][$i]['name']
= lang('Agreement');
+ $menu['module'][$i]['statustext'] =
lang('Agreement');
+//----------------------
$i++;
if($sub=='document')
{
@@ -303,7 +306,59 @@
$menu['sub_menu'][$i]['name']
= lang('Agreement');
$menu['sub_menu'][$i]['statustext']
= lang('Agreement');
}
+//--------------
+ if ($sub == 'agreement' &&
$this->acl2->check('.pricebook',16))
+ {
+ $i++;
+ if($page=='agreement')
+ {
+
$menu['sub_menu'][$i]['this']=True;
+ $j=0;
+ if($page_2=='agreement_group')
+ {
+
$menu['sub_menu_2'][$j]['this']=True;
+ }
+ $menu['sub_menu_2'][$j]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uipricebook.agreement_group');
+ $menu['sub_menu_2'][$j]['name']
= lang('Agreement group');
+
$menu['sub_menu_2'][$j]['statustext'] = lang('Agreement group');
+ $j++;
+ if($page_2=='activity')
+ {
+
$menu['sub_menu_2'][$j]['this']=True;
+ }
+ $menu['sub_menu_2'][$j]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uipricebook.activity');
+ $menu['sub_menu_2'][$j]['name']
= lang('Activities');
+
$menu['sub_menu_2'][$j]['statustext'] = lang('Activities');
+ $j++;
+ if($page_2=='agreement')
+ {
+
$menu['sub_menu_2'][$j]['this']=True;
+ }
+ $menu['sub_menu_2'][$j]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiagreement.index');
+ $menu['sub_menu_2'][$j]['name']
= lang('Agreement');
+
$menu['sub_menu_2'][$j]['statustext'] = lang('Agreement');
+
+
+ }
+
+ $menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiagreement.index');
+ $menu['sub_menu'][$i]['name']
= lang('Pricebook');
+ $menu['sub_menu'][$i]['statustext']
= lang('Pricebook');
+
+ $i++;
+ if($page=='s_agreement')
+ {
+
$menu['sub_menu'][$i]['this']=True;
+
+ }
+
+ $menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uis_agreement.index');
+ $menu['sub_menu'][$i]['name']
= lang('Service');
+ $menu['sub_menu'][$i]['statustext']
= lang('service agreement');
+ }
+
+//---------------
if ($sub == 'project')
{
$i++;
@@ -322,7 +377,8 @@
$menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiworkorder.index');
$menu['sub_menu'][$i]['name']
= lang('Workorder');
$menu['sub_menu'][$i]['statustext']
= lang('Workorder');
- $i++;
+
+/* $i++;
if($page=='s_agreement')
{
$menu['sub_menu'][$i]['this']=True;
@@ -330,7 +386,8 @@
$menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uis_agreement.index');
$menu['sub_menu'][$i]['name']
= lang('Service');
$menu['sub_menu'][$i]['statustext']
= lang('service agreement');
- $i++;
+*/ $i++;
+
if($page=='request')
{
$menu['sub_menu'][$i]['this']=True;
====================================================
Index: property/inc/class.uiagreement.inc.php
diff -u property/inc/class.uiagreement.inc.php:1.6
property/inc/class.uiagreement.inc.php:1.7
--- property/inc/class.uiagreement.inc.php:1.6 Thu Jan 13 16:52:48 2005
+++ property/inc/class.uiagreement.inc.php Wed Mar 16 12:11:00 2005
@@ -194,7 +194,7 @@
function index()
{
- $this->menu->sub = 'pricebook';
+ $this->menu->sub = 'agreement';
if(!$this->acl_read)
{
@@ -208,7 +208,7 @@
'nextmatchs',
'filter_member_of'));
- $links = $this->menu->links('agreement');
+ $links = $this->menu->links('agreement','agreement');
$receipt =
$GLOBALS['phpgw']->session->appsession('session_data','agreement_receipt');
$GLOBALS['phpgw']->session->appsession('session_data','agreement_receipt','');
====================================================
Index: property/inc/class.uipricebook.inc.php
diff -u property/inc/class.uipricebook.inc.php:1.7
property/inc/class.uipricebook.inc.php:1.8
--- property/inc/class.uipricebook.inc.php:1.7 Thu Jan 13 16:52:48 2005
+++ property/inc/class.uipricebook.inc.php Wed Mar 16 12:11:00 2005
@@ -80,7 +80,7 @@
$this->cat_id =
$this->bo->cat_id;
$this->allrows =
$this->bo->allrows;
- $this->menu->sub ='pricebook';
+ $this->menu->sub ='agreement';
}
function save_sessiondata()
@@ -338,7 +338,7 @@
'nextmatchs',
'search_field'));
- $links = $this->menu->links('agreement_group');
+ $links =
$this->menu->links('agreement','agreement_group');
$agreement_list = $this->bo->read_agreement_group();
@@ -840,7 +840,7 @@
'nextmatchs',
'search_field'));
- $links = $this->menu->links('activity');
+ $links = $this->menu->links('agreement','activity');
$pricebook_list =
$this->bo->read_activities_pr_agreement_group();
//_debug_array($pricebook_list);
@@ -983,7 +983,7 @@
'nextmatchs',
'search_field'));
- $links = $this->menu->links('activity');
+ $links = $this->menu->links('agreement','activity');
$activity_id =
get_var('activity_id',array('GET'));
$values =
get_var('values',array('POST'));
====================================================
Index: property/inc/class.uis_agreement.inc.php
diff -u property/inc/class.uis_agreement.inc.php:1.14
property/inc/class.uis_agreement.inc.php:1.15
--- property/inc/class.uis_agreement.inc.php:1.14 Thu Jan 13 16:52:48 2005
+++ property/inc/class.uis_agreement.inc.php Wed Mar 16 12:11:00 2005
@@ -192,7 +192,7 @@
function index()
{
- $this->menu->sub = 'project';
+ $this->menu->sub = 'agreement';
if(!$this->acl_read)
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc class.menu.inc.php, 1.9 class.uiagreement.inc.php, 1.7 class.uipricebook.inc.php, 1.8 class.uis_agreement.inc.php, 1.15,
sigurdne <=