[Phpgroupware-cvs] property/inc class.menu.inc.php

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    property
Branch:         
Changes by:     Sigurd Nes <address@hidden>     06/01/31 07:21:46

Modified files:
        inc            : class.menu.inc.php 

Log message:
        

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/class.menu.inc.php.diff?tr1=1.15&tr2=1.16&r1=text&r2=text

Patches:
Index: property/inc/class.menu.inc.php
diff -u property/inc/class.menu.inc.php:1.15 
property/inc/class.menu.inc.php:1.16
--- property/inc/class.menu.inc.php:1.15        Fri Jan 27 14:05:43 2006
+++ property/inc/class.menu.inc.php     Tue Jan 31 07:21:46 2006
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage core
-       * @version $Id: class.menu.inc.php,v 1.15 2006/01/27 14:05:43 sigurdne 
Exp $
+       * @version $Id: class.menu.inc.php,v 1.16 2006/01/31 07:21:46 sigurdne 
Exp $
        */
 
        /**
@@ -299,13 +299,31 @@
                                        $menu['sub_menu'][$i]['statustext']     
        =       lang('Agreement');
                                }
 //--------------
-                               if ($sub == 'agreement' && 
$this->acl2->check('.pricebook',16))
+                               if ($sub == 'agreement')
                                {
                                        $i++;
                                        if($page=='agreement')
                                        {
                                                
$menu['sub_menu'][$i]['this']=True;
+                                       }
+                                       $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($this->acl2->check('.pricebook',16))
+                                       {
                                                $j=0;
                                                if($page_2=='agreement_group')
                                                {
@@ -330,24 +348,7 @@
                                                $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');
                                }
 
 //---------------